dbertoni 01/08/20 15:43:03
Modified: c/src Makefile.in
Log:
Updated for reference release.
Revision Changes Path
1.54 +88 -83 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.in 2001/08/14 20:55:18 1.53
+++ Makefile.in 2001/08/20 22:43:03 1.54
@@ -79,6 +79,15 @@
@echo XERCESCROOT must be defined
endif
+ifdef XALAN_USE_ICU
+ifndef ICUROOT
+ICUROOT=/usr/local
+endif
+ifndef ICUI18NROOT
+ICUI18NROOT=/usr/local
+endif
+endif
+
XALANDOM_DIR = XalanDOM
DOMSUPPORT_DIR = DOMSupport
INCLUDE_DIR = Include
@@ -113,7 +122,7 @@
# Using ICUBridge
ifdef XALAN_USE_ICU
-ALL_VPATH_CPP+=:$(ICUBRIDGE_DIR)
+ALL_VPATH_CPP+=:$(ICUBRIDGE_DIR)
endif
#all these setting come from the arguments passed in to runConfigure.
@@ -124,45 +133,44 @@
PREFIX = @prefix@
#=============== LINUX SPECIFIC OPTIONS =========================
-ifeq ($(PLATFORM), LINUX)
-SUPPORTED = TRUE
-PLATFORM_COMPILE_OPTIONS = -fpic -Wall -instances=static -D${PLATFORM} -D_REENTRANT
-#ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc
-ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib
-SHLIBSUFFIX=.so
+ifeq ($(PLATFORM), LINUX)
-# We need the ICU library if we are using the ICUBridge
-ifdef XALAN_USE_ICU
-LD_RPATH_PRE= -Wl,-rpath,
-PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)/usr/lib $(LD_RPATH_PRE)/usr/local/lib
-endif
+ SUPPORTED = TRUE
+ PLATFORM_COMPILE_OPTIONS = -fpic -Wall -instances=static -D${PLATFORM}
-D_REENTRANT
+ ALLLIBS = ${LIBS} -L/usr/lib
+ SHLIBSUFFIX=.so
+
+ # We need the ICU library if we are using the ICUBridge
+ ifdef XALAN_USE_ICU
+ LD_RPATH_PRE= -Wl,-rpath,
+ PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib
+ endif
-EXTRA_LINK_OPTIONS=-lc
-CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fpic
-LINK = g++ -D${PLATFORM} -fpic
+ EXTRA_LINK_OPTIONS=-lc
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fpic
+ LINK = g++ -D${PLATFORM} -fpic
endif
#=============== HPUX SPECIFIC OPTIONS =========================
-ifeq ($(PLATFORM), HPUX)
-SUPPORTED = TRUE
-PLATFORM_COMPILE_OPTIONS = +Z -D${PLATFORM} -D_THREAD_SAFE
-ALLLIBS = ${LIBS}
-SHLIBSUFFIX=.sl
-CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
-MAKE_SHARED = $(CXX) -b +Z
-LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,+s
-
+ifeq ($(PLATFORM), HPUX)
+ SUPPORTED = TRUE
+ PLATFORM_COMPILE_OPTIONS = +Z -D${PLATFORM} -D_THREAD_SAFE
+ ALLLIBS = ${LIBS}
+ SHLIBSUFFIX=.sl
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = $(CXX) -b +Z
+ LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,+s
endif
-
#=============== SOLARIS SPECIFIC OPTIONS =========================
+
ifeq ($(PLATFORM), SOLARIS)
SUPPORTED = TRUE
@@ -174,7 +182,6 @@
ifdef XALAN_USE_ICU
LD_RPATH_PRE= -Wl,-rpath,
- PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)/usr/lib $(LD_RPATH_PRE)/usr/local/lib
endif
EXTRA_LINK_OPTIONS=-lc
@@ -195,14 +202,14 @@
ifdef XALAN_USE_ICU
LD_RPATH_PRE= -Wl,-rpath,
- PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)/usr/lib $(LD_RPATH_PRE)/usr/local/lib
endif
ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib \
-lc -lgen
endif
-SHLIBSUFFIX=.so
+ PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib
$(LD_RPATH_PRE)${ICUI18NROOT}/lib
+ SHLIBSUFFIX=.so
endif
@@ -218,7 +225,7 @@
ifdef XALAN_USE_ICU
LD_RPATH_PRE= -Wl,-rpath,
- PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)/usr/lib $(LD_RPATH_PRE)/usr/local/lib
+ PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib
$(LD_RPATH_PRE)${ICUI18NROOT}/lib
endif
EXTRA_LINK_OPTIONS=-lc
@@ -252,87 +259,85 @@
ifeq ($(PLATFORM), OS390)
-ifndef STLPORTROOT
-nostlportroot:
- @echo STLPORTROOT must be defined
-endif
-
-SUPPORTED = TRUE
-PLATFORM_COMPILE_OPTIONS =-Wc,dll -W0,"langlvl(extended),float(ieee)" -D${PLATFORM}
-D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -I ${STLPORTROOT}/stlport
-PLATFORM_COMPILE_OPTIONS2 =-Wc,dll -W0,"langlvl(extended),notempinc,float(ieee)"
-D${PLATFORM} -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -I ${STLPORTROOT}/stlport
-ALLLIBS =
-SHLIBSUFFIX=.dll
-OS390SIDEDECK=.x
-
-CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
-CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
-MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll
-LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ ifndef STLPORTROOT
+ nostlportroot:
+ @echo STLPORTROOT must be defined
+ endif
+ SUPPORTED = TRUE
+ PLATFORM_COMPILE_OPTIONS =-Wc,dll -W0,"langlvl(extended),float(ieee)"
-D${PLATFORM} -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -I ${STLPORTROOT}/stlport
+ PLATFORM_COMPILE_OPTIONS2 =-Wc,dll -W0,"langlvl(extended),notempinc,float(ieee)"
-D${PLATFORM} -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -I ${STLPORTROOT}/stlport
+ ALLLIBS =
+ SHLIBSUFFIX=.dll
+ OS390SIDEDECK=.x
+
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
+ CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll
+ LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+
endif
#============ TRU64 SPECIFIC OPTIONS ============================
+
ifeq ($(PLATFORM), TRU64)
-SUPPORTED = TRUE
-PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${ALL_OBJECTS_DIR}/.cxx_repository
-ieee -pthread
-ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc -lrt -lm
-SHLIBSUFFIX = .so
-CC1 = ${CXX} ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS)
-MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr
${ALL_OBJECTS_DIR}/.cxx_repository -nocxxstd
-LINK = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ SUPPORTED = TRUE
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${ALL_OBJECTS_DIR}/.cxx_repository
-ieee -pthread
+ ALLLIBS = ${LIBS} -L/usr/lib -lc -lrt -lm
+ SHLIBSUFFIX = .so
+ CC1 = ${CXX} ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr
${ALL_OBJECTS_DIR}/.cxx_repository -nocxxstd
+ LINK = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
endif
#============ MacOSX SPECIFIC OPTIONS ============================
+
ifeq ($(PLATFORM), MACOSX)
-SUPPORTED = TRUE
-PLATFORM_COMPILE_OPTIONS = -Wall -D${PLATFORM} -D_REENTRANT
-DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
-ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib
-SHLIBSUFFIX=.dylib
-CC1 = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib
-LINK = ${CXX} $(CXXFLAGS) ${PLATFORM_COMPILE_OPTIONS}
+ SUPPORTED = TRUE
+ PLATFORM_COMPILE_OPTIONS = -Wall -D${PLATFORM} -D_REENTRANT
-DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib
+ SHLIBSUFFIX=.dylib
+ CC1 = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib
+ LINK = ${CXX} $(CXXFLAGS) ${PLATFORM_COMPILE_OPTIONS}
endif
ifndef SUPPORTED
-nogood:
- @echo Linux, Solaris, AIX, Compaq Tru64, OS/390, MacOSX, and HP-UX are the
only platforms supported.
+ nogood:
+ @echo Linux, Solaris, AIX, Compaq Tru64, OS/390, MacOSX, and HP-UX are the
only platforms supported.
endif
# We need the Xerces library
-ifeq ($(PLATFORM), OS390)
-ALLLIBS += $(XERCESCROOT)/lib/libxerces-c1_5_1.x
-else
-ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_5_1
+ifeq ($(PLATFORM), OS390)
+ ALLLIBS += $(XERCESCROOT)/lib/libxerces-c1_5_1.x
+else
+ ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_5
endif
# We need the ICU library if we are using the ICUBridge
ifdef XALAN_USE_ICU
-ifeq ($(PLATFORM), OS390)
-ALLLIBS += ${ICUROOT}/lib/libicuuc.x ${ICUROOT}/lib/libicui18n.x
-else
-ALLLIBS += -L/usr/local/lib -licuuc
-ALLLIBS += -L/usr/local/lib -licui18n
-endif
+ ifeq ($(PLATFORM), OS390)
+ ALLLIBS += ${ICUROOT}/lib/libicuuc.x ${ICUROOT}/lib/libicui18n.x
+ else
+ ALLLIBS += -L${ICUROOT}/lib -licuuc
+ ALLLIBS += -L${ICUI18NROOT}/lib -licui18n
+ endif
endif
# We have to use the includes from the source distribution, since we use
# headers that others normally wouldn't
-XSL_INCL = -I. -I$(XERCESCROOT)/src/ -I$(XERCESCROOT)/include/
-
-# We need the ICU library if we are using the ICUBridge
ifdef XALAN_USE_ICU
-ifeq ($(PLATFORM), OS390)
-XSL_INCL += -I ${ICUROOT}/include/
-else
-XSL_INCL += -I/usr/local/include/
-endif
-XSL_BUILD_OPTIONS += -DXALAN_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/
+ XSL_BUILD_OPTIONS += -DXALAN_USE_ICU
+else
+ XSL_INCL = -I. -I$(XERCESCROOT)/src/ -I$(XERCESCROOT)/include/
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
