summaryrefslogtreecommitdiff
path: root/netsvcs/clients/Naming/Dump_Restore/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'netsvcs/clients/Naming/Dump_Restore/Makefile')
-rw-r--r--netsvcs/clients/Naming/Dump_Restore/Makefile67
1 files changed, 32 insertions, 35 deletions
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile
index 721cc72dc54..c168b892a6f 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile
+++ b/netsvcs/clients/Naming/Dump_Restore/Makefile
@@ -1,62 +1,53 @@
#----------------------------------------------------------------------------
-# $Id$
+# $Id$
#
-# Makefile for the ACE Dump-Restore Name_Server utility
+# Makefile for the ACE Dump-Restore Name_Server utility
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
-# Local macros
+# Local macros
#----------------------------------------------------------------------------
-FILES = Dump_Restore
+BIN = main
+LIB = libDump_Restore.a
+SHLIB = libDump_Restore.$(SOEXT)
-PSRC = $(addsuffix .cpp,$(BIN))
-OBJ = $(SRC:%.cpp=$(VDIR)%.o)
+FILES = Dump_Restore
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ = $(addsuffix .so,$(FILES))
+PSRC = $(addsuffix .cpp,$(BIN))
+OBJ = $(SRC:%.cpp=$(VDIR)%.o)
-LIBS += $(ACELIB)
+LSRC = $(addsuffix .cpp,$(FILES))
+LOBJ = $(LSRC:%.cpp=$(VDIR)%.o)
+SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = -lDump_Restore
+LIBS += $(ACELIB)
+LDLIBS = -lDump_Restore
+
VLDLIBS = $(LDLIBS:%=%$(VAR))
-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
+BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(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.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.
@@ -67,6 +58,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/ACE.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \
@@ -164,6 +158,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
$(ACE_ROOT)/ace/ACE.h \
$(ACE_ROOT)/ace/OS.h \
$(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
$(ACE_ROOT)/ace/streams.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/Basic_Types.i \