You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/09/05 17:05:43 UTC
cvs commit: xml-xerces/c/src/xercesc Makefile.incl
tng 2002/09/05 08:05:43
Modified: c/src/xercesc Makefile.incl
Log:
[Bug 12279] Makefiles contain tabs causing "commands commence" error.
Revision Changes Path
1.25 +42 -42 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.incl 26 Aug 2002 14:25:24 -0000 1.24
+++ Makefile.incl 5 Sep 2002 15:05:43 -0000 1.25
@@ -97,7 +97,7 @@
XML_LIB_DIR = $(XERCESCROOT)/lib
XML_INC_DIR = $(XERCESCROOT)/include/xercesc
XML_OBJ_DIR = ${XERCESCROOT}/obj/${PLATFORM}
-XML_OBJ = ${XERCESCROOT}/obj
+XML_OBJ = ${XERCESCROOT}/obj
XML_INCL = -I$(XERCESCROOT)/include
ifeq (${SYSOVR},OS400)
PLATFORM = OS400
@@ -124,7 +124,7 @@
-lm -lgen
endif
else
- PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XML_OBJ_DIR) \
+ PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XML_OBJ_DIR) \
-features=rtti -D${PLATFORM} -D_REENTRANT
MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XML_OBJ_DIR) ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
@@ -171,7 +171,7 @@
#=============== OPENSERVER SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, OPENSERVER)
ifeq (${GXX}, yes)
- COMMON_COMPILE_OPTIONS = -D${PLATFORM} -fPIC
+ COMMON_COMPILE_OPTIONS = -D${PLATFORM} -fPIC
ifeq (${THREADS}, none)
PLATFORM_COMPILE_OPTIONS = ${COMMON_COMPILE_OPTIONS}
else
@@ -179,7 +179,7 @@
endif
MAKE_SHARED = ${CXX} -D${PLATFORM} -G ${LDFLAGS}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
- EXTRA_LINK_OPTIONS = -Wl,-h,${LIBNAME}${VER}${SHLIBSUFFIX}
+ EXTRA_LINK_OPTIONS = -Wl,-h,${LIBNAME}${VER}${SHLIBSUFFIX}
else
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -belf -KPIC
MAKE_SHARED = ${CXX} -D${PLATFORM} -belf -G ${LDFLAGS}
@@ -407,12 +407,12 @@
ifeq (${TRANSCODER}, ICU)
## OS390BATCH
ifeq (${OS390BATCH},1)
- ALLLIBS = "//'${LOADEXP}(IXM22UCX)'"
+ ALLLIBS = "//'${LOADEXP}(IXM22UCX)'"
else
- ALLLIBS = ${ICUROOT}/lib/libicuuc22.0.x
+ ALLLIBS = ${ICUROOT}/lib/libicuuc22.0.x
endif
else
- ALLLIBS =
+ ALLLIBS =
endif
EXTRA_LINK_OPTIONS =
SHLIBSUFFIX=.dll
@@ -435,9 +435,9 @@
MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -ptr ${XERCESCROOT}/.cxx_repository ${LDFLAGS}
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${XERCESCROOT}/.cxx_repository
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc -lrt
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc -lrt
else
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc -lrt
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc -lrt
endif
endif
endif
@@ -445,19 +445,19 @@
#=============== MacOS SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, MACOSX)
- PLATFORM_LIBRARIES = \
- -framework CoreServices
- PLATFORM_COMPILE_OPTIONS = \
- -D${PLATFORM} \
- -D_REENTRANT
- MAKE_SHARED = ${CXX} -D${PLATFORM} -dynamiclib ${LDFLAGS}
- MAKE_SHARED_C = ${CC} -D${PLATFORM} -dynamiclib ${LDFLAGS}
- ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc -licud ata -lc
- else
- ALLLIBS = ${LIBS} -L/usr/lib
- endif
- SHLIBSUFFIX=.dylib
+ PLATFORM_LIBRARIES = \
+ -framework CoreServices
+ PLATFORM_COMPILE_OPTIONS = \
+ -D${PLATFORM} \
+ -D_REENTRANT
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -dynamiclib ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -dynamiclib ${LDFLAGS}
+ ifeq (${TRANSCODER}, ICU)
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc -licud ata -lc
+ else
+ ALLLIBS = ${LIBS} -L/usr/lib
+ endif
+ SHLIBSUFFIX=.dylib
endif
#=============== CygWin SPECIFIC OPTIONS =========================
@@ -508,25 +508,25 @@
SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
else
- ifeq (${PLATFORM}, CYGWIN)
- #
- # LINK_NAME=libxerces-c.dll
- # SO_NAME =libxerces-c20.dll
- # REAL_NAME=libxerces-c2_0_0.dll
- #
- LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
- SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
- REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
- else
- #
- # LINK_NAME=libxerces-c.so
- # SO_NAME =libxerces-c.so.20
- # REAL_NAME=libxerces-c.so.20.0
- #
- LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
- SO_NAME =${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
- REAL_NAME=${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
- endif
+ ifeq (${PLATFORM}, CYGWIN)
+ #
+ # LINK_NAME=libxerces-c.dll
+ # SO_NAME =libxerces-c20.dll
+ # REAL_NAME=libxerces-c2_0_0.dll
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
+ REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
+ else
+ #
+ # LINK_NAME=libxerces-c.so
+ # SO_NAME =libxerces-c.so.20
+ # REAL_NAME=libxerces-c.so.20.0
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
+ REAL_NAME=${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+ endif
endif
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org