diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-17 13:33:42 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-17 13:33:42 +0000 |
| commit | 315969d2e8cb38a2335a88cf02670336aecaaf61 (patch) | |
| tree | 159e4e72c96b78f05013634b11d6a3cb4f342a5e /netsvcs | |
| parent | 74c41392deddd984d3d6e46db90341cbe7a44d80 (diff) | |
| download | ATCD-315969d2e8cb38a2335a88cf02670336aecaaf61.tar.gz | |
updated for proper support of ACE subsets, with BIN2/LIB2/SHLIB2
Diffstat (limited to 'netsvcs')
| -rw-r--r-- | netsvcs/clients/Logger/Makefile | 42 | ||||
| -rw-r--r-- | netsvcs/clients/Makefile | 16 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Client/Makefile | 43 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Dump_Restore/Makefile | 61 | ||||
| -rw-r--r-- | netsvcs/clients/Tokens/collection/Makefile | 43 | ||||
| -rw-r--r-- | netsvcs/clients/Tokens/deadlock/Makefile | 43 | ||||
| -rw-r--r-- | netsvcs/clients/Tokens/invariant/Makefile | 43 | ||||
| -rw-r--r-- | netsvcs/clients/Tokens/manual/Makefile | 35 | ||||
| -rw-r--r-- | netsvcs/clients/Tokens/mutex/Makefile | 43 | ||||
| -rw-r--r-- | netsvcs/clients/Tokens/rw_lock/Makefile | 43 | ||||
| -rw-r--r-- | netsvcs/servers/Makefile | 19 |
11 files changed, 239 insertions, 192 deletions
diff --git a/netsvcs/clients/Logger/Makefile b/netsvcs/clients/Logger/Makefile index 7e0381019cc..0b01959e8b6 100644 --- a/netsvcs/clients/Logger/Makefile +++ b/netsvcs/clients/Logger/Makefile @@ -1,41 +1,47 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for client logging applications +# Makefile for client logging applications #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = direct_logging \ - indirect_logging - -LSRC = $(addsuffix .cpp,$(BIN)) +LSRC = $(addsuffix .cpp,$(BIN)) VLDLIBS = $(LDLIBS:%=%$(VAR)) -BUILD = $(VBIN) +BIN2 = direct_logging \ + indirect_logging + +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) +endif # Other #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- - + #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/netsvcs/clients/Makefile b/netsvcs/clients/Makefile index cd00dc819e3..00ad80fb15b 100644 --- a/netsvcs/clients/Makefile +++ b/netsvcs/clients/Makefile @@ -4,23 +4,15 @@ # Makefile for the client programs that test the ACE network services #---------------------------------------------------------------------------- +DIRS = Logger \ + Naming \ + Tokens + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -#### If the ACE library wasn't built with the Other component, don't -#### try to build the clients. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) -ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) - DIRS = Logger \ - Naming \ - Tokens -else - DIRS = -endif # ! Other - include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index a489da9eb22..bde751437cd 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -8,38 +8,45 @@ # Local macros #---------------------------------------------------------------------------- -BIN = main -LIB = libClient_Test.a -SHLIB = libClient_Test.$(SOEXT) - FILES = Client_Test -PSRC = $(addsuffix .cpp,$(BIN)) +PSRC = $(addsuffix .cpp,$(BIN)) OBJ = $(SRC:%.cpp=$(VDIR)%.o) -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) +LSRC = $(addsuffix .cpp,$(FILES)) +LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) SHOBJ = $(addsuffix .so,$(FILES)) LIBS += $(ACELIB) -LDLIBS = -lClient_Test - +LDLIBS = -lClient_Test + VLDLIBS = $(LDLIBS:%=%$(VAR)) -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) +BIN2 = main +LIB2 = libClient_Test.a +SHLIB2 = libClient_Test.$(SOEXT) + +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) + LIB = $(LIB2) + SHLIB = $(SHLIB2) +endif # Other #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- # Local targets @@ -48,6 +55,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile index c5e7f4e145a..721cc72dc54 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile @@ -1,53 +1,62 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for the ACE Dump-Restore Name_Server utility +# Makefile for the ACE Dump-Restore Name_Server utility #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = main -LIB = libDump_Restore.a -SHLIB = libDump_Restore.$(SOEXT) +FILES = Dump_Restore -FILES = Dump_Restore +PSRC = $(addsuffix .cpp,$(BIN)) +OBJ = $(SRC:%.cpp=$(VDIR)%.o) -PSRC = $(addsuffix .cpp,$(BIN)) -OBJ = $(SRC:%.cpp=$(VDIR)%.o) - -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) +LSRC = $(addsuffix .cpp,$(FILES)) +LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) +SHOBJ = $(addsuffix .so,$(FILES)) LIBS += $(ACELIB) -LDLIBS = -lDump_Restore - +LDLIBS = -lDump_Restore + VLDLIBS = $(LDLIBS:%=%$(VAR)) -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) +BIN2 = main +LIB2 = libDump_Restore.a +SHLIB2 = libDump_Restore.$(SOEXT) + +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) + LIB = $(LIB2) + SHLIB = $(SHLIB2) +endif # Other #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile index f711d160ef4..214c6347ae2 100644 --- a/netsvcs/clients/Tokens/collection/Makefile +++ b/netsvcs/clients/Tokens/collection/Makefile @@ -1,41 +1,46 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for repeating token client application +# Makefile for repeating token client application #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = collection +FILES = collection -FILES = collection +LSRC = $(addsuffix .cpp,$(FILES)) +LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) +SHOBJ = $(addsuffix .so,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) +BIN2 = collection -BUILD = $(VBIN) +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) +endif # Token #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile index 654e84a44d7..680e9aa918b 100644 --- a/netsvcs/clients/Tokens/deadlock/Makefile +++ b/netsvcs/clients/Tokens/deadlock/Makefile @@ -1,41 +1,46 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for repeating token client application +# Makefile for repeating token client application #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = deadlock_detection_test +FILES = deadlock_detection_test -FILES = deadlock_detection_test +LSRC = $(addsuffix .cpp,$(FILES)) +LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) +SHOBJ = $(addsuffix .so,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) +BIN2 = deadlock_detection_test -BUILD = $(VBIN) +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) +endif # Token #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile index fa31a5140e3..48085803036 100644 --- a/netsvcs/clients/Tokens/invariant/Makefile +++ b/netsvcs/clients/Tokens/invariant/Makefile @@ -1,41 +1,46 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for repeating token client application +# Makefile for repeating token client application #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = invariant +FILES = invariant -FILES = invariant +LSRC = $(addsuffix .cpp,$(FILES)) +LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) +SHOBJ = $(addsuffix .so,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) +BIN2 = invariant -BUILD = $(VBIN) +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) +endif # Token #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Tokens/manual/Makefile b/netsvcs/clients/Tokens/manual/Makefile index 480195f332d..ad7c54f1ac4 100644 --- a/netsvcs/clients/Tokens/manual/Makefile +++ b/netsvcs/clients/Tokens/manual/Makefile @@ -1,36 +1,41 @@ #---------------------------------------------------------------------------- -# $Id: Makefile 1.1 10/18/96 +# $Id$ # -# Makefile for repeating token client application +# Makefile for repeating token client application #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = manual +FILES = manual -FILES = manual +BIN2 = manual -BUILD = $(VBIN) +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) +endif # Token #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile index a229ed7d071..28473118278 100644 --- a/netsvcs/clients/Tokens/mutex/Makefile +++ b/netsvcs/clients/Tokens/mutex/Makefile @@ -1,41 +1,46 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for repeating token client application +# Makefile for repeating token client application #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = test_mutex +FILES = test_mutex -FILES = test_mutex +LSRC = $(addsuffix .cpp,$(FILES)) +LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) +SHOBJ = $(addsuffix .so,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) +BIN2 = test_mutex -BUILD = $(VBIN) +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) +endif # Token #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile index 50b8b740dd9..3859d16f9ed 100644 --- a/netsvcs/clients/Tokens/rw_lock/Makefile +++ b/netsvcs/clients/Tokens/rw_lock/Makefile @@ -1,41 +1,46 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile for repeating token client application +# Makefile for repeating token client application #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = rw_locks +FILES = rw_locks -FILES = rw_locks +LSRC = $(addsuffix .cpp,$(FILES)) +LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) +SHOBJ = $(addsuffix .so,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) +BIN2 = rw_locks -BUILD = $(VBIN) +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. +ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) + BIN = $(BIN2) +endif # Token #---------------------------------------------------------------------------- -# Include macros and targets +# Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- -# Local targets +# Local targets #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile index ebe864d27b4..803ecd86d8e 100644 --- a/netsvcs/servers/Makefile +++ b/netsvcs/servers/Makefile @@ -10,23 +10,24 @@ LDLIBS = -lnetsvcs VLDLIBS = $(LDLIBS:%=%$(VAR)) +LSRC = $(addsuffix .cpp,$(BIN)) -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +BIN2 = main -#### If the ACE library wasn't built with Token and Other components, don't -#### try to build the server. +#### If the ACE library wasn't built with sufficient components, don't +#### try to build here. ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) - BIN = main - LSRC = $(addsuffix .cpp,$(BIN)) + BIN = $(BIN2) endif # ! Token endif # ! Other +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU |