diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-10 03:56:25 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-10 03:56:25 +0000 |
| commit | 5d73204c8424b0e8a772299ab32b5c7424ccd0ca (patch) | |
| tree | 058e57a252b95c69172c1f72bb361a3c24ede693 | |
| parent | ca1ef9ffbb131990be9b47fcd5022aeff20f5371 (diff) | |
| download | ATCD-5d73204c8424b0e8a772299ab32b5c7424ccd0ca.tar.gz | |
updated ACE_COMPONENTS check to allow everything to be built
in the default case, when ACE_COMPONENTS isn't set.
| -rw-r--r-- | netsvcs/Makefile | 19 | ||||
| -rw-r--r-- | netsvcs/clients/Makefile | 17 |
2 files changed, 25 insertions, 11 deletions
diff --git a/netsvcs/Makefile b/netsvcs/Makefile index 9b1a09d8387..8ec5a02908e 100644 --- a/netsvcs/Makefile +++ b/netsvcs/Makefile @@ -14,17 +14,24 @@ INFO = README DIRS = lib \ clients -ifeq (Other,$(findstring Other,$(ACE_COMPONENTS))) - ifeq (Token,$(findstring Token,$(ACE_COMPONENTS))) - DIRS += servers - endif # Token -endif # Other - #---------------------------------------------------------------------------- # 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/clients/Makefile b/netsvcs/clients/Makefile index 6204dcc34fd..1426fdb2a70 100644 --- a/netsvcs/clients/Makefile +++ b/netsvcs/clients/Makefile @@ -8,17 +8,24 @@ # Local macros #---------------------------------------------------------------------------- -ifeq (Other,$(findstring Other,$(ACE_COMPONENTS))) - DIRS = Logger \ - Naming \ - Tokens -endif # Other +DIRS = Logger \ + Naming \ + Tokens #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +#### If ACE_COMPONENTS was set and doesn't contain Other, don't +#### try to build any of the clients. +ifdef ACE_COMPONENTS + ifeq (,$(findstring Other,$(ACE_COMPONENTS))) + DIRS = + endif # ! Other +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 |