IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

combine XML_{CFLAGS,LIBS} into LIBXML2_{CLFLAGS,LIBS}

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13276 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins
2006-02-16 04:31:37 +00:00
parent 0c2cc63b56
commit bb9dbe25e7
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -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@asynchronous.org>
* src/backend/file/test/test-load-xml2.c (main): Initialize

8
configure.in
View File

@@ -402,14 +402,8 @@ AC_SUBST(LIBXML2_CFLAGS)
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, [:], [

2
lib/libgsf-1.12.3/tests/Makefile.am
View File

@@ -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 \

4
src/backend/file/Makefile.am
View File

@@ -10,7 +10,7 @@ AM_CFLAGS = \
-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 @@ noinst_HEADERS = \
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}

2
src/backend/file/test/Makefile.am
View File

@@ -233,7 +233,7 @@ AM_CFLAGS = \
-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}

4
src/business/business-core/file/Makefile.am
View File

@@ -9,7 +9,7 @@ AM_CFLAGS = \
-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 @@ noinst_HEADERS = \
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

2
src/gnome-utils/Makefile.am
View File

@@ -188,7 +188,7 @@ libgncmod_gnome_utils_la_LIBADD = \
${GSF_LIBS} \
${QOF_LIBS} \
${GOFFICE_LIBS} \
${XML_LIBS}
${LIBXML2_LIBS}
libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c