[PATCH libpciaccess 5/5] include: add a Makefile to install and distribute header file

Gaetan Nadon memsize at videotron.ca
Sun Sep 26 12:22:25 PDT 2010


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

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am         |    2 +-
 configure.ac        |    1 +
 include/Makefile.am |    1 +
 src/Makefile.am     |    5 -----
 4 files changed, 3 insertions(+), 6 deletions(-)
 create mode 100644 include/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ea30cd2..a285275 100644
--- 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
--- 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
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
--- 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
-
-- 
1.6.0.4



More information about the xorg-devel mailing list