Reduce some complexity in the src makefile as it should not
handle sibling directories.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
---
Makefile.am | 2 +-
configure.ac | 1 +
include/Makefile.am | 1 +
src/Makefile.am | 3 ---
4 files changed, 3 insertions(+), 4 deletions(-)
create mode 100644 include/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 6238176..569341b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Daniel Stone disowns all copyright on this file; no warranty is given as to
its
# suitability or otherwise.
-SUBDIRS = src sxpm cxpm
+SUBDIRS = include src sxpm cxpm
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 7dbf061..166957e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ if test x$STAT_ZFILE = xyes ; then
fi
AC_CONFIG_FILES([Makefile
+ include/Makefile
src/Makefile
sxpm/Makefile
cxpm/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..99970a5
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+nobase_include_HEADERS = X11/xpm.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 558baca..297d310 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,4 @@ libXpm_la_SOURCES = \
rgbtab.h \
scan.c
-libXpmincludedir = $(includedir)/X11
-libXpminclude_HEADERS = $(top_srcdir)/include/X11/xpm.h
-
EXTRA_DIST = amigax.c amigax.h simx.c simx.h
--
1.6.0.4
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
