[Libguestfs] [hivex PATCH 1/8] build: do not look for headers in "$(top_builddir)/lib"

[Laszlo Ersek]

The "hivex.h" public library header is generated when "autogen.sh" is run.
Thus, for example, "hivex.h" is part of the tarball distribution that is
created by "make dist". When plain "make" is invoked (for building the
project), "hivex.h" already exists, namely in "$(top_srcdir)/lib".

"make" does not generate *any* header files in "$(top_builddir)/lib"
(which, for out-of-tree builds, stands for a different pathname than
"$(top_srcdir)/lib" does). Remove the useless "-I$(top_builddir)/lib"
options from the lib, perl, and python makefiles, preserving the proper
"-I$(top_srcdir)/lib" ones.

Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---
 lib/Makefile.am     | 2 +-
 perl/Makefile.PL.in | 2 +-
 python/Makefile.am  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4a7cea1752e6..1a1e2bc2e55d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -84,7 +84,7 @@ TESTS = test-just-header
 
 test_just_header_SOURCES = test-just-header.c
 test_just_header_CFLAGS = \
-	-I$(top_srcdir)/lib -I$(top_builddir)/lib \
+	-I$(top_srcdir)/lib \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 test_just_header_LDADD = \
 	$(top_builddir)/lib/libhivex.la
diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
index 77b4a0e4dd59..92e298b9a889 100644
--- a/perl/Makefile.PL.in
+++ b/perl/Makefile.PL.in
@@ -25,7 +25,7 @@ WriteMakefile (
     VERSION => '@PACKAGE_VERSION@',
 
     LIBS => '-L at top_builddir@/lib/.libs -lhivex',
-    INC => '-I at top_builddir@/lib -I at top_srcdir@/lib',
+    INC => '-I at top_srcdir@/lib',
     TYPEMAPS => [ '@srcdir@/typemap' ],
     CCFLAGS => $Config{ccflags} . ' @CFLAGS@',
     );
diff --git a/python/Makefile.am b/python/Makefile.am
index 1117ab942edc..5bac34b95fc7 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -38,7 +38,7 @@ python_LTLIBRARIES = libhivexmod.la
 
 libhivexmod_la_SOURCES = hivex-py.c
 libhivexmod_la_CFLAGS = -Wall $(PYTHON_CFLAGS) \
-		        -I$(top_srcdir)/lib -I$(top_builddir)/lib
+		        -I$(top_srcdir)/lib
 libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la
 libhivexmod_la_LDFLAGS = -avoid-version -shared -module -shrext $(PYTHON_EXT_SUFFIX)
 
-- 
2.19.1.3.g30247aa5d201