[Gnucash-changes] r13276 - gnucash/trunk - combine XML_{CFLAGS, LIBS} into LIBXML2_{CLFLAGS, LIBS}

[Derek Atkins]

Author: warlord
Date: 2006-02-15 23:31:37 -0500 (Wed, 15 Feb 2006)
New Revision: 13276
Trac: http://svn.gnucash.org/trac/changeset/13276

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am
   gnucash/trunk/src/backend/file/Makefile.am
   gnucash/trunk/src/backend/file/test/Makefile.am
   gnucash/trunk/src/business/business-core/file/Makefile.am
   gnucash/trunk/src/gnome-utils/Makefile.am
Log:
combine XML_{CFLAGS,LIBS} into LIBXML2_{CLFLAGS,LIBS}



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-16 04:07:31 UTC (rev 13275)
+++ gnucash/trunk/ChangeLog	2006-02-16 04:31:37 UTC (rev 13276)
@@ -6,6 +6,14 @@
 	  - add a few more comments
 	  - no need to check for libxml2 twice  (more work to do here).
 
+	* src/backend/file/test/Makefile.am:
+	* src/backend/file/Makefile.am:
+	* src/business/business-core/file/Makefile.am:
+	* src/gnome-utils/Makefile.am:
+	* lib/libgsf-1.12.3/tests/Makefile.am:
+	* configure.in:
+	  combine XML_{CFLAGS,LIBS} into LIBXML2_{CLFLAGS,LIBS}
+
 2006-02-15  Joshua Sled  <jsled at asynchronous.org>
 
 	* src/backend/file/test/test-load-xml2.c (main): Initialize

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-02-16 04:07:31 UTC (rev 13275)
+++ gnucash/trunk/configure.in	2006-02-16 04:31:37 UTC (rev 13276)
@@ -402,14 +402,8 @@
 AC_SUBST(LIBXML2_LIBS)
 AC_SUBST(LIBXML_VERSION)
 
-# Silly us -- we have two Makefile macros for the same set of libraries!
-XML_CFLAGS=${LIBXML2_CFLAGS}
-XML_LIBS=${LIBXML2_LIBS}
-AC_SUBST(XML_CFLAGS)
-AC_SUBST(XML_LIBS)
-
 oLIBS="$LIBS"
-LIBS="$LIBS $XML_LIBS"
+LIBS="$LIBS $LIBXML2_LIBS"
 
 # Compile a test program to verify that the xml2 library works.
 AC_CHECK_LIB(xml2, xmlElemDump, [:], [

Modified: gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am	2006-02-16 04:07:31 UTC (rev 13275)
+++ gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am	2006-02-16 04:31:37 UTC (rev 13276)
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(LIBXML_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(LIBXML2_CFLAGS)
 LDADD = ../gsf/libgsf-1.la $(LIBGSF_LIBS)
 
 check_PROGRAMS = test-msole1 test-msole2 test-cp-msole test-msvba	\

Modified: gnucash/trunk/src/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/file/Makefile.am	2006-02-16 04:07:31 UTC (rev 13275)
+++ gnucash/trunk/src/backend/file/Makefile.am	2006-02-16 04:31:37 UTC (rev 13276)
@@ -10,7 +10,7 @@
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/core-utils\
   -I${top_srcdir}/lib/libc\
-  ${XML_CFLAGS} \
+  ${LIBXML2_CFLAGS} \
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS}
@@ -59,7 +59,7 @@
 
 libgnc_backend_file_la_LDFLAGS = -module
 libgnc_backend_file_la_LIBADD = \
-   ${GLIB_LIBS} ${GCONF_LIBS} ${XML_LIBS} \
+   ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/core-utils/libcore-utils.la \
    ${QOF_LIBS}

Modified: gnucash/trunk/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/file/test/Makefile.am	2006-02-16 04:07:31 UTC (rev 13275)
+++ gnucash/trunk/src/backend/file/test/Makefile.am	2006-02-16 04:31:37 UTC (rev 13276)
@@ -233,7 +233,7 @@
   -I${top_srcdir}/src/engine/test-core \
   -I${top_srcdir}/src/backend/file \
   -I${top_srcdir}/src/backend/qsf \
-  ${XML_CFLAGS} \
+  ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${QOF_CFLAGS} \
   ${GUILE_INCS}

Modified: gnucash/trunk/src/business/business-core/file/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/file/Makefile.am	2006-02-16 04:07:31 UTC (rev 13275)
+++ gnucash/trunk/src/business/business-core/file/Makefile.am	2006-02-16 04:31:37 UTC (rev 13276)
@@ -9,7 +9,7 @@
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/business/business-core \
-  ${XML_CFLAGS} \
+  ${LIBXML2_CFLAGS} \
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
@@ -43,5 +43,5 @@
 
 libgncmod_business_backend_file_la_LDFLAGS = -module
 libgncmod_business_backend_file_la_LIBADD = \
-   ${GLIB_LIBS} ${XML_LIBS} ${QOF_LIBS} \
+   ${GLIB_LIBS} ${LIBXML2_LIBS} ${QOF_LIBS} \
    ${top_builddir}/src/business/business-core/libgncmod-business-core.la

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2006-02-16 04:07:31 UTC (rev 13275)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2006-02-16 04:31:37 UTC (rev 13276)
@@ -188,7 +188,7 @@
   ${GSF_LIBS} \
   ${QOF_LIBS} \
   ${GOFFICE_LIBS} \
-  ${XML_LIBS}
+  ${LIBXML2_LIBS}
 
 libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c