ChangeLogTag: Fri Jan 24 20:28:22 2003 Krishnakumar B <kitty@insanely.long.id.truncated>Validator

4 files changed, 48 insertions, 18 deletions

diff --git a/ACEXML/examples/SAXPrint/Makefile b/ACEXML/examples/SAXPrint/Makefile
new file mode 100644
index 00000000000..79a07ed6ca5
--- /dev/null
+++ b/ACEXML/examples/SAXPrint/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.SAXPrint -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.SAXPrint -C . $(@)"
+endif
diff --git a/ACEXML/examples/SAXPrint/Makefile.SAXPrint b/ACEXML/examples/SAXPrint/Makefile.SAXPrint
index 752f4b81b2e..7822bd66b94 100644
--- a/ACEXML/examples/SAXPrint/Makefile.SAXPrint
+++ b/ACEXML/examples/SAXPrint/Makefile.SAXPrint
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.SAXPrint
 DEPENDENCY_FILE = .depend.Makefile.SAXPrint
 BIN_UNCHECKED   = SAXPrint
@@ -12,10 +11,10 @@ FILES = \
   main \
   SAXPrint_Handler \
   Print_Handler
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
@@ -30,9 +29,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-LDLIBS = -lACEXML_Parser -lACEXML
+LDLIBS  = -lACEXML_Parser -lACEXML
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -41,10 +47,5 @@ LDLIBS = -lACEXML_Parser -lACEXML
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/examples/svcconf/Makefile b/ACEXML/examples/svcconf/Makefile
new file mode 100644
index 00000000000..d476cd46d25
--- /dev/null
+++ b/ACEXML/examples/svcconf/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.Svcconf -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.Svcconf -C . $(@)"
+endif
diff --git a/ACEXML/examples/svcconf/Makefile.Svcconf b/ACEXML/examples/svcconf/Makefile.Svcconf
index ccce348faad..0cc2cb5e5db 100644
--- a/ACEXML/examples/svcconf/Makefile.Svcconf
+++ b/ACEXML/examples/svcconf/Makefile.Svcconf
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.Svcconf
 DEPENDENCY_FILE = .depend.Makefile.Svcconf
 BIN_UNCHECKED   = Svcconf
@@ -11,10 +10,10 @@ BIN_UNCHECKED   = Svcconf
 FILES = \
   main \
   Svcconf_Handler
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
@@ -29,9 +28,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-LDLIBS = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML
+LDLIBS  = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -40,10 +46,5 @@ LDLIBS = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY