Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 296749 | Differences between
and this patch

Collapse All | Expand All

(-)xml-xalan.orig//c/src/xalanc/Makefile.in (-9 / +16 lines)
Lines 84-89 Link Here
84
SAMPLES_DIR = ${XALANCROOT}/samples
84
SAMPLES_DIR = ${XALANCROOT}/samples
85
TESTS_DIR = ${XALANCROOT}/Tests
85
TESTS_DIR = ${XALANCROOT}/Tests
86
86
87
TESTXSLT_OBJS = ${XSL_OBJ_DIR}/process.o
88
XALANEXE_OBJS = ${XSL_OBJ_DIR}/XalanExe.o
89
TESTXPATH_OBJS = ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
90
87
ALL_VPATH_CPP = \
91
ALL_VPATH_CPP = \
88
$(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
92
$(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
89
$(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
93
$(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
Lines 169-174 Link Here
169
173
170
compile:	 $(ALL_OBJECTS) 
174
compile:	 $(ALL_OBJECTS) 
171
175
176
$(ALL_OBJECTS) $(TESTXSLT_OBJS) $(XALANEXE_OBJS) $(TESTXPATH_OBJS): locale
177
locale: prepare
178
172
ifeq (${OS390BATCH},1)
179
ifeq (${OS390BATCH},1)
173
XalanExe: lib  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
180
XalanExe: lib  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
174
181
Lines 188-215 Link Here
188
195
189
else # Not OS390BATCH
196
else # Not OS390BATCH
190
197
191
XalanExe: lib  $(XSL_BIN_DIR)/Xalan
198
XalanExe: $(XSL_BIN_DIR)/Xalan
192
199
193
$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
200
$(XSL_BIN_DIR)/Xalan: lib ${XALANEXE_OBJS}
194
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
201
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
195
	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
202
	${EXTRA_LINK_OPTIONS} ${XALANEXE_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
196
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
203
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
197
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
204
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
198
endif
205
endif
199
206
200
testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
207
testXSLT: $(XSL_BIN_DIR)/testXSLT
201
208
202
$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
209
$(XSL_BIN_DIR)/testXSLT: lib ${TESTXSLT_OBJS}
203
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
210
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
204
	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
211
	${EXTRA_LINK_OPTIONS} ${TESTXSLT_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
205
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
212
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
206
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
213
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
207
214
208
testXPath: lib  $(XSL_BIN_DIR)/testXPath
215
testXPath: $(XSL_BIN_DIR)/testXPath
209
216
210
$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
217
$(XSL_BIN_DIR)/testXPath: lib ${TESTXPATH_OBJS}
211
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
218
	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
212
	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
219
	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${TESTXPATH_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
213
${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
220
${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
214
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
221
	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
215
222

Return to bug 296749