Author: rleigh
Date: Wed Jun 14 20:41:28 2017
New Revision: 1798744
URL: http://svn.apache.org/viewvc?rev=1798744&view=rev
Log:
build: Merge MsgCatalog Makefile.in with src Makefile.am
This removes non-portable pattern rules and simplifies the logic.
It is now possible to build with BSD make and without any
assumptions about the automake internals.
Removed:
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
Modified:
xerces/c/trunk/Makefile.am
xerces/c/trunk/configure.ac
xerces/c/trunk/src/Makefile.am
Modified: xerces/c/trunk/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Makefile.am?rev=1798744&r1=1798743&r2=1798744&view=diff
==============================================================================
--- xerces/c/trunk/Makefile.am (original)
+++ xerces/c/trunk/Makefile.am Wed Jun 14 20:41:28 2017
@@ -19,5 +19,5 @@ pkgconfig_DATA= xerces-c.pc
check:
-rm -f test-results.log
- export
PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && export
XERCESC_NLS_HOME=${abs_top_builddir}/src/.libs && cd ${top_srcdir} && perl
scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/'
1> ${abs_top_builddir}/test-results.log
+ export
PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && export
XERCESC_NLS_HOME=${abs_top_builddir}/src/ && cd ${top_srcdir} && perl
scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/'
1> ${abs_top_builddir}/test-results.log
diff test-results.log
${top_srcdir}/scripts/sanityTest_ExpectedResult.log
Modified: xerces/c/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=1798744&r1=1798743&r2=1798744&view=diff
==============================================================================
--- xerces/c/trunk/configure.ac (original)
+++ xerces/c/trunk/configure.ac Wed Jun 14 20:41:28 2017
@@ -32,7 +32,6 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h src/xercesc/util/Xerces_autoconf_config.hpp])
AC_CONFIG_FILES([Makefile \
src/Makefile \
- src/xercesc/util/MsgLoaders/MsgCatalog/Makefile \
tests/Makefile \
samples/Makefile \
xerces-c.pc])
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=1798744&r1=1798743&r2=1798744&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Wed Jun 14 20:41:28 2017
@@ -22,7 +22,6 @@
include ${top_srcdir}/version.incl
DEFS += -DXERCES_BUILDING_LIBRARY
-SUBDIRS =
#
#
@@ -151,7 +150,19 @@ if XERCES_USE_MSGLOADER_ICONV
libxerces_c_la_SOURCES += ${msgiconv_sources}
nobase_libxerces_c_la_HEADERS += ${msgiconv_headers}
-SUBDIRS += xercesc/util/MsgLoaders/MsgCatalog
+# Resource shortname
+PKGNAME=XercesMessages
+
+# Resource file
+RESFILE=$(PKGNAME)_en_US.cat
+
+# Resources
+XercesMessages_en_US.cat:
@srcdir@/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
+ @echo "generating $@ from
@srcdir@/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg"
+ gencat $@
@srcdir@/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
+
+iconv_msgdir=$(prefix)/msg
+iconv_msg_DATA = $(RESFILE)
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
