Author: amassari
Date: Tue Nov 10 16:42:10 2009
New Revision: 834536
URL: http://svn.apache.org/viewvc?rev=834536&view=rev
Log:
As we now generate source files for the ICU message loader, use standard
automake code
Removed:
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
Modified:
xerces/c/trunk/configure.ac
xerces/c/trunk/src/Makefile.am
Modified: xerces/c/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=834536&r1=834535&r2=834536&view=diff
==============================================================================
--- xerces/c/trunk/configure.ac (original)
+++ xerces/c/trunk/configure.ac Tue Nov 10 16:42:10 2009
@@ -32,7 +32,6 @@
AC_CONFIG_HEADERS([config.h src/xercesc/util/Xerces_autoconf_config.hpp])
AC_CONFIG_FILES([Makefile \
src/Makefile \
- src/xercesc/util/MsgLoaders/ICU/resources/Makefile \
src/xercesc/util/MsgLoaders/MsgCatalog/Makefile \
tests/Makefile \
samples/Makefile \
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=834536&r1=834535&r2=834536&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Tue Nov 10 16:42:10 2009
@@ -36,8 +36,8 @@
libxerces_c_la_LDFLAGS = -release ${INTERFACE_VER_D}
- # This sets {install}/include as target for the headers
- libxerces_c_ladir = ${includedir}
+# This sets {install}/include as target for the headers
+libxerces_c_ladir = ${includedir}
libxerces_c_la_SOURCES = ${util_sources} ${dom_sources} ${domimpl_sources} \
@@ -126,7 +126,19 @@
nobase_libxerces_c_la_HEADERS += ${msgicu_headers}
AM_CPPFLAGS += -I${ICU_PREFIX}/include
-SUBDIRS += xercesc/util/MsgLoaders/ICU/resources
+# Resource shortname
+PKGNAME=xercesc_messages_${INTERFACE_VER_U}
+
+CLEANFILES = xercesc_messages.c root_res.c root.res
+BUILT_SOURCES = xercesc_messages.c root_res.c
+xercesc_messages.c:
${top_srcdir}/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
+ ${ICU_PREFIX}/sbin/gencmn --name ${PKGNAME} -S ${PKGNAME}_dat.c -d .
${top_srcdir}/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
+ @mv ${PKGNAME}_dat.c xercesc_messages.c
+
+root_res.c: ${top_srcdir}/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
+ ${ICU_PREFIX}/bin/genrb -d .
${top_srcdir}/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
+ ${ICU_PREFIX}/sbin/genccode --name ${PKGNAME} -d . root.res
+
endif
if XERCES_USE_MSGLOADER_ICONV
@@ -1056,8 +1068,8 @@
msgicu_sources = \
xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp \
- xercesc/util/MsgLoaders/ICU/resources/xercesc_messages.c \
- xercesc/util/MsgLoaders/ICU/resources/root_res.c
+ xercesc_messages.c \
+ root_res.c
msgiconv_headers = \
xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
