diff options
| -rw-r--r-- | ACEXML/Makefile.bor | 9 | ||||
| -rw-r--r-- | ACEXML/common/Makefile.bor | 4 | ||||
| -rw-r--r-- | ACEXML/parser/Makefile.bor | 8 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Makefile.bor | 1 | ||||
| -rw-r--r-- | ACEXML/tests/Makefile.bor | 23 | ||||
| -rw-r--r-- | include/makeinclude/ace_flags.bor | 2 |
6 files changed, 43 insertions, 4 deletions
diff --git a/ACEXML/Makefile.bor b/ACEXML/Makefile.bor new file mode 100644 index 00000000000..0e25ede588e --- /dev/null +++ b/ACEXML/Makefile.bor @@ -0,0 +1,9 @@ +# +# Makefile for building the ACE XML Library +# + +DIRS = \ + common \ + parser + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/ACEXML/common/Makefile.bor b/ACEXML/common/Makefile.bor index 67e6bb0ec14..30be682e3b0 100644 --- a/ACEXML/common/Makefile.bor +++ b/ACEXML/common/Makefile.bor @@ -22,8 +22,8 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ - -DACEXML_BUILD_DLL \ - -I.. + $(ACE_XML_CFLAGS) \ + -DACEXML_BUILD_DLL CPPDIR = .;.. diff --git a/ACEXML/parser/Makefile.bor b/ACEXML/parser/Makefile.bor new file mode 100644 index 00000000000..a8113a7d2b2 --- /dev/null +++ b/ACEXML/parser/Makefile.bor @@ -0,0 +1,8 @@ +# +# Makefile for building the ACE XML parser Library +# + +DIRS = \ + parser + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/ACEXML/parser/parser/Makefile.bor b/ACEXML/parser/parser/Makefile.bor index b25c86612d6..d9361e0108f 100644 --- a/ACEXML/parser/parser/Makefile.bor +++ b/ACEXML/parser/parser/Makefile.bor @@ -9,7 +9,6 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ $(ACE_XML_CFLAGS) \ - -I..\.. \ -DACEXML_PARSER_BUILD_DLL CPPDIR = .;.. diff --git a/ACEXML/tests/Makefile.bor b/ACEXML/tests/Makefile.bor new file mode 100644 index 00000000000..0742a1add18 --- /dev/null +++ b/ACEXML/tests/Makefile.bor @@ -0,0 +1,23 @@ +# +# $Id$ +# Makefile for building the ACE XML tests +# + +NAMES = \ + NamespaceSupport_Test \ + Transcoder_Test + +OBJFILES = $(OBJDIR)\$(NAME).obj + +CFLAGS = \ + $(ACE_CFLAGS) \ + $(ACE_XML_CFLAGS) + +CPPDIR = . + +LIBFILES = \ + $(ACE_LIB) \ + $(ACE_XML_LIB) + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> +!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index 48ea3e90a0a..e19f9a83fba 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -22,7 +22,7 @@ ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG !ifdef SSL_ROOT SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1 !endif -ACE_XML_CFLAGS = -I$(ACE_ROOT) -DACEXML_HAS_DLL=$(DLL_FLAG) +ACE_XML_CFLAGS = -I$(ACE_ROOT) -I$(ACE_ROOT)\XML -DACEXML_HAS_DLL=$(DLL_FLAG) ACE_SSL_CFLAGS = -I$(ACE_ROOT) -DACE_SSL_HAS_DLL=$(DLL_FLAG) ACE_QOS_CFLAGS = -I$(ACE_ROOT) -DACE_QoS_HAS_DLL=$(DLL_FLAG) ACE_RMCAST_CFLAGS = -I$(ACE_ROOT) -DACE_RMCAST_HAS_DLL=$(DLL_FLAG) |