dbertoni 2004/08/05 20:16:12
Modified: c/Tests Makefile.in
Log:
Moved Harness code into the main shared library.
Revision Changes Path
1.9 +3 -17 xml-xalan/c/Tests/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 26 May 2004 17:39:20 -0000 1.8
+++ Makefile.in 6 Aug 2004 03:16:12 -0000 1.9
@@ -60,27 +60,13 @@
${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
-Harness : ${XSL_OBJ_DIR}/XMLFileReporter.o ${XSL_OBJ_DIR}/HarnessInit.o
${XSL_OBJ_DIR}/FileUtility.o
+Conf: prepare $(XSL_BIN_DIR)/Conf
-${XSL_OBJ_DIR}/FileUtility.o:
-${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
-
-${XSL_OBJ_DIR}/HarnessInit.o:
-${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
-
-${XSL_OBJ_DIR}/XMLFileReporter.o:
-${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
-
-Conf: prepare Harness $(XSL_BIN_DIR)/Conf
-
-$(XSL_BIN_DIR)/Conf: ${XSL_OBJ_DIR}/conf.o ${XSL_OBJ_DIR}/HarnessInit.o
${XSL_OBJ_DIR}/FileUtility.o ${XSL_OBJ_DIR}/XMLFileReporter.o
+$(XSL_BIN_DIR)/Conf: ${XSL_OBJ_DIR}/conf.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
$(OTHER_LINK_PARAMETERS)
${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
prepare:
-${MKDIR} -p ${XSL_LIB_DIR}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
