You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2009/04/01 23:01:59 UTC
svn commit: r761057 - in /xalan/c/trunk: Makefile.incl.in
src/xalanc/Makefile.in
Author: dbertoni
Date: Wed Apr 1 21:01:59 2009
New Revision: 761057
URL: http://svn.apache.org/viewvc?rev=761057&view=rev
Log:
Cleaned up a misspelled macro and some MinGW makefile issues.
Modified:
xalan/c/trunk/Makefile.incl.in
xalan/c/trunk/src/xalanc/Makefile.in
Modified: xalan/c/trunk/Makefile.incl.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Makefile.incl.in?rev=761057&r1=761056&r2=761057&view=diff
==============================================================================
--- xalan/c/trunk/Makefile.incl.in (original)
+++ xalan/c/trunk/Makefile.incl.in Wed Apr 1 21:01:59 2009
@@ -124,27 +124,27 @@
LINK_SONAME =
EXT=.exe
- LOC_LIB = ${LOC_LIBNAME}${VER}$(SHLIBSUFFIX)
+ LOC_LIB = ${LOC_LIBNAME}${VER}$(SHLIBSUFFIX)
- MESSAGELIB = ${XSL_LIB_DIR}/$(LOC_LIB)
- LIB = $(LIB_NAME)$(VER)$(SHLIBSUFFIX)
- SONAME = $(LIB_NAME)$(MS_VER)$(SHLIBSUFFIX)
- PLATFORM_COMPILE_OPTIONS = -DWIN32 -D_WINDOWS -D__MINGW__ -D${PLATFORM} -fexceptions
+ MESSAGELIB = ${XSL_LIB_DIR}/$(LOC_LIB)
+ LIB = $(LIB_NAME)$(VER)$(SHLIBSUFFIX)
+ SONAME = $(LIB_NAME)$(MS_VER)$(SHLIBSUFFIX)
+ PLATFORM_COMPILE_OPTIONS = -DWIN32 -D_WINDOWS -D__MINGW__ -D${PLATFORM} -fexceptions
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC1)
LDFLAGS += -Wl,--allow-multiple-definition
LINK = $(CXX) -D${PLATFORM} ${LDFLAGS}
- MAKE_SHARED = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS} -o $(XSL_LIB_DIR)/$(LIBNAME)
+ MAKE_SHARED = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS}
- MAKE_SHARED_LOC = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS} -o $(XSL_LIB_DIR)/$(LOC_LIB)
+ MAKE_SHARED_LOC = dllwrap --export-all-symbols --driver-name c++ ${LDFLAGS}
LOC_OTHER_LINK_PARAMETERS = $(XERCES_LIB)
OTHER_LINK_PARAMETERS = $(XALAN_LIB) $(ALLLIBS)
- OTHER_LINK_LIB_PARAMERES = $(ALLLIBS)
+ OTHER_LINK_LIB_PARAMETERS = $(ALLLIBS)
export PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(PATH)
@@ -183,7 +183,7 @@
OTHER_LINK_PARAMETERS = $(XALAN_LIB) $(ALLLIBS)
- OTHER_LINK_LIB_PARAMERES = $(ALLLIBS)
+ OTHER_LINK_LIB_PARAMETERS = $(ALLLIBS)
export PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(PATH)
Modified: xalan/c/trunk/src/xalanc/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Makefile.in?rev=761057&r1=761056&r2=761057&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Makefile.in Wed Apr 1 21:01:59 2009
@@ -232,7 +232,7 @@
$(MAKE) -C Utils $@
$(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
- $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMERES)
+ $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS)
ifeq ($(PLATFORM), OS390)
mv *.x ${XSL_LIB_DIR}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org