You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2003/09/19 20:22:44 UTC

cvs commit: xml-xalan/c/src/xalanc Makefile.in

dbertoni    2003/09/19 11:22:44

  Modified:    c/src/xalanc Makefile.in
  Log:
  Patch for Bugzilla 23263 from June Ng.
  
  Revision  Changes    Path
  1.16      +11 -2     xml-xalan/c/src/xalanc/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/Makefile.in,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.in	31 Jul 2003 01:06:46 -0000	1.15
  +++ Makefile.in	19 Sep 2003 18:22:44 -0000	1.16
  @@ -910,7 +910,7 @@
   	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
   endif
   
  -Harness : lib ${ALL_OBJECTS_DIR}/XMLFileReporter.o ${ALL_OBJECTS_DIR}/FileUtility.o
  +Harness : lib ${ALL_OBJECTS_DIR}/XMLFileReporter.o ${ALL_OBJECTS_DIR}/HarnessInit.o  ${ALL_OBJECTS_DIR}/FileUtility.o
   
   ${ALL_OBJECTS_DIR}/FileUtility.o:
   ifeq ($(PLATFORM), OS390)
  @@ -921,6 +921,15 @@
   	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
   endif
   
  +${ALL_OBJECTS_DIR}/HarnessInit.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
  @@ -933,7 +942,7 @@
   
   Conf: Harness $(BINTARGETDIR)/Conf
   
  -$(BINTARGETDIR)/Conf: ${ALL_OBJECTS_DIR}/conf.o ${ALL_OBJECTS_DIR}/FileUtility.o ${ALL_OBJECTS_DIR}/XMLFileReporter.o 
  +$(BINTARGETDIR)/Conf: ${ALL_OBJECTS_DIR}/conf.o ${ALL_OBJECTS_DIR}/HarnessInit.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} $(THISLIB).x $(ALLLIBS) $(CXXFLAGS) $^ -o $@	
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org