summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-09-26 14:57:19 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-10-03 14:02:45 -0400
commitfd476deabb97d08086ad465c4d0e913c9437a6bb (patch)
tree2d8db4f2998555f76d5667f743aa910a166f1355
parent2b5c81c2d8c643e58ac69d1d7f7a626fc392b1ea (diff)
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>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--include/Makefile.am1
-rw-r--r--src/Makefile.am5
4 files changed, 3 insertions, 6 deletions
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
-