diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-10 05:16:50 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-10 05:16:50 +0000 |
| commit | de6181cc4413e5c30bdf98104d46ae92d8760924 (patch) | |
| tree | f678c629ba674145dcc4ebafc7f9e4beda7764b7 | |
| parent | e6253414a06275ed7e428491c29f7de1093218e6 (diff) | |
| download | ATCD-de6181cc4413e5c30bdf98104d46ae92d8760924.tar.gz | |
moved netsvcs/server build suppression from netsvcs/Makefile to netsvcs/servers/Makefile
| -rw-r--r-- | netsvcs/Makefile | 16 | ||||
| -rw-r--r-- | netsvcs/servers/Makefile | 47 |
2 files changed, 30 insertions, 33 deletions
diff --git a/netsvcs/Makefile b/netsvcs/Makefile index 8ec5a02908e..47f87672c9f 100644 --- a/netsvcs/Makefile +++ b/netsvcs/Makefile @@ -12,26 +12,14 @@ INFO = README # lib must come first! DIRS = lib \ - clients + clients \ + servers #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -#### If ACE_COMPONENTS was set and doesn't contain Other and Token, don't -#### try to build the servers. -ifdef ACE_COMPONENTS - ifeq (Other,$(findstring Other,$(ACE_COMPONENTS))) - ifeq (Token,$(findstring Token,$(ACE_COMPONENTS))) - DIRS += servers - endif # Token - endif # Other -else # ! ACE_COMPONENTS - DIRS += servers -endif # ! ACE_COMPONENTS - 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/servers/Makefile b/netsvcs/servers/Makefile index e94a35325f1..4d4eee60ba1 100644 --- a/netsvcs/servers/Makefile +++ b/netsvcs/servers/Makefile @@ -1,41 +1,50 @@ #---------------------------------------------------------------------------- -# $Id$ +# $Id$ # -# Makefile +# Makefile #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# Local macros +# Local macros #---------------------------------------------------------------------------- -BIN = main -LSRC = $(addsuffix .cpp,$(BIN)) - -LDLIBS = -lnetsvcs - +LDLIBS = -lnetsvcs VLDLIBS = $(LDLIBS:%=%$(VAR)) -BUILD = $(VBIN) - #---------------------------------------------------------------------------- -# 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 + +#### If ACE_COMPONENTS was set and doesn't contain Other and Token, don't +#### try to build the server. +ifdef ACE_COMPONENTS + ifeq (Other,$(findstring Other,$(ACE_COMPONENTS))) + ifeq (Token,$(findstring Token,$(ACE_COMPONENTS))) + BIN = main + LSRC = $(addsuffix .cpp,$(BIN)) + endif # Token + endif # Other +else # ! ACE_COMPONENTS + BIN = main + LSRC = $(addsuffix .cpp,$(BIN)) +endif # ! ACE_COMPONENTS + +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 #---------------------------------------------------------------------------- CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib #---------------------------------------------------------------------------- -# Dependencies +# Dependencies #---------------------------------------------------------------------------- # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. |