dbertoni 2002/12/12 12:58:06
Modified: c/src Makefile.in runConfigure
Log:
Changes to build outside of the source tree. Fixes Bugzilla 4627.
Revision Changes Path
1.108 +36 -26 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- Makefile.in 21 Nov 2002 02:27:51 -0000 1.107
+++ Makefile.in 12 Dec 2002 20:58:06 -0000 1.108
@@ -88,26 +88,32 @@
endif
endif
-XALANDOM_DIR = XalanDOM
-DOMSUPPORT_DIR = DOMSupport
-INCLUDE_DIR = Include
-ICUBRIDGE_DIR = ICUBridge
-PLATFORMSUPPORT_DIR = PlatformSupport
-XALANSOURCETREE_DIR = XalanSourceTree
-TESTXPATH_DIR = TestXPath
-XALANEXE_DIR = XalanExe
-TESTXSLT_DIR = TestXSLT
-XMLSUPPORT_DIR = XMLSupport
-XPATH_DIR = XPath
-XPATHCAPI_DIR = XPathCAPI
-XSLT_DIR = XSLT
-XALANEXTENSIONS_DIR = XalanExtensions
-XERCESPARSERLIAISON_DIR = XercesParserLiaison
-XALANEXSLT_DIR = XalanEXSLT
-XALANTRANSFORMER_DIR = XalanTransformer
+ifneq ("$(shell cd $(XALANCROOT) && pwd)/src", "$(shell pwd)")
+ OUTDIR := $(shell pwd)
+else
+ OUTDIR = ${XALANCROOT}
+endif
+
+XALANDOM_DIR = $(XALANCROOT)/src/XalanDOM
+DOMSUPPORT_DIR = $(XALANCROOT)/src/DOMSupport
+INCLUDE_DIR = $(XALANCROOT)/src/Include
+ICUBRIDGE_DIR = $(XALANCROOT)/src/ICUBridge
+PLATFORMSUPPORT_DIR = $(XALANCROOT)/src/PlatformSupport
+XALANSOURCETREE_DIR = $(XALANCROOT)/src/XalanSourceTree
+TESTXPATH_DIR = $(XALANCROOT)/src/TestXPath
+XALANEXE_DIR = $(XALANCROOT)/src/XalanExe
+TESTXSLT_DIR = $(XALANCROOT)/src/TestXSLT
+XMLSUPPORT_DIR = $(XALANCROOT)/src/XMLSupport
+XPATH_DIR = $(XALANCROOT)/src/XPath
+XPATHCAPI_DIR = $(XALANCROOT)/src/XPathCAPI
+XSLT_DIR = $(XALANCROOT)/src/XSLT
+XALANEXTENSIONS_DIR = $(XALANCROOT)/src/XalanExtensions
+XERCESPARSERLIAISON_DIR = $(XALANCROOT)/src/XercesParserLiaison
+XALANEXSLT_DIR = $(XALANCROOT)/src/XalanEXSLT
+XALANTRANSFORMER_DIR = $(XALANCROOT)/src/XalanTransformer
-ALL_OBJECTS_DIR = ${XALANCROOT}/obj
-LIB_DIR = ${XALANCROOT}/lib
+ALL_OBJECTS_DIR = ${OUTDIR}/obj
+LIB_DIR = ${OUTDIR}/lib
SAMPLES_DIR = ${XALANCROOT}/samples
TESTS_DIR = ${XALANCROOT}/Tests
@@ -118,12 +124,13 @@
PRODUCTNAME = xalan
PRODUCTVERSION = ${VER}
-BINTARGETDIR = ${XALANCROOT}/bin
+BINTARGETDIR = ${OUTDIR}/bin
ALL_VPATH_CPP = \
-$(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR):$(XPATH_DIR):$(XALANSOURCETREE_DIR):
\
-$(XPATHCAPI_DIR):$(XSLT_DIR):$(XALANEXTENSIONS_DIR):$(XERCESPARSERLIAISON_DIR):$(XALANTRANSFORMER_DIR):
\
-$(XALANEXSLT_DIR):$(TESTXPATH_DIR):$(TESTXSLT_DIR) \
+$(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
+$(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
+$(XSLT_DIR):$(XALANEXTENSIONS_DIR):$(XALANEXSLT_DIR):$(XALANTRANSFORMER_DIR): \
+$(TESTXPATH_DIR):$(TESTXSLT_DIR) \
# Using ICUBridge
ifdef XALAN_USE_ICU
@@ -353,12 +360,15 @@
# We want to build from both the Xerces CVS tree and the distribution, so we need
# multiple -I directives for Xerces.
+
+XSL_INCL = -I$(XALANCROOT)/src
+
ifdef XALAN_USE_ICU
# We need the ICU library if we are using the ICUBridge
- XSL_INCL = -I${ICUROOT}/include/ -I. -I$(XERCESCROOT)/src/
-I$(XERCESCROOT)/include/xercesc -I$(XERCESCROOT)/include/
+ XSL_INCL += -I${ICUROOT}/include/ -I. -I$(XERCESCROOT)/src/
-I$(XERCESCROOT)/include/xercesc -I$(XERCESCROOT)/include/
XSL_BUILD_OPTIONS += -DXALAN_USE_ICU
else
- XSL_INCL = -I. -I$(XERCESCROOT)/src/ -I$(XERCESCROOT)/include/xercesc
-I$(XERCESCROOT)/include/
+ XSL_INCL += -I$(XERCESCROOT)/src/ -I$(XERCESCROOT)/include/xercesc
-I$(XERCESCROOT)/include/
endif
@@ -770,7 +780,7 @@
rm -rf $(ALL_OBJECTS_DIR)/*
ifeq ($(PLATFORM), TRU64)
rm -rf $(ALL_OBJECTS_DIR)/.cxx_repository
- rm -rf $(XALANCROOT)/src/so_locations
+ rm -rf $(OUTDIR)/so_locations
endif
rm -f $(THISLIB)$(VER)$(SHLIBSUFFIX)
rm -f $(THISLIB)$(VER).map1
1.15 +4 -2 xml-xalan/c/src/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/runConfigure,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- runConfigure 5 Nov 2002 05:15:59 -0000 1.14
+++ runConfigure 12 Dec 2002 20:58:06 -0000 1.15
@@ -58,6 +58,9 @@
#
#
# $Log$
+# Revision 1.15 2002/12/12 20:58:06 dbertoni
+# Changes to build outside of the source tree. Fixes Bugzilla 4627.
+#
# Revision 1.14 2002/11/05 05:15:59 dbertoni
# Add extra hint about using GNU make.
#
@@ -384,7 +387,7 @@
rm -f config.cache
rm -f config.log
rm -f config.status
-./configure $configureoptions
+`dirname $0`/configure $configureoptions
echo
echo If the result of the above commands look OK to you, go to the directory
@@ -393,4 +396,3 @@
echo Note: You must use GNU make to use the Xalan Makefile.
exit 0;
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
