dbertoni 01/09/28 11:09:07
Modified: c/src Makefile.in
Log:
Make sure there's a pure C compilation macro.
Revision Changes Path
1.63 +23 -14 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.in 2001/09/28 15:51:39 1.62
+++ Makefile.in 2001/09/28 18:09:07 1.63
@@ -115,9 +115,9 @@
THISLIB = ${LIB_DIR}/${LIBNAME}
VER = 1_2
-PRODUCTNAME=xalan
-PRODUCTVERSION=${VER}
-BINTARGETDIR=${XALANCROOT}/bin
+PRODUCTNAME = xalan
+PRODUCTVERSION = ${VER}
+BINTARGETDIR = ${XALANCROOT}/bin
ALL_VPATH_CPP = \
$(XALANDOM_DIR):$(DOMSUPPORT_DIR):$(PLATFORMSUPPORT_DIR):$(XALANSOURCETREE_DIR):$(TESTXPATH_DIR):$(TESTXSLT_DIR):\
@@ -152,6 +152,7 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fpic
LINK = g++ -D${PLATFORM} -fpic
@@ -167,6 +168,7 @@
SHLIBSUFFIX=.sl
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) -b +Z
LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,+s
@@ -189,6 +191,7 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
LINK = g++ -D${PLATFORM} -fPIC
@@ -201,6 +204,7 @@
PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(ALL_OBJECTS_DIR)
-features=rtti -D${PLATFORM} -D_REENTRANT
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-I${STLPORTROOT}/stlport
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
LINK = ${CXX} -D${PLATFORM} -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
@@ -230,6 +234,7 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
LINK = g++ -D${PLATFORM} -fPIC
@@ -242,10 +247,11 @@
@echo STLPORTROOT must be defined
endif
- PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_THREAD_SAFE
-I${STLPORTROOT}/stlport
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_THREAD_SAFE
ALLLIBS = ${LIBS} -L/usr/lib
- CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-I${STLPORTROOT}/stlport
+ CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = makeC++SharedLib_r -p 5000
LINK = $(CXX) -qnotempinc $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
@@ -265,15 +271,16 @@
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
+ PLATFORM_COMPILE_OPTIONS =-Wc,dll -W0,"langlvl(extended),float(ieee)"
-D${PLATFORM} -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
+ PLATFORM_COMPILE_OPTIONS2 =-Wc,dll
-W0,"langlvl(extended),notempinc,float(ieee)" -D${PLATFORM} -D_OPEN_THREADS
-D_XOPEN_SOURCE_EXTENDED
ALLLIBS =
SHLIBSUFFIX=.dll
OS390SIDEDECK=.x
- CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
- CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) ${STLPORTROOT}/stlport
+ CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2) ${STLPORTROOT}/stlport
+ CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
${STLPORTROOT}/stlport
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll
LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
@@ -287,7 +294,8 @@
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)
+ CC1 = $(CXX) ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr
${ALL_OBJECTS_DIR}/.cxx_repository -nocxxstd
LINK = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
@@ -302,6 +310,7 @@
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib
SHLIBSUFFIX=.dylib
CC1 = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = ${CC} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib
LINK = ${CXX} $(CXXFLAGS) ${PLATFORM_COMPILE_OPTIONS}
@@ -556,12 +565,12 @@
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathCAPI/%.c
- $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
+ $(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathCAPI/%.c
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
+ $(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
StreamTransform: lib $(BINTARGETDIR)/StreamTransform
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
