diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2011-12-01 22:06:30 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-12-02 08:37:17 +0000 |
| commit | d469db9398942723d2e2ae27989de63bce9cff8d (patch) | |
| tree | c2687b1e92be23b021e6d891a9918acaaa0df850 | |
| parent | ab121fb2e2c58fa340757f8be888d01a053a4d1c (diff) | |
| download | libguestfs-d469db9398942723d2e2ae27989de63bce9cff8d.tar.gz libguestfs-d469db9398942723d2e2ae27989de63bce9cff8d.tar.xz libguestfs-d469db9398942723d2e2ae27989de63bce9cff8d.zip | |
libguestfs: Added gnulib includes from builddir, as suggested by the Gnulib documentation
Since some modules (`getopt', for example) may copy files
into the build directory, `top_builddir/lib' is needed as well as
`top_srcdir/lib'. -- GNU Gnulib manual, section 2.2 Initial import
(cherry picked from commit 1a35ca59088e572c11633e85524bb282cb436186)
| -rw-r--r-- | capitests/Makefile.am | 1 | ||||
| -rw-r--r-- | daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/capitests/Makefile.am b/capitests/Makefile.am index cb9188ec..d32b7fc3 100644 --- a/capitests/Makefile.am +++ b/capitests/Makefile.am @@ -129,6 +129,7 @@ test_debug_to_file_SOURCES = test-debug-to-file.c test_debug_to_file_CFLAGS = \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/gnulib/lib \ + -I$(top_builddir)/gnulib/lib \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_debug_to_file_LDADD = \ $(top_builddir)/src/libguestfs.la \ diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7757067e..6e38da19 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -175,7 +175,7 @@ guestfsd_LDADD = \ $(LIBINTL) \ $(SERVENT_LIB) -guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib +guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) .PHONY: force diff --git a/src/Makefile.am b/src/Makefile.am index 761fcb6e..82a40045 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -165,7 +165,7 @@ libguestfs_la_CFLAGS = \ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) -libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib +libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib if HAVE_RPCGEN guestfs_protocol.c: guestfs_protocol.x |