diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-24 17:49:08 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-24 17:49:08 +0000 |
| commit | e4b2386a785de60b880e3a87153ba1449c1057a4 (patch) | |
| tree | 8fb8f2725a603de0b03b36c117b1a81f15c6cb2f | |
| parent | 421245823dbef2b9b16c62e5ca93a9ad1e6c581a (diff) | |
| download | ATCD-e4b2386a785de60b880e3a87153ba1449c1057a4.tar.gz | |
ChangeLogTag:Sat May 24 17:21:40 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | examples/Service_Configurator/Misc/Makefile | 5 | ||||
| -rw-r--r-- | examples/Timer_Queue/Makefile.TQTD | 3 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Dump_Restore/Makefile.Dump_Restore | 4 |
4 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 22aa6dc3f91..728f4bae8a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat May 24 17:21:40 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * examples/Service_Configurator/Misc/Makefile: + Only compile if shared_libs is defined. Although the Service + Configurator will work with static only libraries, this example + will not. + + * examples/Timer_Queue/Makefile.TQTD: + * netsvcs/clients/Naming/Dump_Restore/Makefile.Dump_Restore: + Added LIB and VLIB so that static_libs and static_libs_only will + build and clean the lib*.a libraries. + Sat May 24 15:19:01 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-cygwin32.h: diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index 0f645f583d8..06688682c87 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -13,10 +13,13 @@ #---------------------------------------------------------------------------- MAKEFILE=Makefile +ifeq ($(shared_libs),1) # These examples don't require SSL support... those that do are below. MKLIST = Makefile.Timer \ Makefile.main - +else +MKLIST = +endif ## Ensure that Makefiles in MKLIST are executed in sequence during a ## parallel build because we share some files between multiple libraries. diff --git a/examples/Timer_Queue/Makefile.TQTD b/examples/Timer_Queue/Makefile.TQTD index 6a704a50b18..e99862afeca 100644 --- a/examples/Timer_Queue/Makefile.TQTD +++ b/examples/Timer_Queue/Makefile.TQTD @@ -8,6 +8,7 @@ # Local macros #---------------------------------------------------------------------------- +LIB = libTQTD.a SHLIB = libTQTD.$(SOEXT) FILES = Async_Timer_Queue_Test \ Reactor_Timer_Queue_Test \ @@ -17,7 +18,7 @@ LSRC = $(addsuffix .cpp,$(FILES)) LIBS += $(ACELIB) -BUILD = $(VSHLIB) +BUILD = $(VLIB) $(VSHLIB) #---------------------------------------------------------------------------- # Include macros and targets diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.Dump_Restore b/netsvcs/clients/Naming/Dump_Restore/Makefile.Dump_Restore index cef7bbaa9c5..1c827790270 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile.Dump_Restore +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.Dump_Restore @@ -8,18 +8,20 @@ # Local macros #---------------------------------------------------------------------------- +LIB2 = libDump_Restore.a SHLIB2 = libDump_Restore.$(SOEXT) FILES = Dump_Restore LSRC = $(addsuffix .cpp,$(FILES)) LIBS += $(ACELIB) -BUILD = $(VSHLIB) +BUILD = $(VLIB) $(VSHLIB) #### If the ACE library wasn't built with sufficient components, don't #### try to build here. ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) + LIB = $(LIB2) SHLIB = $(SHLIB2) endif # Other |