diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-10-15 17:14:39 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-10-24 19:46:33 -0400 |
| commit | 7a3e69cfb079c7345f3d9b1217f373a706ba544c (patch) | |
| tree | b40a72b6edd35fae872bf8296c7f7d374137a4c3 | |
| parent | e50f645f4cc5bb1db0e025fc6e39c6e84a894c13 (diff) | |
config: provide a Makefile for the include directory
Reduce some complexity in the src makefile as it should not
handle sibling directories.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
4 files changed, 3 insertions, 4 deletions
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 |