summaryrefslogtreecommitdiff
path: root/ACEXML/apps/svcconf
diff options
context:
space:
mode:
Diffstat (limited to 'ACEXML/apps/svcconf')
-rw-r--r--ACEXML/apps/svcconf/Makefile14
-rw-r--r--ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser23
2 files changed, 26 insertions, 11 deletions
diff --git a/ACEXML/apps/svcconf/Makefile b/ACEXML/apps/svcconf/Makefile
new file mode 100644
index 00000000000..9facd56ca45
--- /dev/null
+++ b/ACEXML/apps/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.XML_Svc_Conf_Parser -C . $(@);
+else
+ -@cmd /c "$(MAKE) -f Makefile.XML_Svc_Conf_Parser -C . $(@)"
+endif
diff --git a/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser b/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser
index d59b8be097e..7fac40d9792 100644
--- a/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser
+++ b/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser
@@ -1,7 +1,6 @@
#----------------------------------------------------------------------------
# GNU Makefile
#----------------------------------------------------------------------------
-
MAKEFILE = Makefile.XML_Svc_Conf_Parser
DEPENDENCY_FILE = .depend.Makefile.XML_Svc_Conf_Parser
LIB_UNCHECKED = libACEXML_XML_Svc_Conf_Parser.a
@@ -12,13 +11,13 @@ SHLIB_UNCHECKED = libACEXML_XML_Svc_Conf_Parser.$(SOEXT)
FILES = \
Svcconf \
Svcconf_Handler
+#----------------------------------------------------------------------------
+# Include macros and targets
+#----------------------------------------------------------------------------
LIB = $(LIB_UNCHECKED)
SHLIB = $(SHLIB_UNCHECKED)
-#----------------------------------------------------------------------------
-# Include macros and targets
-#----------------------------------------------------------------------------
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
LSRC = $(addsuffix .cpp, $(FILES))
ACELIB = -lACE
@@ -30,18 +29,20 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.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
-ACE_SHLIBS = -lACEXML_Parser -lACEXML $(ACELIB)
+ACE_SHLIBS = -lACEXML_Parser -lACEXML $(ACELIB)
#----------------------------------------------------------------------------
# Local targets
#----------------------------------------------------------------------------
-#----------------------------------------------------------------------------
-# 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