commit f5cfaa32ffa10bc8fe96b62621dc5668923602e1
author Bill Blough <devel@blough.us> Fri May 10 23:50:36 2019 +0100
committer Roger Leigh <rleigh@codelibre.net> Sat May 11 00:06:30 2019 +0100
tree ef7952a191cbfd6b89d980f138f318ab1ef04eea
parent 4d28574dde2200862042c9795dc9d23609747972

XALANC-771: Fix Makefile dependencies to allow parallel builds

src/xalanc/Makefile.in

diff --git a/src/xalanc/Makefile.in b/src/xalanc/Makefile.in
index ed88d1e..39dddbf 100644
--- a/src/xalanc/Makefile.in
+++ b/src/xalanc/Makefile.in
@@ -145,10 +145,10 @@
 
 vpath %.cpp \
 $(ALL_VPATH_CPP)
-${XSL_OBJ_DIR}/%.o:%.cpp
+${XSL_OBJ_DIR}/%.o:%.cpp locale
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
-${XSL_OBJ_DIR}/%.o:%.hpp
+${XSL_OBJ_DIR}/%.o:%.hpp locale
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $(patsubst .hpp,.cpp,$<)
 
 all:	 lib  testXSLT testXPath XalanExe
@@ -169,45 +169,47 @@
 
 compile:	 $(ALL_OBJECTS) 
 
+$(ALL_OBJECTS): locale
+
 ifeq (${OS390BATCH},1)
 XalanExe: lib  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
 
-"//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
+"//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o | lib
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
 	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
-${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp                       
+${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp locale
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
 testXSLT: lib  "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'"
 
-"//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
+"//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o | lib
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
 	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
-${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp                       
+${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp locale
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
 else # Not OS390BATCH
 
 XalanExe: lib  $(XSL_BIN_DIR)/Xalan
 
-$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
+$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o | lib
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
 	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
-${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
+${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp locale
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 endif
 
 testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
 
-$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
+$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o | lib
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
 	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)	$(OTHER_LINK_PARAMETERS)
-${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp locale
 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
 
 testXPath: lib  $(XSL_BIN_DIR)/testXPath
 
-$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
+$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o | lib
 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
 	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS)	$(OTHER_LINK_PARAMETERS)
 ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp