From 98a31af495d47939d18d7a46cf9f47dc9ad687c1 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 26 Jun 2003 12:53:29 +0000 Subject: [PATCH] * m4/buddy.m4 (BUDDY_LDFLAGS): Use $(top_builddir), not $(top_srcdir). * src/tgbaparse/Makefile.am (AM_CPPFLAGS): Add $(BUDDY_CPPFLAGS). --- ChangeLog | 3 +++ m4/buddy.m4 | 2 +- src/tgbaparse/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4b6b5ada..7fc0afa02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-06-26 Alexandre Duret-Lutz + * m4/buddy.m4 (BUDDY_LDFLAGS): Use $(top_builddir), not $(top_srcdir). + * src/tgbaparse/Makefile.am (AM_CPPFLAGS): Add $(BUDDY_CPPFLAGS). + * doc/Makefile.am: Rewrite to run Doxygen whenever Doxyfile.in or configure.ac changes. Distribute the html doc. * doc/Doxyfile.in (EXCLUDE_PATTERNS): Complete with diff --git a/m4/buddy.m4 b/m4/buddy.m4 index 00dbd4604..0466c17ac 100644 --- a/m4/buddy.m4 +++ b/m4/buddy.m4 @@ -18,7 +18,7 @@ AC_DEFUN([AX_CHECK_BUDDY], [ if test "$with_included_buddy" = yes; then AC_CONFIG_SUBDIRS([buddy]) - BUDDY_LDFLAGS='$(top_srcdir)/buddy/src/bdd.la' + BUDDY_LDFLAGS='$(top_builddir)/buddy/src/libbdd.la' BUDDY_CPPFLAGS='-I$(top_srcdir)/buddy/src' else BUDDY_LDFLAGS='-lbdd' diff --git a/src/tgbaparse/Makefile.am b/src/tgbaparse/Makefile.am index 196e61887..a553ce753 100644 --- a/src/tgbaparse/Makefile.am +++ b/src/tgbaparse/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(srcdir)/.. +AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) noinst_LTLIBRARIES = libtgbaparse.la