svn commit: r1302529 - in /xalan/c/trunk/src/xalanc: Makefile.in Utils/MsgCreator/Makefile.in

Author: shathaway
Date: Mon Mar 19 16:27:19 2012
New Revision: 1302529

URL: http://svn.apache.org/viewvc?rev=1302529&view=rev
Log:
JIRA XALANC-643 --as-needed patch

Modified:
    xalan/c/trunk/src/xalanc/Makefile.in
    xalan/c/trunk/src/xalanc/Utils/MsgCreator/Makefile.in

Modified: xalan/c/trunk/src/xalanc/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Makefile.in?rev=1302529&r1=1302528&r2=1302529&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Makefile.in Mon Mar 19 16:27:19 2012
@@ -174,7 +174,7 @@ XalanExe: lib  "//'$(LOADSAMP)(${BATCH_X
 
 "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
 ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp                       
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
@@ -182,7 +182,7 @@ testXSLT: lib  "//'$(LOADSAMP)(${BATCH_T
 
 "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
 ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp                       
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
@@ -192,7 +192,7 @@ XalanExe: lib  $(XSL_BIN_DIR)/Xalan
 
 $(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
 ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 endif
@@ -201,7 +201,7 @@ testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
 
 $(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
 ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
@@ -209,7 +209,7 @@ testXPath: lib  $(XSL_BIN_DIR)/testXPath
 
 $(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
+	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS)	$(OTHER_LINK_PARAMETERS)
 ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
@@ -222,7 +222,7 @@ locale:        
 
 ${BATCH_TARGET}: $(ALL_OBJECTS)
 	@echo Building ${BATCH_TARGET}
-	$(MAKE_SHARED) $(ALLLIBS) $^ -o $@
+	$(MAKE_SHARED) $^ -o $@ $(ALLLIBS)
 
 else
 
@@ -232,7 +232,7 @@ locale:	
 	$(MAKE) -C Utils $@
 
 $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
-	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS)
+	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(ALLLIBS) $(OTHER_LINK_LIB_PARAMERES)
 ifeq ($(PLATFORM), OS390)
 	mv *.x  ${XSL_LIB_DIR}        
 else

Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/Makefile.in?rev=1302529&r1=1302528&r2=1302529&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/Makefile.in Mon Mar 19 16:27:19 2012
@@ -29,7 +29,7 @@ MSG_CREATOR_SRC=$(XALANCROOT)/src/xalanc
 
 $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
-	${EXTRA_LINK_OPTIONS} $(LIBS) $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS)
+	${EXTRA_LINK_OPTIONS} $(LIBS) $^ -o $@ $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS)
 	
 $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<