Corrected so they actually build the right things :)

This commit is contained in:
jez_higgins 2005-11-25 15:53:28 +00:00
parent f9079bb67f
commit b312078ac5
7 changed files with 24 additions and 33 deletions

View file

@ -29,9 +29,9 @@ DOMTEST_TESTS = dom_test_suite.hpp \
######################################
# High level rules
all : dom_test
all : dom_test$(EXESUFFIX)
dom_test : $(DOMTEST_OBJS) $(CPPUNIT_OBJS)
dom_test$(EXESUFFIX) : $(DOMTEST_OBJS) $(CPPUNIT_OBJS)
$(LD) $(LDFLAGS) -o $@ $(DOMTEST_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) dom_test$(EXESUFFIX) ../../bin

View file

@ -29,9 +29,9 @@ DOMTEST_TESTS = ..\DOM\dom_test_suite.hpp \
######################################
# High level rules
all : dom_test_ss
all : dom_test_ss$(EXESUFFIX)
dom_test_ss : $(DOMTEST_OBJS) $(CPPUNIT_OBJS)
dom_test_ss$(EXESUFFIX) : $(DOMTEST_OBJS) $(CPPUNIT_OBJS)
$(LD) $(LDFLAGS) -o $@ $(DOMTEST_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) dom_test_ss$(EXESUFFIX) ../../bin

View file

@ -29,9 +29,9 @@ DOMTEST_TESTS = ..\DOM\dom_test_suite.hpp \
######################################
# High level rules
all : dom_test_wide
all : dom_test_wide$(EXESUFFIX)
dom_test_wide : $(DOMTEST_OBJS) $(CPPUNIT_OBJS)
dom_test_wide$(EXESUFFIX) : $(DOMTEST_OBJS) $(CPPUNIT_OBJS)
$(LD) $(LDFLAGS) -o $@ $(DOMTEST_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) dom_test_wide$(EXESUFFIX) ../../bin

View file

@ -1,5 +1,6 @@
-include ../../Makefile.header
-include ../../Makefile.common
######################################
# ADDITIONAL BUILD FLAGS
@ -11,15 +12,15 @@ DYNAMIC_LIBS += -lArabica
######################################
# SOURCE FILES
SAXDOM_SRCS = main.cpp test_Document.cpp test_DocumentFragment.cpp test_Element.cpp test_Siblings.cpp test_SAX.cpp
SAXDOM_SRCS = main.cpp ../silly_string/silly_string.cpp
SAXDOM_HDRS = $(patsubst %.cpp,%.h,$(SAXDOM_SRCS))
SAXDOM_OBJS = $(patsubst %.cpp,%.o,$(SAXDOM_SRCS))
######################################
# High level rules
all : sax2dom_test
all : sax2dom_test$(EXESUFFIX)
sax2dom_test : $(SAXDOM_OBJS) $(CPPUNIT_OBJS)
sax2dom_test$(EXESUFFIX) : $(SAXDOM_OBJS) $(CPPUNIT_OBJS)
$(LD) $(LDFLAGS) -o $@ $(SAXDOM_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) sax2dom_test$(EXESUFFIX) ../../bin

View file

@ -17,9 +17,9 @@ XPATH_OBJS = $(patsubst %.cpp,%.o,$(XPATH_SRCS))
######################################
# High level rules
all : xpath_test
all : xpath_test$(EXESUFFIX)
xpath_test : $(XPATH_OBJS) $(CPPUNIT_OBJS) $(XPATH_TESTS)
xpath_test$(EXESUFFIX) : $(XPATH_OBJS) $(CPPUNIT_OBJS) $(XPATH_TESTS)
$(LD) $(LDFLAGS) -o $@ $(XPATH_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) xpath_test$(EXESUFFIX) ../../bin

View file

@ -11,7 +11,7 @@ DYNAMIC_LIBS += -lArabica
######################################
# SOURCE FILES
XPATH_SRCS = main.cpp
XPATH_SRCS = main.cpp ../silly_string/silly_string.cpp
XPATH_TESTS = ../XPath/arithmetic_test.hpp \
../XPath/axis_enumerator_test.hpp \
../XPath/execute_test.hpp \
@ -26,9 +26,9 @@ XPATH_OBJS = $(patsubst %.cpp,%.o,$(XPATH_SRCS))
######################################
# High level rules
all : xpath_test_ss
all : xpath_test_ss$(EXESUFFIX)
xpath_test_ss : $(XPATH_OBJS) $(CPPUNIT_OBJS) $(XPATH_TESTS)
xpath_test_ss$(EXESUFFIX) : $(XPATH_OBJS) $(CPPUNIT_OBJS) $(XPATH_TESTS)
$(LD) $(LDFLAGS) -o $@ $(XPATH_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) xpath_test_ss$(EXESUFFIX) ../../bin

View file

@ -1,4 +1,5 @@
-include ../../Makefile.header
-include ../../Makefile.common
######################################
# ADDITIONAL BUILD FLAGS
@ -10,27 +11,17 @@ DYNAMIC_LIBS += -lArabica
######################################
# SOURCE FILES
XPATH_SRCS = main.cpp arithmetic_test.cpp axis_enumerator_test.cpp execute_test.cpp logical_test.cpp node_test_test.cpp parse_test.cpp relational_test.cpp step_test.cpp value_test.cpp
XPATH_SRCS = main.cpp
XPATH_HDRS = $(patsubst %.cpp,%.h,$(XPATH_SRCS))
XPATH_OBJS = $(patsubst %.cpp,%.o,$(XPATH_SRCS))
CPPUNIT_DIR = ../CppUnit
CPPUNITFW_FILES = TestCase.cpp TestFailure.cpp TestResult.cpp TestSuite.cpp
CPPUNITFW_SRCS = $(patsubst Test%,$(CPPUNIT_DIR)/framework/Test%,$(CPPUNITFW_FILES))
CPPUNITFW_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITFW_SRCS))
CPPUNITUI_FILES = TextTestResult.cpp
CPPUNITUI_SRCS = $(patsubst Text%,$(CPPUNIT_DIR)/textui/Text%,$(CPPUNITUI_FILES))
CPPUNITUI_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITUI_SRCS))
######################################
# High level rules
all : xpath_test
all : xpath_test_wide$(EXESUFFIX)
xpath_test : $(XPATH_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
$(LD) $(LDFLAGS) -o $@ $(XPATH_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) xpath_test$(EXESUFFIX) ../../bin
xpath_test_wide$(EXESUFFIX) : $(XPATH_OBJS) $(CPPUNIT_OBJS)
$(LD) $(LDFLAGS) -o $@ $(XPATH_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
$(COPY) xpath_test_wide$(EXESUFFIX) ../../bin
######################
# Compile rules
@ -40,10 +31,9 @@ xpath_test : $(XPATH_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
######################
# Cleaning up
clean :
$(REMOVE) $(CPPUNITUI_OBJS) \
$(CPPUNITFW_OBJS) \
$(REMOVE) $(CPPUNIT_OBJS) \
$(XPATH_OBJS) \
xpath_test$(EXESUFFIX) \
../../bin/xpath_test$(EXESUFFIX)
xpath_test_wide$(EXESUFFIX) \
../../bin/xpath_test_wide$(EXESUFFIX)
# End of File