summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-12-05 19:36:40 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-12-05 19:36:40 +0000
commitc5bda221c24c1e5fb28ea62e4671204fc5622962 (patch)
treeea14b84de17f1a19f24ffdc09ecb0559d5ed83a9
parent49dba5e16aec6fc1a7e81a1444b5aa5b7f7516e4 (diff)
downloadATCD-c5bda221c24c1e5fb28ea62e4671204fc5622962.tar.gz
ChangeLogTag: Thu Dec 5 14:35:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--netsvcs/clients/Naming/Client/Makefile2
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b7fad95985b..dd31cdaa86a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 5 14:35:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ * netsvcs/clients/Naming/Client/Makefile: Do not build in static
+ builds.
+
Thu Dec 5 07:39:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* bin/auto_run_tests.lst: Removed Bug_1020_Regression from the
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b7fad95985b..dd31cdaa86a 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Thu Dec 5 14:35:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ * netsvcs/clients/Naming/Client/Makefile: Do not build in static
+ builds.
+
Thu Dec 5 07:39:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* bin/auto_run_tests.lst: Removed Bug_1020_Regression from the
diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile
index ea9adf1eb0c..0fad4ce9bc2 100644
--- a/netsvcs/clients/Naming/Client/Makefile
+++ b/netsvcs/clients/Naming/Client/Makefile
@@ -21,11 +21,13 @@ LIBS += $(ACELIB)
#### 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)
+ifneq ($(static_libs_only),1)
ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
BIN = main
SHLIB = libClient_Test.$(SOEXT)
BUILD = $(VSHLIB) $(VBIN)
endif # Other
+endif # static_libs_only
#----------------------------------------------------------------------------
# Include macros and targets