dbertoni 01/12/03 13:36:19
Modified: c/src Makefile.in
Log:
Added new deps for conformance executable.
Revision Changes Path
1.68 +27 -6 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Makefile.in 2001/12/03 20:07:50 1.67
+++ Makefile.in 2001/12/03 21:36:19 1.68
@@ -680,19 +680,40 @@
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-Conf: lib $(BINTARGETDIR)/Conf
+Harness : lib ${ALL_OBJECTS_DIR}/XMLFileReporter.o ${ALL_OBJECTS_DIR}/FileUtility.o
-$(BINTARGETDIR)/Conf: ${ALL_OBJECTS_DIR}/conf.o ${ALL_OBJECTS_DIR}/FileUtility.o
${ALL_OBJECTS_DIR}/XMLFileReport.o
+${ALL_OBJECTS_DIR}/FileUtility.o:
+ifeq ($(PLATFORM), OS390)
+${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
+ $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
+else
+${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
+endif
+
+${ALL_OBJECTS_DIR}/XMLFileReporter.o:
+ifeq ($(PLATFORM), OS390)
+${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
+ $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
+else
+${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Harness/%.cpp
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
+endif
+
+
+Conf: Harness $(BINTARGETDIR)/Conf
+
+$(BINTARGETDIR)/Conf: ${ALL_OBJECTS_DIR}/conf.o ${ALL_OBJECTS_DIR}/FileUtility.o
${ALL_OBJECTS_DIR}/XMLFileReporter.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
-${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
- $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
+ $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
-${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
+ $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
lib: prepare compile $(THISLIB)$(VER)$(SHLIBSUFFIX)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
