diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-11-13 19:07:52 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-11-13 19:07:52 +0000 |
| commit | 14183b6d52fbc2ae53dc8c8d015d12f6ca45533c (patch) | |
| tree | dbccd201e4c2f5da3cfba6acd2956b95b35457d4 /cpp | |
| parent | Fix (diff) | |
| download | ice-14183b6d52fbc2ae53dc8c8d015d12f6ca45533c.tar.bz2 ice-14183b6d52fbc2ae53dc8c8d015d12f6ca45533c.tar.xz ice-14183b6d52fbc2ae53dc8c8d015d12f6ca45533c.zip | |
Removed slice compilation rules, use an implicit rule instead.
Diffstat (limited to 'cpp')
43 files changed, 111 insertions, 758 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 3d1bbe59840..4753a692c8f 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -117,6 +117,7 @@ endif CPPFLAGS = -I$(includedir) $(STLPORT_FLAGS) ICECPPFLAGS = -I$(slicedir) +SLICE2CPPFLAGS = $(ICECPPFLAGS) LDFLAGS = -L$(libdir) SHLIB_LDFLAGS = -shared -Xlinker -soname -Xlinker $(@F) @@ -146,6 +147,35 @@ EVERYTHING = all depend clean rm -f $@ ln -s $(@F).$(VERSION) $@ +$(HDIR)/%F.h: $(SDIR)/%F.ice $(SLICE2CPP) + rm -f $(HDIR)/$(*F)F.h $(*F)F.cpp + $(SLICE2CPP) $(SLICE2CPPFLAGS) $< + mv $(*F)F.h $(HDIR) + rm -f $(*F)F.cpp + +$(HDIR)/%.h %.cpp: $(SDIR)/%.ice $(SLICE2CPP) + rm -f $(HDIR)/$(*F).h $(*F).cpp + $(SLICE2CPP) $(SLICE2CPPFLAGS) $< + mv $(*F).h $(HDIR) + +%.h %.cpp: %.ice $(SLICE2CPP) + rm -f $(*F).h $(*F).cpp + $(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice + +%.h %.cpp: %.y + rm -f $(*F).h $(*F).cpp + bison -dvt $< + mv $(*F).tab.c $(*F).cpp + mv $(*F).tab.h $(*F).h + rm -f $(*F).output + +%.cpp: %.l + flex $< + rm -f $@ + echo '#include <IceUtil/Config.h>' > $@ + cat lex.yy.c >> $@ + rm -f lex.yy.c + all:: $(SRCS) $(TARGETS) depend:: $(SRCS) $(SLICE_SRCS) @@ -162,3 +192,14 @@ depend:: $(SRCS) $(SLICE_SRCS) clean:: -rm -f $(TARGETS) -rm -f core *.o *.bak + +ifneq ($(SLICE_SRCS),) +clean:: + rm -f $(addsuffix .cpp, $(basename $(notdir $(SLICE_SRCS)))) + rm -f $(addsuffix .h, $(basename $(notdir $(SLICE_SRCS)))) +endif +ifneq ($(HDIR),) +clean:: + rm -f $(addprefix $(HDIR), $(addsuffix .h, $(basename $(subst $(SDIR),, \ + $(filter $(SDIR)/%.ice, $(SLICE_SRCS)))))) +endif diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile index 7e3d91c46b9..2a10ae228cc 100644 --- a/cpp/demo/Freeze/bench/Makefile +++ b/cpp/demo/Freeze/bench/Makefile @@ -32,13 +32,6 @@ $(CLIENT): $(OBJS) $(COBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) -I$(slicedir) Test.ice - -clean:: - rm -f Test.h Test.cpp - BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE) rm -f BenchTypes.h BenchTypes.cpp $(SLICE2FREEZE) -I$(slicedir) --dict IntIntMap,int,int --dict Struct1Struct2Map,Struct1,Struct2 \ diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile index cf5c7048292..71966567213 100644 --- a/cpp/demo/Freeze/library/Makefile +++ b/cpp/demo/Freeze/library/Makefile @@ -52,6 +52,7 @@ SLICE_SRCS = Library.ice include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. $(DB_FLAGS) $(CPPFLAGS) +SLICE2CPPFLAGS := --ice $(SLICE2CPPFLAGS) $(CLIENT): $(OBJS) $(COBJS) rm -f $@ @@ -65,28 +66,6 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -lreadline -lcurses -Grammar.cpp Grammar.h: Grammar.y - bison -dvt Grammar.y - rm -f Grammar.cpp ; mv Grammar.tab.c Grammar.cpp - rm -f Grammar.h ; mv Grammar.tab.h Grammar.h - -Scanner.cpp: Scanner.l Grammar.h - flex Scanner.l - rm -f Scanner.cpp - echo '#include <IceUtil/Config.h>' > Scanner.cpp - cat lex.yy.c >> Scanner.cpp - -clean:: - -rm -f Grammar.cpp Grammar.h Grammar.output - -rm -f Scanner.cpp lex.yy.c - -Library.h Library.cpp: Library.ice $(SLICE2CPP) - rm -f Library.h Library.cpp - $(SLICE2CPP) --ice -I$(slicedir) Library.ice - -clean:: - rm -f Library.h Library.cpp - LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) rm -f LibraryTypes.h LibraryTypes.cpp $(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes $(slicedir)/Ice/BuiltinSequences.ice Library.ice @@ -94,4 +73,8 @@ LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) clean:: rm -f LibraryTypes.h LibraryTypes.cpp +clean:: + rm -f Grammar.cpp Grammar.h + rm -f Scanner.cpp + include .depend diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile index f0376ab9134..860e443a61c 100644 --- a/cpp/demo/Freeze/phonebook/Makefile +++ b/cpp/demo/Freeze/phonebook/Makefile @@ -65,28 +65,6 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -lreadline -lcurses -Grammar.cpp Grammar.h: Grammar.y - bison -dvt Grammar.y - rm -f Grammar.cpp ; mv Grammar.tab.c Grammar.cpp - rm -f Grammar.h ; mv Grammar.tab.h Grammar.h - -Scanner.cpp: Scanner.l Grammar.h - flex Scanner.l - rm -f Scanner.cpp - echo '#include <IceUtil/Config.h>' > Scanner.cpp - cat lex.yy.c >> Scanner.cpp - -clean:: - -rm -f Grammar.cpp Grammar.h Grammar.output - -rm -f Scanner.cpp lex.yy.c - -PhoneBook.h PhoneBook.cpp: PhoneBook.ice $(SLICE2CPP) - rm -f PhoneBook.h PhoneBook.cpp - $(SLICE2CPP) $(ICECPPFLAGS) PhoneBook.ice - -clean:: - rm -f PhoneBook.h PhoneBook.cpp - NameIdentitiesDict.h NameIdentitiesDict.cpp: PhoneBook.ice $(SLICE2FREEZE) rm -f NameIdentitiesDict.h NameIdentitiesDict.cpp $(SLICE2FREEZE) $(ICECPPFLAGS) --dict NameIdentitiesDict,string,Identities NameIdentitiesDict PhoneBook.ice @@ -94,4 +72,8 @@ NameIdentitiesDict.h NameIdentitiesDict.cpp: PhoneBook.ice $(SLICE2FREEZE) clean:: rm -f NameIdentitiesDict.h NameIdentitiesDict.cpp +clean:: + rm -f Grammar.cpp Grammar.h + rm -f Scanner.cpp + include .depend diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile index 98f13bd88be..c846daa5703 100644 --- a/cpp/demo/Glacier/session/Makefile +++ b/cpp/demo/Glacier/session/Makefile @@ -30,10 +30,11 @@ SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ $(SOBJS:.o=.cpp) +SLICE_SRCS = HelloSession.ice + include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. $(CPPFLAGS) -SLICECMD = $(SLICE2CPP) -I$(slicedir) $(CLIENT): $(OBJS) $(COBJS) rm -f $@ @@ -43,11 +44,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lGlacier $(LIBS) -HelloSession.h HelloSession.cpp: HelloSession.ice $(SLICE2CPP) - rm -f HelloSession.h HelloSession.cpp - $(SLICECMD) HelloSession.ice - -clean:: - rm -f HelloSession.h HelloSession.cpp - include .depend diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile index 85e26bc5949..5342cd05d60 100644 --- a/cpp/demo/Ice/callback/Makefile +++ b/cpp/demo/Ice/callback/Makefile @@ -44,11 +44,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Callback.h Callback.cpp: Callback.ice $(SLICE2CPP) - rm -f Callback.h Callback.cpp - $(SLICE2CPP) Callback.ice - -clean:: - rm -f Callback.h Callback.cpp - include .depend diff --git a/cpp/demo/Ice/hello/Makefile b/cpp/demo/Ice/hello/Makefile index b4ce2942c18..de16f6852ec 100644 --- a/cpp/demo/Ice/hello/Makefile +++ b/cpp/demo/Ice/hello/Makefile @@ -44,11 +44,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Hello.h Hello.cpp: Hello.ice $(SLICE2CPP) - rm -f Hello.h Hello.cpp - $(SLICE2CPP) Hello.ice - -clean:: - rm -f Hello.h Hello.cpp - include .depend diff --git a/cpp/demo/Ice/latency/Makefile b/cpp/demo/Ice/latency/Makefile index 258ba034000..3fe7e6bfb66 100644 --- a/cpp/demo/Ice/latency/Makefile +++ b/cpp/demo/Ice/latency/Makefile @@ -43,11 +43,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Latency.h Latency.cpp: Latency.ice $(SLICE2CPP) - rm -f Latency.h Latency.cpp - $(SLICE2CPP) Latency.ice - -clean:: - rm -f Latency.h Latency.cpp - include .depend diff --git a/cpp/demo/Ice/nested/Makefile b/cpp/demo/Ice/nested/Makefile index fd5088ea3ce..a8c8feff2b6 100644 --- a/cpp/demo/Ice/nested/Makefile +++ b/cpp/demo/Ice/nested/Makefile @@ -44,11 +44,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Nested.h Nested.cpp: Nested.ice $(SLICE2CPP) - rm -f Nested.h Nested.cpp - $(SLICE2CPP) Nested.ice - -clean:: - rm -f Nested.h Nested.cpp - include .depend diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile index f71d7593096..7b2b1494860 100644 --- a/cpp/demo/Ice/value/Makefile +++ b/cpp/demo/Ice/value/Makefile @@ -45,11 +45,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Value.h Value.cpp: Value.ice $(SLICE2CPP) - rm -f Value.h Value.cpp - $(SLICE2CPP) Value.ice - -clean:: - rm -f Value.h Value.cpp - include .depend diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile index ee8f89d97a5..0fd08ec1441 100644 --- a/cpp/demo/IceBox/hello/Makefile +++ b/cpp/demo/IceBox/hello/Makefile @@ -46,11 +46,4 @@ $(CLIENT): $(OBJS) $(COBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS) -Hello.h Hello.cpp: Hello.ice $(SLICE2CPP) - rm -f Hello.h Hello.cpp - $(SLICE2CPP) Hello.ice - -clean:: - rm -f Hello.h Hello.cpp - include .depend diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile index 86e1e4b64fb..4205bddfe78 100644 --- a/cpp/demo/IceStorm/clock/Makefile +++ b/cpp/demo/IceStorm/clock/Makefile @@ -45,11 +45,4 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Clock.h Clock.cpp: Clock.ice $(SLICE2CPP) - rm -f Clock.h Clock.cpp - $(SLICE2CPP) Clock.ice - -clean:: - rm -f Clock.h Clock.cpp - include .depend diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 57d46bdd6c3..3836d79de35 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -38,59 +38,17 @@ SLICE_SRCS = $(SDIR)/DB.ice \ HDIR = $(includedir)/Freeze SDIR = $(slicedir)/Freeze -SLICECMD = $(SLICE2CPP) --ice --include-dir Freeze --dll-export FREEZE_API $(ICECPPFLAGS) SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir Freeze $(ICECPPFLAGS) include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(DB_FLAGS) $(CPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) -$(HDIR)/DB.h DB.cpp: $(SDIR)/DB.ice $(SLICE2CPP) - rm -f $(HDIR)/DB.h DB.cpp - $(SLICECMD) $(SDIR)/DB.ice - mv DB.h $(HDIR) - -clean:: - rm -f $(HDIR)/DB.h DB.cpp - -$(HDIR)/DBF.h: $(SDIR)/DBF.ice $(SLICE2CPP) - rm -f $(HDIR)/DBF.h DBF.cpp - $(SLICECMD) $(SDIR)/DBF.ice - mv DBF.h $(HDIR) - rm -f DBF.cpp - -clean:: - rm -f $(HDIR)/DBF.h - -$(HDIR)/DBException.h DBException.cpp: $(SDIR)/DBException.ice $(SLICE2CPP) - rm -f $(HDIR)/DBException.h DBException.cpp - $(SLICECMD) $(SDIR)/DBException.ice - mv DBException.h $(HDIR) - -clean:: - rm -f $(HDIR)/DBException.h DBException.cpp - -$(HDIR)/Evictor.h Evictor.cpp: $(SDIR)/Evictor.ice $(SLICE2CPP) - rm -f $(HDIR)/Evictor.h Evictor.cpp - $(SLICECMD) $(SDIR)/Evictor.ice - mv Evictor.h $(HDIR) - -clean:: - rm -f $(HDIR)/Evictor.h Evictor.cpp - -$(HDIR)/EvictorF.h: $(SDIR)/EvictorF.ice $(SLICE2CPP) - rm -f $(HDIR)/EvictorF.h EvictorF.cpp - $(SLICECMD) $(SDIR)/EvictorF.ice - mv EvictorF.h $(HDIR) - rm -f EvictorF.cpp - -clean:: - rm -f $(HDIR)/EvictorF.h - IdentityObjectDict.h IdentityObjectDict.cpp: $(SLICE2FREEZE) rm -f IdentityObjectDict.h IdentityObjectDict.cpp $(SLICE2FREEZECMD) --dict Freeze::IdentityObjectDict,Ice::Identity,Object IdentityObjectDict \ diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile index 192b61f9894..35f21c29c6b 100644 --- a/cpp/src/Glacier/Makefile +++ b/cpp/src/Glacier/Makefile @@ -51,72 +51,21 @@ SLICE_SRCS = $(SDIR)/Starter.ice \ HDIR = $(includedir)/Glacier SDIR = $(slicedir)/Glacier -SLICECMD = $(SLICE2CPP) --include-dir Glacier --dll-export GLACIER_API $(ICECPPFLAGS) - include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) +SLICE2CPPFLAGS := --include-dir Glacier --dll-export GLACIER_API $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) -$(ROUTER): $(ROBJS) +$(ROUTER): $(ROBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(ROBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) -$(STARTER): $(SOBJS) +$(STARTER): $(SOBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) -lcrypt -$(HDIR)/Starter.h Starter.cpp: $(SDIR)/Starter.ice $(SLICE2CPP) - rm -f $(HDIR)/Starter.h Starter.cpp - $(SLICECMD) $(SDIR)/Starter.ice - mv Starter.h $(HDIR) - -clean:: - rm -f $(HDIR)/Starter.h Starter.cpp - -$(HDIR)/Router.h Router.cpp: $(SDIR)/Router.ice $(SLICE2CPP) - rm -f $(HDIR)/Router.h Router.cpp - $(SLICECMD) $(SDIR)/Router.ice - mv Router.h $(HDIR) - -clean:: - rm -f $(HDIR)/Router.h Router.cpp - -$(HDIR)/Session.h Session.cpp: $(SDIR)/Session.ice $(SLICE2CPP) - rm -f $(HDIR)/Session.h Session.cpp - $(SLICECMD) $(SDIR)/Session.ice - mv Session.h $(HDIR) - -clean:: - rm -f $(HDIR)/Session.h Session.cpp - -$(HDIR)/SessionF.h: $(SDIR)/SessionF.ice $(SLICE2CPP) - rm -f $(HDIR)/SessionF.h SessionF.cpp - $(SLICECMD) $(SDIR)/SessionF.ice - mv SessionF.h $(HDIR) - rm -f SessionF.cpp - -clean:: - rm -f $(HDIR)/SessionF.h - -$(HDIR)/SessionManager.h SessionManager.cpp: $(SDIR)/SessionManager.ice $(SLICE2CPP) - rm -f $(HDIR)/SessionManager.h SessionManager.cpp - $(SLICECMD) $(SDIR)/SessionManager.ice - mv SessionManager.h $(HDIR) - -clean:: - rm -f $(HDIR)/SessionManager.h SessionManager.cpp - -$(HDIR)/SessionManagerF.h: $(SDIR)/SessionManagerF.ice $(SLICE2CPP) - rm -f $(HDIR)/SessionManagerF.h SessionManagerF.cpp - $(SLICECMD) $(SDIR)/SessionManagerF.ice - mv SessionManagerF.h $(HDIR) - rm -f SessionManagerF.cpp - -clean:: - rm -f $(HDIR)/SessionManagerF.h - include .depend diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 4bb39b17186..40655505dd2 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -121,238 +121,13 @@ SLICE_SRCS = $(SDIR)/LocalException.ice \ HDIR = $(includedir)/Ice SDIR = $(slicedir)/Ice -SLICECMD = $(SLICE2CPP) --ice --include-dir Ice --dll-export ICE_API $(ICECPPFLAGS) - include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) -$(HDIR)/LocalException.h LocalException.cpp: $(SDIR)/LocalException.ice $(SLICE2CPP) - rm -f $(HDIR)/LocalException.h LocalException.cpp - $(SLICECMD) $(SDIR)/LocalException.ice - mv LocalException.h $(HDIR) - -clean:: - rm -f $(HDIR)/LocalException.h LocalException.cpp - -$(HDIR)/Communicator.h Communicator.cpp: $(SDIR)/Communicator.ice $(SLICE2CPP) - rm -f $(HDIR)/Communicator.h Communicator.cpp - $(SLICECMD) -DICE_CPP $(SDIR)/Communicator.ice - mv Communicator.h $(HDIR) - -clean:: - rm -f $(HDIR)/Communicator.h Communicator.cpp - -$(HDIR)/CommunicatorF.h: $(SDIR)/CommunicatorF.ice $(SLICE2CPP) - rm -f $(HDIR)/CommunicatorF.h CommunicatorF.cpp - $(SLICECMD) $(SDIR)/CommunicatorF.ice - mv CommunicatorF.h $(HDIR) - rm -f CommunicatorF.cpp - -clean:: - rm -f $(HDIR)/CommunicatorF.h - -$(HDIR)/Logger.h Logger.cpp: $(SDIR)/Logger.ice $(SLICE2CPP) - rm -f $(HDIR)/Logger.h Logger.cpp - $(SLICECMD) $(SDIR)/Logger.ice - mv Logger.h $(HDIR) - -clean:: - rm -f $(HDIR)/Logger.h Logger.cpp - -$(HDIR)/LoggerF.h: $(SDIR)/LoggerF.ice $(SLICE2CPP) - rm -f $(HDIR)/LoggerF.h LoggerF.cpp - $(SLICECMD) $(SDIR)/LoggerF.ice - mv LoggerF.h $(HDIR) - rm -f LoggerF.cpp - -clean:: - rm -f $(HDIR)/LoggerF.h - -$(HDIR)/Stream.h Stream.cpp: $(SDIR)/Stream.ice $(SLICE2CPP) - rm -f $(HDIR)/Stream.h Stream.cpp - $(SLICECMD) $(SDIR)/Stream.ice - mv Stream.h $(HDIR) - -clean:: - rm -f $(HDIR)/Stream.h Stream.cpp - -$(HDIR)/StreamF.h: $(SDIR)/StreamF.ice $(SLICE2CPP) - rm -f $(HDIR)/StreamF.h StreamF.cpp - $(SLICECMD) $(SDIR)/StreamF.ice - mv StreamF.h $(HDIR) - rm -f StreamF.cpp - -clean:: - rm -f $(HDIR)/StreamF.h - -$(HDIR)/BuiltinSequences.h BuiltinSequences.cpp: $(SDIR)/BuiltinSequences.ice $(SLICE2CPP) - rm -f $(HDIR)/BuiltinSequences.h BuiltinSequences.cpp - $(SLICECMD) $(SDIR)/BuiltinSequences.ice - mv BuiltinSequences.h $(HDIR) - -clean:: - rm -f $(HDIR)/BuiltinSequences.h BuiltinSequences.cpp - -$(HDIR)/ObjectAdapter.h ObjectAdapter.cpp: $(SDIR)/ObjectAdapter.ice $(SLICE2CPP) - rm -f $(HDIR)/ObjectAdapter.h ObjectAdapter.cpp - $(SLICECMD) $(SDIR)/ObjectAdapter.ice - mv ObjectAdapter.h $(HDIR) - -clean:: - rm -f $(HDIR)/ObjectAdapter.h ObjectAdapter.cpp - -$(HDIR)/ObjectAdapterF.h: $(SDIR)/ObjectAdapterF.ice $(SLICE2CPP) - rm -f $(HDIR)/ObjectAdapterF.h ObjectAdapterF.cpp - $(SLICECMD) $(SDIR)/ObjectAdapterF.ice - mv ObjectAdapterF.h $(HDIR) - rm -f ObjectAdapterF.cpp - -clean:: - rm -f $(HDIR)/ObjectAdapterF.h - -$(HDIR)/ServantLocator.h ServantLocator.cpp: $(SDIR)/ServantLocator.ice $(SLICE2CPP) - rm -f $(HDIR)/ServantLocator.h ServantLocator.cpp - $(SLICECMD) $(SDIR)/ServantLocator.ice - mv ServantLocator.h $(HDIR) - -clean:: - rm -f $(HDIR)/ServantLocator.h ServantLocator.cpp - -$(HDIR)/ServantLocatorF.h: $(SDIR)/ServantLocatorF.ice $(SLICE2CPP) - rm -f $(HDIR)/ServantLocatorF.h ServantLocatorF.cpp - $(SLICECMD) $(SDIR)/ServantLocatorF.ice - mv ServantLocatorF.h $(HDIR) - rm -f ServantLocatorF.cpp - -clean:: - rm -f $(HDIR)/ServantLocatorF.h - -$(HDIR)/Properties.h Properties.cpp: $(SDIR)/Properties.ice $(SLICE2CPP) - rm -f $(HDIR)/Properties.h Properties.cpp - $(SLICECMD) $(SDIR)/Properties.ice - mv Properties.h $(HDIR) - -clean:: - rm -f $(HDIR)/Properties.h Properties.cpp - -$(HDIR)/PropertiesF.h: $(SDIR)/PropertiesF.ice $(SLICE2CPP) - rm -f $(HDIR)/PropertiesF.h PropertiesF.cpp - $(SLICECMD) $(SDIR)/PropertiesF.ice - mv PropertiesF.h $(HDIR) - rm -f PropertiesF.cpp - -clean:: - rm -f $(HDIR)/PropertiesF.h - -$(HDIR)/ObjectFactory.h ObjectFactory.cpp: $(SDIR)/ObjectFactory.ice $(SLICE2CPP) - rm -f $(HDIR)/ObjectFactory.h ObjectFactory.cpp - $(SLICECMD) $(SDIR)/ObjectFactory.ice - mv ObjectFactory.h $(HDIR) - -clean:: - rm -f $(HDIR)/ObjectFactory.h ObjectFactory.cpp - -$(HDIR)/ObjectFactoryF.h: $(SDIR)/ObjectFactoryF.ice $(SLICE2CPP) - rm -f $(HDIR)/ObjectFactoryF.h ObjectFactoryF.cpp - $(SLICECMD) $(SDIR)/ObjectFactoryF.ice - mv ObjectFactoryF.h $(HDIR) - rm -f ObjectFactoryF.cpp - -clean:: - rm -f $(HDIR)/ObjectFactoryF.h - -$(HDIR)/UserExceptionFactory.h UserExceptionFactory.cpp: $(SDIR)/UserExceptionFactory.ice $(SLICE2CPP) - rm -f $(HDIR)/UserExceptionFactory.h UserExceptionFactory.cpp - $(SLICECMD) $(SDIR)/UserExceptionFactory.ice - mv UserExceptionFactory.h $(HDIR) - -clean:: - rm -f $(HDIR)/UserExceptionFactory.h UserExceptionFactory.cpp - -$(HDIR)/UserExceptionFactoryF.h: $(SDIR)/UserExceptionFactoryF.ice $(SLICE2CPP) - rm -f $(HDIR)/UserExceptionFactoryF.h UserExceptionFactoryF.cpp - $(SLICECMD) $(SDIR)/UserExceptionFactoryF.ice - mv UserExceptionFactoryF.h $(HDIR) - rm -f UserExceptionFactoryF.cpp - -clean:: - rm -f $(HDIR)/UserExceptionFactoryF.h - -$(HDIR)/Identity.h Identity.cpp: $(SDIR)/Identity.ice $(SLICE2CPP) - rm -f $(HDIR)/Identity.h Identity.cpp - $(SLICECMD) $(SDIR)/Identity.ice - mv Identity.h $(HDIR) - -clean:: - rm -f $(HDIR)/Identity.h Identity.cpp - -$(HDIR)/Facet.h Facet.cpp: $(SDIR)/Facet.ice $(SLICE2CPP) - rm -f $(HDIR)/Facet.h Facet.cpp - $(SLICECMD) $(SDIR)/Facet.ice - mv Facet.h $(HDIR) - -clean:: - rm -f $(HDIR)/Facet.h Facet.cpp - -$(HDIR)/Current.h Current.cpp: $(SDIR)/Current.ice $(SLICE2CPP) - rm -f $(HDIR)/Current.h Current.cpp - $(SLICECMD) $(SDIR)/Current.ice - mv Current.h $(HDIR) - -clean:: - rm -f $(HDIR)/Current.h Current.cpp - -$(HDIR)/Router.h Router.cpp: $(SDIR)/Router.ice $(SLICE2CPP) - rm -f $(HDIR)/Router.h Router.cpp - $(SLICECMD) $(SDIR)/Router.ice - mv Router.h $(HDIR) - -clean:: - rm -f $(HDIR)/Router.h Router.cpp - -$(HDIR)/RouterF.h: $(SDIR)/RouterF.ice $(SLICE2CPP) - rm -f $(HDIR)/RouterF.h RouterF.cpp - $(SLICECMD) $(SDIR)/RouterF.ice - mv RouterF.h $(HDIR) - rm -f RouterF.cpp - -$(HDIR)/Plugin.h Plugin.cpp: $(SDIR)/Plugin.ice $(SLICE2CPP) - rm -f $(HDIR)/Plugin.h Plugin.cpp - $(SLICECMD) $(SDIR)/Plugin.ice - mv Plugin.h $(HDIR) - -clean:: - rm -f $(HDIR)/Plugin.h Plugin.cpp - -$(HDIR)/PluginF.h: $(SDIR)/PluginF.ice $(SLICE2CPP) - rm -f $(HDIR)/PluginF.h PluginF.cpp - $(SLICECMD) $(SDIR)/PluginF.ice - mv PluginF.h $(HDIR) - rm -f PluginF.cpp - -clean:: - rm -f $(HDIR)/PluginF.h - -$(HDIR)/Locator.h Locator.cpp: $(SDIR)/Locator.ice $(SLICE2CPP) - rm -f $(HDIR)/Locator.h Locator.cpp - $(SLICECMD) $(SDIR)/Locator.ice - mv Locator.h $(HDIR) - -clean:: - rm -f $(HDIR)/Locator.h Locator.cpp - -$(HDIR)/LocatorF.h: $(SDIR)/LocatorF.ice $(SLICE2CPP) - rm -f $(HDIR)/LocatorF.h LocatorF.cpp - $(SLICECMD) $(SDIR)/LocatorF.ice - mv LocatorF.h $(HDIR) - rm -f LocatorF.cpp - -clean:: - rm -f $(HDIR)/LocatorF.h - include .depend diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile index 1485b20958e..e192cfd6063 100644 --- a/cpp/src/IceBox/Makefile +++ b/cpp/src/IceBox/Makefile @@ -39,30 +39,22 @@ SLICE_SRCS = $(SDIR)/IceBox.ice HDIR = $(includedir)/IceBox SDIR = $(slicedir)/IceBox -SLICECMD = $(SLICE2CPP) --ice --include-dir IceBox $(ICECPPFLAGS) include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(DB_FLAGS) $(CPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir IceBox $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) -$(SERVER): $(SOBJS) +$(SERVER): $(SOBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -$(ADMIN): $(AOBJS) +$(ADMIN): $(AOBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(AOBJS) -lIceBox $(LIBS) -$(HDIR)/IceBox.h IceBox.cpp: $(SDIR)/IceBox.ice $(SLICE2CPP) - rm -f $(HDIR)/IceBox.h IceBox.cpp - $(SLICECMD) --dll-export ICE_BOX_API $(SDIR)/IceBox.ice - mv IceBox.h $(HDIR) - -clean:: - rm -f $(HDIR)/IceBox.h IceBox.cpp - include .depend diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile index 8f01b6326c1..b55de602c0c 100644 --- a/cpp/src/IcePack/Makefile +++ b/cpp/src/IcePack/Makefile @@ -77,74 +77,42 @@ SRCS = $(LIB_OBJS:.o=.cpp) \ IcePackRegistry.cpp SLICE_SRCS = $(SDIR)/Admin.ice \ - Internal.ice + Internal.ice \ + Activator.ice HDIR = $(includedir)/IcePack LOCAL_HDIR = ../IcePack SDIR = $(slicedir)/IcePack -SLICECMD = $(SLICE2CPP) --ice --include-dir IcePack --dll-export ICE_PACK_API $(ICECPPFLAGS) SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IcePack $(ICECPPFLAGS) include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) $(XERCESC_FLAGS) ICECPPFLAGS := -I.. $(ICECPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir IcePack --dll-export ICE_PACK_API $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(LIB_OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(LIB_OBJS) -lIceBox -$(ADMIN): $(ADMIN_OBJS) +$(ADMIN): $(ADMIN_OBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(ADMIN_OBJS) -lYellow -lIcePack -lIceBox $(LIBS) -lreadline -lcurses -$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) +$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) \ -lYellow -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(XERCESC_LIBS) $(DB_LIBS) -$(NODE_SERVER): $(NODE_SVR_OBJS) +$(NODE_SERVER): $(NODE_SVR_OBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) \ -lYellow -lIcePack -lIceBox -lFreeze -lIceXML $(XERCESC_LIBS) $(LIBS) $(DB_LIBS) -Grammar.cpp Grammar.h: Grammar.y - bison -dvt Grammar.y - rm -f Grammar.cpp ; mv Grammar.tab.c Grammar.cpp - rm -f Grammar.h ; mv Grammar.tab.h Grammar.h - -Scanner.cpp: Scanner.l Grammar.h - flex Scanner.l - rm -f Scanner.cpp - echo '#include <IceUtil/Config.h>' > Scanner.cpp - cat lex.yy.c >> Scanner.cpp - -clean:: - -rm -f Grammar.cpp Grammar.h Grammar.output - -rm -f Scanner.cpp lex.yy.c - -$(HDIR)/Admin.h Admin.cpp: $(SDIR)/Admin.ice $(SLICE2CPP) - rm -f $(HDIR)/Admin.h Admin.cpp - $(SLICECMD) $(SDIR)/Admin.ice - mv Admin.h $(HDIR) - -clean:: - rm -f $(HDIR)/Admin.h Admin.cpp - -$(LOCAL_HDIR)/Internal.h Internal.cpp: Internal.ice $(SLICE2CPP) - rm -f Internal.h Internal.cpp - $(SLICECMD) Internal.ice - -clean:: - rm -f Internal.h Internal.cpp - -$(LOCAL_HDIR)/Activator.h Activator.cpp: Activator.ice $(SLICE2CPP) - rm -f Activator.h Activator.cpp - $(SLICECMD) -I.. Activator.ice - -clean:: - rm -f Activator.h Activator.cpp +$(LOCAL_HDIR)/%.h %.cpp: $(SDIR)/%.ice $(SLICE2CPP) + rm -f $(HDIR)/$(*F).h $(*F).cpp + $(SLICE2CPP) $(SLICE2CPPFLAGS) $(SDIR)/$(*F).ice $(LOCAL_HDIR)/StringObjectProxyDict.h StringObjectProxyDict.cpp: $(SLICE2FREEZE) rm -f StringObjectProxyDict.h StringObjectProxyDict.cpp @@ -152,7 +120,13 @@ $(LOCAL_HDIR)/StringObjectProxyDict.h StringObjectProxyDict.cpp: $(SLICE2FREEZE) StringObjectProxyDict ../../slice/Ice/BuiltinSequences.ice clean:: - rm -f StringObjectProxyDict.h StringObjectProxySeq.cpp + rm -f StringObjectProxyDict.h StringObjectProxyDict.cpp + +# Needed for make -jn to work. +../IcePack/Grammar.y: Grammar.h +clean:: + rm -f Grammar.cpp Grammar.h + rm -f Scanner.cpp include .depend diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile index cb693b75c8b..57768301f79 100644 --- a/cpp/src/IcePatch/Makefile +++ b/cpp/src/IcePatch/Makefile @@ -42,30 +42,21 @@ SLICE_SRCS = $(SDIR)/IcePatch.ice HDIR = $(includedir)/IcePatch SDIR = $(slicedir)/IcePatch -SLICECMD = $(SLICE2CPP) --ice --include-dir IcePatch --dll-export ICE_PATCH_API $(ICECPPFLAGS) - include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir IcePatch --dll-export ICE_PATCH_API $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) -$(CLIENT): $(COBJS) +$(CLIENT): $(COBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIcePatch -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) -$(SERVER): $(SOBJS) +$(SERVER): $(SOBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lIcePatch $(LIBS) $(OPENSSL_LIBS) -$(HDIR)/IcePatch.h IcePatch.cpp: $(SDIR)/IcePatch.ice $(SLICE2CPP) - rm -f $(HDIR)/IcePatch.h IcePatch.cpp - $(SLICECMD) $(SDIR)/IcePatch.ice - mv IcePatch.h $(HDIR) - -clean:: - rm -f $(HDIR)/IcePatch.h IcePatch.cpp - include .depend diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index c7c4716d845..6388fc946e0 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -64,56 +64,13 @@ SLICE_SRCS = $(SDIR)/Exception.ice \ HDIR = $(includedir)/IceSSL SDIR = $(slicedir)/IceSSL -SLICECMD = $(SLICE2CPP) --ice --include-dir IceSSL --dll-export ICE_SSL_API $(ICECPPFLAGS) - include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(OPENSSL_FLAGS) $(XERCESC_FLAGS) $(CPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(OPENSSL_LIBS) $(XERCESC_LIBS) -$(HDIR)/Exception.h Exception.cpp: $(SDIR)/Exception.ice $(SLICE2CPP) - rm -f $(HDIR)/Exception.h Exception.cpp - $(SLICECMD) $(SDIR)/Exception.ice - mv Exception.h $(HDIR) - -clean:: - rm -f $(HDIR)/Exception.h Exception.cpp - -$(HDIR)/CertificateVerifier.h CertificateVerifier.cpp: $(SDIR)/CertificateVerifier.ice $(SLICE2CPP) - rm -f $(HDIR)/CertificateVerifier.h CertificateVerifier.cpp - $(SLICECMD) $(SDIR)/CertificateVerifier.ice - mv CertificateVerifier.h $(HDIR) - -clean:: - rm -f $(HDIR)/CertificateVerifier.h CertificateVerifier.cpp - -$(HDIR)/CertificateVerifierF.h: $(SDIR)/CertificateVerifierF.ice $(SLICE2CPP) - rm -f $(HDIR)/CertificateVerifierF.h CertificateVerifierF.cpp - $(SLICECMD) $(SDIR)/CertificateVerifierF.ice - mv CertificateVerifierF.h $(HDIR) - rm -f CertificateVerifierF.cpp - -clean:: - rm -f $(HDIR)/CertificateVerifierF.h - -$(HDIR)/Plugin.h Plugin.cpp: $(SDIR)/Plugin.ice $(SLICE2CPP) - rm -f $(HDIR)/Plugin.h Plugin.cpp - $(SLICECMD) $(SDIR)/Plugin.ice - mv Plugin.h $(HDIR) - -clean:: - rm -f $(HDIR)/Plugin.h Plugin.cpp - -$(HDIR)/PluginF.h: $(SDIR)/PluginF.ice $(SLICE2CPP) - rm -f $(HDIR)/PluginF.h PluginF.cpp - $(SLICECMD) $(SDIR)/PluginF.ice - mv PluginF.h $(HDIR) - rm -f PluginF.cpp - -clean:: - rm -f $(HDIR)/PluginF.h - include .depend diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index a9f9061a48e..1c3265920c6 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -60,13 +60,13 @@ SLICE_SRCS = $(SDIR)/IceStorm.ice \ HDIR = $(includedir)/IceStorm SDIR = $(slicedir)/IceStorm -SLICECMD = $(SLICE2CPP) --ice --include-dir IceStorm $(ICECPPFLAGS) SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm $(ICECPPFLAGS) include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(XERCESC_FLAGS) $(CPPFLAGS) ICECPPFLAGS := -I.. $(ICECPPFLAGS) +SLICE2CPPFLAGS := --ice --include-dir IceStorm $(SLICE2CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ @@ -76,25 +76,10 @@ $(VERSIONED_SNAME): $(SERVICE_OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(SERVICE_OBJS) -$(ADMIN): $(AOBJS) +$(ADMIN): $(AOBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(AOBJS) -lIceStorm $(LIBS) $(XERCESC_LIBS) -lreadline -lcurses -$(HDIR)/IceStorm.h IceStorm.cpp: $(SDIR)/IceStorm.ice $(SLICE2CPP) - rm -f $(HDIR)/IceStorm.h IceStorm.cpp - $(SLICECMD) --dll-export ICE_STORM_API $(SDIR)/IceStorm.ice - mv IceStorm.h $(HDIR) - -clean:: - rm -f $(HDIR)/IceStorm.h IceStorm.cpp - -IceStormInternal.h IceStormInternal.cpp: IceStormInternal.ice $(SLICE2CPP) - rm -f IceStormInternal.h IceStormInternal.cpp - $(SLICECMD) IceStormInternal.ice - -clean:: - rm -f IceStormInternal.h IceStormInternal.cpp - StringBoolDict.h StringBoolDict.cpp: $(SLICE2FREEZE) rm -f StringBoolDict.h StringBoolDict.cpp $(SLICE2FREEZECMD) --dict IceStorm::StringBoolDict,string,bool StringBoolDict @@ -102,13 +87,6 @@ StringBoolDict.h StringBoolDict.cpp: $(SLICE2FREEZE) clean:: rm -f StringBoolDict.h StringBoolDict.cpp -LinkDB.h LinkDB.cpp: LinkDB.ice $(SLICE2CPP) - rm -f LinkDB.h LinkDB.cpp - $(SLICECMD) LinkDB.ice - -clean:: - rm -f LinkDB.h LinkDB.cpp - IdentityLinkDict.h IdentityLinkDict.cpp: ../IceStorm/LinkDB.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) rm -f IdentityLinkDict.h IdentityLinkDict.cpp $(SLICE2FREEZECMD) --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkDB IdentityLinkDict \ @@ -117,19 +95,11 @@ IdentityLinkDict.h IdentityLinkDict.cpp: ../IceStorm/LinkDB.ice $(slicedir)/Ice/ clean:: rm -f IdentityLinkDict.h IdentityLinkDict.cpp -Grammar.cpp Grammar.h: Grammar.y - bison -dvt Grammar.y - rm -f Grammar.cpp ; mv Grammar.tab.c Grammar.cpp - rm -f Grammar.h ; mv Grammar.tab.h Grammar.h - -Scanner.cpp: Scanner.l Grammar.h - flex Scanner.l - rm -f Scanner.cpp - echo '#include <IceUtil/Config.h>' > Scanner.cpp - cat lex.yy.c >> Scanner.cpp +# Needed for make -jn to work. +../IceStorm/Grammar.y: Grammar.h clean:: - -rm -f Grammar.cpp Grammar.h Grammar.output - -rm -f Scanner.cpp lex.yy.c + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp include .depend diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile index ef1086927d9..4b37a99b265 100644 --- a/cpp/src/Slice/Makefile +++ b/cpp/src/Slice/Makefile @@ -36,19 +36,11 @@ $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) -Grammar.cpp Grammar.h: Grammar.y - bison -dvt Grammar.y - rm -f Grammar.cpp ; mv Grammar.tab.c Grammar.cpp - rm -f Grammar.h ; mv Grammar.tab.h Grammar.h - -Scanner.cpp: Scanner.l Grammar.h - flex Scanner.l - rm -f Scanner.cpp - echo '#include <IceUtil/Config.h>' > Scanner.cpp - cat lex.yy.c >> Scanner.cpp +# Needed for make -jn to work. +../Slice/Grammar.y: Grammar.h clean:: - -rm -f Grammar.cpp Grammar.h Grammar.output - -rm -f Scanner.cpp lex.yy.c + rm -f Grammar.cpp Grammar.h + rm -f Scanner.cpp include .depend diff --git a/cpp/src/XMLTransform/Makefile b/cpp/src/XMLTransform/Makefile index b9a7998220d..f7400b04057 100644 --- a/cpp/src/XMLTransform/Makefile +++ b/cpp/src/XMLTransform/Makefile @@ -40,7 +40,7 @@ $(VERSIONED_NAME): $(OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) -$(TRANSFORM_DB): $(TRANSFORM_OBJS) +$(TRANSFORM_DB): $(TRANSFORM_OBJS) $(NAME) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) $(XERCESC_LIBS) $(DB_LIBS) diff --git a/cpp/src/Yellow/Makefile b/cpp/src/Yellow/Makefile index e96b13eb8a9..0d4a268e377 100644 --- a/cpp/src/Yellow/Makefile +++ b/cpp/src/Yellow/Makefile @@ -46,11 +46,11 @@ SLICE_SRCS = $(SDIR)/Yellow.ice HDIR = $(includedir)/Yellow SDIR = $(slicedir)/Yellow -SLICECMD = $(SLICE2CPP) --ice --include-dir Yellow $(ICECPPFLAGS) SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir Yellow $(ICECPPFLAGS) include $(top_srcdir)/config/Make.rules +SLICE2CPPFLAGS := --ice --include-dir Yellow $(SLICE2CPPFLAGS) CPPFLAGS := -I.. $(CPPFLAGS) $(VERSIONED_NAME): $(OBJS) @@ -65,15 +65,7 @@ $(ADMIN): $(AOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(AOBJS) -lYellow $(LIBS) -lreadline -lcurses -$(HDIR)/Yellow.h Yellow.cpp: $(SDIR)/Yellow.ice $(SLICE2CPP) - rm -f $(HDIR)/Yellow.h Yellow.cpp - $(SLICECMD) --dll-export ICE_YELLOW_API $(SDIR)/Yellow.ice - mv Yellow.h $(HDIR) - -clean:: - rm -f $(HDIR)/Yellow.h Yellow.cpp - -StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp: $(SLICE2FREEZE) +../Yellow/StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp: $(SLICE2FREEZE) rm -f StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp $(SLICE2FREEZECMD) --dict Yellow::StringObjectProxySeqDict,string,Ice::ObjectProxySeq \ StringObjectProxySeqDict $(slicedir)/Ice/BuiltinSequences.ice @@ -81,19 +73,11 @@ StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp: $(SLICE2FREEZE) clean:: rm -f StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp -Grammar.cpp Grammar.h: Grammar.y - bison -dvt Grammar.y - rm -f Grammar.cpp ; mv Grammar.tab.c Grammar.cpp - rm -f Grammar.h ; mv Grammar.tab.h Grammar.h - -Scanner.cpp: Scanner.l Grammar.h - flex Scanner.l - rm -f Scanner.cpp - echo '#include <IceUtil/Config.h>' > Scanner.cpp - cat lex.yy.c >> Scanner.cpp +# Needed for make -jn to work. +../Yellow/Grammar.y: Grammar.h clean:: - -rm -f Grammar.cpp Grammar.h Grammar.output - -rm -f Scanner.cpp lex.yy.c + rm -f Grammar.cpp Grammar.h + rm -f Scanner.cpp include .depend diff --git a/cpp/src/icecpp/Makefile b/cpp/src/icecpp/Makefile index 3e05316632f..f6662c1574a 100644 --- a/cpp/src/icecpp/Makefile +++ b/cpp/src/icecpp/Makefile @@ -35,3 +35,6 @@ cexp.c: cexp.y $(NAME): $(OBJS) rm -f $@ $(CC) -o $@ $(OBJS) + +clean:: + rm -f cexp.c
\ No newline at end of file diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index 83adbc98c93..da5dfcb4a82 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -37,28 +37,6 @@ $(CLIENT): $(OBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -Grammar.cpp Grammar.h: Grammar.y - bison -dvt Grammar.y - rm -f Grammar.cpp ; mv Grammar.tab.c Grammar.cpp - rm -f Grammar.h ; mv Grammar.tab.h Grammar.h - -Scanner.cpp: Scanner.l Grammar.h - flex Scanner.l - rm -f Scanner.cpp - echo '#include <IceUtil/Config.h>' > Scanner.cpp - cat lex.yy.c >> Scanner.cpp - -clean:: - -rm -f Grammar.cpp Grammar.h Grammar.output - -rm -f Scanner.cpp lex.yy.c - -Complex.h Complex.cpp: Complex.ice $(SLICE2CPP) - rm -f Complex.h Complex.cpp - $(SLICE2CPP) -I$(slicedir) Complex.ice - -clean:: - rm -f Complex.h Complex.cpp - ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) rm -f ComplexDict.h ComplexDict.cpp $(SLICE2FREEZE) -I$(slicedir) --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice @@ -66,4 +44,8 @@ ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) clean:: rm -f ComplexDict.h ComplexDict.cpp +clean:: + rm -f Grammar.cpp Grammar.h + rm -f Scanner.cpp + include .depend diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile index 9c00d048743..2ed2be32276 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -30,6 +30,8 @@ SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ $(SOBJS:.o=.cpp) +SLICE_SRCS = Test.ice + include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(DB_FLAGS) $(CPPFLAGS) @@ -42,11 +44,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile index 9428db098e3..2924ea14deb 100644 --- a/cpp/test/Glacier/starter/Makefile +++ b/cpp/test/Glacier/starter/Makefile @@ -44,11 +44,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Callback.h Callback.cpp: Callback.ice $(SLICE2CPP) - rm -f Callback.h Callback.cpp - $(SLICE2CPP) Callback.ice - -clean:: - rm -f Callback.h Callback.cpp - include .depend diff --git a/cpp/test/Ice/adapterDeactivation/Makefile b/cpp/test/Ice/adapterDeactivation/Makefile index 6b0cac2b934..c51392fc035 100644 --- a/cpp/test/Ice/adapterDeactivation/Makefile +++ b/cpp/test/Ice/adapterDeactivation/Makefile @@ -57,11 +57,4 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile index 9e6b5f5b5a8..06edd2b4869 100644 --- a/cpp/test/Ice/exceptions/Makefile +++ b/cpp/test/Ice/exceptions/Makefile @@ -55,11 +55,4 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/facets/Makefile b/cpp/test/Ice/facets/Makefile index 9e6b5f5b5a8..06edd2b4869 100644 --- a/cpp/test/Ice/facets/Makefile +++ b/cpp/test/Ice/facets/Makefile @@ -55,11 +55,4 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/faultTolerance/Makefile b/cpp/test/Ice/faultTolerance/Makefile index 94acccacbc2..4252ea9571d 100644 --- a/cpp/test/Ice/faultTolerance/Makefile +++ b/cpp/test/Ice/faultTolerance/Makefile @@ -45,11 +45,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/inheritance/Makefile b/cpp/test/Ice/inheritance/Makefile index 9e6b5f5b5a8..06edd2b4869 100644 --- a/cpp/test/Ice/inheritance/Makefile +++ b/cpp/test/Ice/inheritance/Makefile @@ -55,11 +55,4 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/location/Makefile b/cpp/test/Ice/location/Makefile index cbdb7b4d137..bec8d169311 100644 --- a/cpp/test/Ice/location/Makefile +++ b/cpp/test/Ice/location/Makefile @@ -46,11 +46,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/locationForward/Makefile b/cpp/test/Ice/locationForward/Makefile index 94acccacbc2..4252ea9571d 100644 --- a/cpp/test/Ice/locationForward/Makefile +++ b/cpp/test/Ice/locationForward/Makefile @@ -45,11 +45,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile index 9e6b5f5b5a8..06edd2b4869 100644 --- a/cpp/test/Ice/objects/Makefile +++ b/cpp/test/Ice/objects/Makefile @@ -55,11 +55,4 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/Ice/operations/Makefile b/cpp/test/Ice/operations/Makefile index 74a5ec90dea..31f219fc44e 100644 --- a/cpp/test/Ice/operations/Makefile +++ b/cpp/test/Ice/operations/Makefile @@ -57,11 +57,4 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile index 94e28afa602..4eef9559911 100644 --- a/cpp/test/IcePack/deployer/Makefile +++ b/cpp/test/IcePack/deployer/Makefile @@ -56,11 +56,4 @@ $(VERSIONED_SVC): $(OBJS) $(SERVICE_OBJS) rm -f $@ $(CXX) $(SHLIB_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(SERVICE_OBJS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/IcePack/simple/Makefile b/cpp/test/IcePack/simple/Makefile index 6da39f0b058..d9071a3a312 100644 --- a/cpp/test/IcePack/simple/Makefile +++ b/cpp/test/IcePack/simple/Makefile @@ -45,11 +45,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - -clean:: - rm -f Test.h Test.cpp - include .depend diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile index b843eba3b57..8eebb6e0266 100644 --- a/cpp/test/IceSSL/certificateVerification/Makefile +++ b/cpp/test/IceSSL/certificateVerification/Makefile @@ -43,11 +43,4 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS) -Pinger.h Pinger.cpp: Pinger.ice $(SLICE2CPP) - rm -f Pinger.h Pinger.cpp - $(SLICE2CPP) $(ICECPPFLAGS) Pinger.ice - -clean:: - rm -f Pinger.h Pinger.cpp - include .depend diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile index 21456fc969b..28a4cc05331 100644 --- a/cpp/test/IceStorm/federation/Makefile +++ b/cpp/test/IceStorm/federation/Makefile @@ -44,11 +44,4 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Event.h Event.cpp: Event.ice $(SLICE2CPP) - rm -f Event.h Event.cpp - $(SLICE2CPP) Event.ice - -clean:: - rm -f Event.h Event.cpp - include .depend diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile index 4c1c0dd072f..7fe5fda6096 100644 --- a/cpp/test/IceStorm/single/Makefile +++ b/cpp/test/IceStorm/single/Makefile @@ -44,11 +44,4 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) -Single.h Single.cpp: Single.ice $(SLICE2CPP) - rm -f Single.h Single.cpp - $(SLICE2CPP) Single.ice - -clean:: - rm -f Single.h Single.cpp - include .depend diff --git a/cpp/test/IceXML/encoding/Makefile b/cpp/test/IceXML/encoding/Makefile index d8e53b5da04..4bd52a7291d 100644 --- a/cpp/test/IceXML/encoding/Makefile +++ b/cpp/test/IceXML/encoding/Makefile @@ -36,11 +36,7 @@ Test.xsd: Test.ice $(SLICE2XSD) rm -f Test.xsd $(SLICE2XSD) Test.ice -Test.h Test.cpp: Test.ice $(SLICE2CPP) - rm -f Test.h Test.cpp - $(SLICE2CPP) Test.ice - clean:: - rm -f Test.h Test.cpp + rm -f Test.xsd include .depend diff --git a/cpp/test/XMLTransform/transform/Makefile b/cpp/test/XMLTransform/transform/Makefile index 40d97da406e..864b1a5b416 100644 --- a/cpp/test/XMLTransform/transform/Makefile +++ b/cpp/test/XMLTransform/transform/Makefile @@ -57,6 +57,9 @@ VALIDATE_OBJS = Validate.o \ SRCS = $(POPULATE_OBJS:.o=.cpp) \ $(VALIDATE_OBJS:.o=.cpp) +SLICE_SRCS = TestOld.ice \ + TestNew.ice + SCHEMAS = TestOld.xsd \ TestNew.xsd \ Identity.xsd @@ -170,14 +173,6 @@ TestNew.xsd: TestNew.ice $(SLICE2XSD) Identity.xsd: $(top_srcdir)/slice/Ice/Identity.ice $(SLICE2XSD) $(SLICE2XSD) --ice -I$(top_srcdir)/slice $(top_srcdir)/slice/Ice/Identity.ice -TestOld.h TestOld.cpp: TestOld.ice - rm -f TestOld.h TestOld.cpp - $(SLICE2CPP) TestOld.ice - -TestNew.h TestNew.cpp: TestNew.ice - rm -f TestNew.h TestNew.cpp - $(SLICE2CPP) TestNew.ice - clean:: rm -f IntByteMap.h IntByteMap.cpp rm -f IntShortMap.h IntShortMap.cpp @@ -204,5 +199,6 @@ clean:: rm -f IntS1MapNew.h IntS1MapNew.cpp rm -f IntC1MapOld.h IntC1MapOld.cpp rm -f IntC1MapNew.h IntC1MapNew.cpp + rm -f Identity.xsd include .depend |