diff options
Diffstat (limited to 'ACEXML/tests')
| -rw-r--r-- | ACEXML/tests/Makefile | 22 | ||||
| -rw-r--r-- | ACEXML/tests/Makefile.HttpCharStream_Test | 19 | ||||
| -rw-r--r-- | ACEXML/tests/Makefile.NamespaceSupport_Test | 19 | ||||
| -rw-r--r-- | ACEXML/tests/Makefile.Transcoder_Test | 19 |
4 files changed, 52 insertions, 27 deletions
diff --git a/ACEXML/tests/Makefile b/ACEXML/tests/Makefile new file mode 100644 index 00000000000..24ca1173078 --- /dev/null +++ b/ACEXML/tests/Makefile @@ -0,0 +1,22 @@ +# $Id$ +#---------------------------------------------------------------------------- +# GNU ACE Workspace +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +TARGETS_NESTED := $(TARGETS_NESTED:.nested=) +MFILES = \ + Makefile.HttpCharStream_Test \ + Makefile.Transcoder_Test \ + Makefile.NamespaceSupport_Test + +$(TARGETS_NESTED): +ifneq (Windows,$(findstring Windows,$(OS))) + @for file in $(MFILES); do \ + $(MAKE) -f `basename $$file` -C `dirname $$file` $(@); \ + done +else + -@cmd /c "$(MAKE) -f Makefile.HttpCharStream_Test -C . $(@)" + -@cmd /c "$(MAKE) -f Makefile.Transcoder_Test -C . $(@)" + -@cmd /c "$(MAKE) -f Makefile.NamespaceSupport_Test -C . $(@)" +endif diff --git a/ACEXML/tests/Makefile.HttpCharStream_Test b/ACEXML/tests/Makefile.HttpCharStream_Test index 2a9f8a7fadf..6429daab346 100644 --- a/ACEXML/tests/Makefile.HttpCharStream_Test +++ b/ACEXML/tests/Makefile.HttpCharStream_Test @@ -1,7 +1,6 @@ #---------------------------------------------------------------------------- # GNU Makefile #---------------------------------------------------------------------------- - MAKEFILE = Makefile.HttpCharStream_Test DEPENDENCY_FILE = .depend.Makefile.HttpCharStream_Test BIN_UNCHECKED = HttpCharStream_Test @@ -10,10 +9,10 @@ BIN_UNCHECKED = HttpCharStream_Test FILES = \ HttpCharStream_Test - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- + include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU BIN = $(BIN_UNCHECKED) @@ -28,9 +27,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 +LDLIBS = -lACEXML #---------------------------------------------------------------------------- # Local targets @@ -39,10 +45,5 @@ LDLIBS = -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/tests/Makefile.NamespaceSupport_Test b/ACEXML/tests/Makefile.NamespaceSupport_Test index f418135f6ec..26657dec00a 100644 --- a/ACEXML/tests/Makefile.NamespaceSupport_Test +++ b/ACEXML/tests/Makefile.NamespaceSupport_Test @@ -1,7 +1,6 @@ #---------------------------------------------------------------------------- # GNU Makefile #---------------------------------------------------------------------------- - MAKEFILE = Makefile.NamespaceSupport_Test DEPENDENCY_FILE = .depend.Makefile.NamespaceSupport_Test BIN_UNCHECKED = NamespaceSupport_Test @@ -10,10 +9,10 @@ BIN_UNCHECKED = NamespaceSupport_Test FILES = \ NamespaceSupport_Test - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- + include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU BIN = $(BIN_UNCHECKED) @@ -28,9 +27,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 +LDLIBS = -lACEXML #---------------------------------------------------------------------------- # Local targets @@ -39,10 +45,5 @@ LDLIBS = -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/tests/Makefile.Transcoder_Test b/ACEXML/tests/Makefile.Transcoder_Test index d85fdbcdb11..9d53e26195c 100644 --- a/ACEXML/tests/Makefile.Transcoder_Test +++ b/ACEXML/tests/Makefile.Transcoder_Test @@ -1,7 +1,6 @@ #---------------------------------------------------------------------------- # GNU Makefile #---------------------------------------------------------------------------- - MAKEFILE = Makefile.Transcoder_Test DEPENDENCY_FILE = .depend.Makefile.Transcoder_Test BIN_UNCHECKED = Transcoder_Test @@ -10,10 +9,10 @@ BIN_UNCHECKED = Transcoder_Test FILES = \ Transcoder_Test - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- + include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU BIN = $(BIN_UNCHECKED) @@ -28,9 +27,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 +LDLIBS = -lACEXML #---------------------------------------------------------------------------- # Local targets @@ -39,10 +45,5 @@ LDLIBS = -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 |