4 files changed, 61 insertions, 26 deletions
diff --git a/ACEXML/parser/debug_validator/Makefile b/ACEXML/parser/debug_validator/Makefile
new file mode 100644
index 00000000000..84ba07cb748
--- /dev/null
+++ b/ACEXML/parser/debug_validator/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.Validator -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.Validator -C . $(@)"
+endif
diff --git a/ACEXML/parser/debug_validator/Makefile.Validator b/ACEXML/parser/debug_validator/Makefile.Validator
index aba23bd3161..fce31a6081f 100644
--- a/ACEXML/parser/debug_validator/Makefile.Validator
+++ b/ACEXML/parser/debug_validator/Makefile.Validator
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.Validator
 DEPENDENCY_FILE = .depend.Makefile.Validator
 LIB_UNCHECKED   = libACEXML_Validator.a
@@ -10,17 +9,17 @@ SHLIB_UNCHECKED = libACEXML_Validator.$(SOEXT)
 
 
 FILES = \
-  Debug_Attributes_Builder \
-  Debug_DTD_Manager \
   Debug_Element_Builder \
-  Element_Tree
+  Element_Tree \
+  Debug_DTD_Manager \
+  Debug_Attributes_Builder
+#----------------------------------------------------------------------------
+#       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
@@ -32,18 +31,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
diff --git a/ACEXML/parser/parser/Makefile b/ACEXML/parser/parser/Makefile
new file mode 100644
index 00000000000..253f01100d3
--- /dev/null
+++ b/ACEXML/parser/parser/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.Parser -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.Parser -C . $(@)"
+endif
diff --git a/ACEXML/parser/parser/Makefile.Parser b/ACEXML/parser/parser/Makefile.Parser
index 0a0a464f338..0986826a655 100644
--- a/ACEXML/parser/parser/Makefile.Parser
+++ b/ACEXML/parser/parser/Makefile.Parser
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.Parser
 DEPENDENCY_FILE = .depend.Makefile.Parser
 LIB_UNCHECKED   = libACEXML_Parser.a
@@ -10,17 +9,17 @@ SHLIB_UNCHECKED = libACEXML_Parser.$(SOEXT)
 
 
 FILES = \
-  Entity_Manager \
   Parser \
+  Entity_Manager \
   ParserContext \
   ParserInternals
+#----------------------------------------------------------------------------
+#       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
@@ -32,18 +31,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(shared_libs),1)
+  ifneq ($(SHLIB),)
+    CPPFLAGS += -DACEXML_PARSER_BUILD
+  endif
+endif
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-ACE_SHLIBS = -lACEXML $(ACELIB)
+ACE_SHLIBS  = -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