include: add a Makefile to install and distribute header file

Makefiles are simpler when they only handle what is in their
directory.

Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index ea30cd2..a285275 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Order: scanpci depends on libpciaccess built in src
-SUBDIRS = man src scanpci
+SUBDIRS = include man src scanpci
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pciaccess.pc

diff --git a/configure.ac b/configure.ac
index 1c2a3ca..47cd733 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,7 @@ AC_SUBST(PCIACCESS_LIBS)
                  
 
 AC_OUTPUT([Makefile
+          include/Makefile
           man/Makefile
           src/Makefile
           scanpci/Makefile

diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644 (file)
index 0000000..b668192
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+include_HEADERS = pciaccess.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 523e4b1..7842118 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,8 +71,3 @@ libpciaccess_la_SOURCES = common_bridge.c \
 libpciaccess_la_LIBADD = $(PCIACCESS_LIBS)
 
 libpciaccess_la_LDFLAGS = -version-number 0:10:8 -no-undefined
-
-libpciaccessincludedir = $(includedir)
-libpciaccessinclude_HEADERS = \
-    $(top_srcdir)/include/pciaccess.h
-