build: insert -I$(top_builddir)/include before -I$(top_srcdir)/include

everywhere, for those who perform non-srcdir builds from a pristine
cloned directory.  There is no problem when building from a tarball,
since that includes include/parted/*.h files under $(top_srcdir).
* libparted/Makefile.am: Insert it.
* libparted/fs/Makefile.am: Likewise.
* libparted/labels/Makefile.am: Likewise.
* libparted/tests/Makefile.am: Likewise.
* parted/Makefile.am: Likewise.
* partprobe/Makefile.am: Likewise.
* tests/Makefile.am: Likewise.

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 4bc1939..bb7cc0e 100644 (file)
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -18,8 +18,9 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 SUBDIRS       = labels fs . $(SUBDIRS_CHECK)
 
 
-partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
-lib_LTLIBRARIES              = libparted.la
+partedincludedir = \
+  -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include
+lib_LTLIBRARIES        = libparted.la
 
 # Set the shared library version, per Libtool's guidelines.
 # For details, see the "Updating library version information" section of

diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index 0ce838c..1a3599a 100644 (file)
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -3,7 +3,7 @@
 #
 # This file may be modified and/or distributed without restriction.
 
-partedincludedir      =        -I$(top_srcdir)/include
+partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_LTLIBRARIES    =        libfs.la
 libfs_la_LDFLAGS  = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
                        -release $(LT_RELEASE)

diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
index 967e537..7fe347b 100644 (file)
--- a/libparted/labels/Makefile.am
+++ b/libparted/labels/Makefile.am
@@ -12,7 +12,8 @@ endif
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 partedincludedir = \
-  -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libparted
+  -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include \
+  -I$(top_srcdir)/libparted
 noinst_LTLIBRARIES    =        liblabels.la
 
 liblabels_la_SOURCES = \

diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
index de8d03e..d857cdb 100644 (file)
--- a/libparted/tests/Makefile.am
+++ b/libparted/tests/Makefile.am
@@ -15,6 +15,7 @@ LDADD = \
 AM_CPPFLAGS = \
   $(CHECK_CFLAGS) \
   -I$(top_srcdir)/lib \
+  -I$(top_builddir)/include \
   -I$(top_srcdir)/include
 
 label_SOURCES = common.h common.c label.c

diff --git a/parted/Makefile.am b/parted/Makefile.am
index 7b093c6..0b23693 100644 (file)
--- a/parted/Makefile.am
+++ b/parted/Makefile.am
@@ -3,7 +3,8 @@ BUILT_SOURCES =
 sbin_PROGRAMS = parted
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
+partedincludedir = \
+  -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include
 
 parted_SOURCES = command.c     \
                 command.h      \

diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
index f140991..7e3dea2 100644 (file)
--- a/partprobe/Makefile.am
+++ b/partprobe/Makefile.am
@@ -1,4 +1,5 @@
-partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
+partedincludedir = \
+  -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 sbin_PROGRAMS = partprobe

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f442204..34b3bc5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -74,6 +74,7 @@ LDADD = \
   $(top_builddir)/libparted/libparted.la
 AM_CPPFLAGS = \
   -I$(top_srcdir)/lib \
+  -I$(top_builddir)/include \
   -I$(top_srcdir)/include
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)