Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 165434
Collapse All | Expand All

(-)xml-xalan/c/src/xalanc/Makefile.in (-7 / +7 lines)
Lines 172-178 XalanExe: lib "//'$(LOADSAMP)(${BATCH_X Link Here
172
172
173
"//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
173
"//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
174
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
174
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
175
	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
175
	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
176
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp                       
176
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp                       
177
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
177
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
178
178
Lines 180-186 testXSLT: lib "//'$(LOADSAMP)(${BATCH_T Link Here
180
180
181
"//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
181
"//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
182
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
182
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
183
	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
183
	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
184
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp                       
184
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp                       
185
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
185
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
186
186
Lines 190-196 XalanExe: lib $(XSL_BIN_DIR)/Xalan Link Here
190
190
191
$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
191
$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
192
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
192
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
193
	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
193
	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
194
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
194
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
195
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
195
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
196
endif
196
endif
Lines 199-205 testXSLT: lib $(XSL_BIN_DIR)/testXSLT Link Here
199
199
200
$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
200
$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
201
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
201
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
202
	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
202
	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
203
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
203
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
204
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
204
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
205
205
Lines 207-213 testXPath: lib $(XSL_BIN_DIR)/testXPath Link Here
207
207
208
$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
208
$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
209
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
209
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
210
	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
210
	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS)	$(OTHER_LINK_PARAMETERS)
211
${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
211
${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
212
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
212
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
213
213
Lines 220-226 locale: Link Here
220
220
221
${BATCH_TARGET}: $(ALL_OBJECTS)
221
${BATCH_TARGET}: $(ALL_OBJECTS)
222
	@echo Building ${BATCH_TARGET}
222
	@echo Building ${BATCH_TARGET}
223
	$(MAKE_SHARED) $(ALLLIBS) $^ -o $@
223
	$(MAKE_SHARED) $^ -o $@ $(ALLLIBS)
224
224
225
else
225
else
226
226
Lines 230-236 locale: Link Here
230
	$(MAKE) -C Utils $@
230
	$(MAKE) -C Utils $@
231
231
232
$(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
232
$(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
233
	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMERES)
233
	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(ALLLIBS) $(OTHER_LINK_LIB_PARAMERES)
234
ifeq ($(PLATFORM), OS390)
234
ifeq ($(PLATFORM), OS390)
235
	mv *.x  ${XSL_LIB_DIR}        
235
	mv *.x  ${XSL_LIB_DIR}        
236
else
236
else
(-)xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in (-1 / +1 lines)
Lines 29-35 MSG_CREATOR_SRC=$(XALANCROOT)/src/xalanc Link Here
29
29
30
$(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
30
$(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
31
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
31
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
32
	${EXTRA_LINK_OPTIONS}  $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS)
32
	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS)
33
	
33
	
34
$(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
34
$(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
35
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
35
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<

Return to bug 165434