Rename from supportincludedir so that `gnomesupport.h' can be installed

* Makefile.am (supportexecincludedir): Rename from
supportincludedir so that `gnomesupport.h' can be installed with
`make install-exec'.
(supportinclude_HEADERS): Remove.  Don't install popt-gnome.h
twice.
(error.o): Change `error.c: gnomesupport.h' dependency to
`error.o: gnomesupport.h' to reflect actual dependency.

svn path=/trunk/; revision=726

diff --git a/support/ChangeLog b/support/ChangeLog
index 2c8e9e3..15b0d48 100644 (file)
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,13 @@
+1999-03-27  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * Makefile.am (supportexecincludedir): Rename from
+       supportincludedir so that `gnomesupport.h' can be installed with
+       `make install-exec'.
+       (supportinclude_HEADERS): Remove.  Don't install popt-gnome.h
+       twice.
+       (error.o): Change `error.c: gnomesupport.h' dependency to
+       `error.o: gnomesupport.h' to reflect actual dependency.
+
 1999-02-19  Martin Baulig  <martin@home-of-linux.org>
 
        * canonicalize.c: Include <gnome-argp.h> instead of the removed

diff --git a/support/Makefile.am b/support/Makefile.am
index aec0419..11d68a5 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,17 +1,14 @@
 ## Process this file with automake to produce Makefile.in.
 
-supportincludedir = $(pkglibdir)/include
+supportexecincludedir = $(pkglibdir)/include
 
 INCLUDES = -D_GNU_SOURCE
 
 lib_LTLIBRARIES = libgnomesupport.la
 
-supportinclude_HEADERS = popt-gnome.h
-# gnome-argp.h getopt.h long-options.h argp.h error.h
-
 # it is in _DATA since we don't want `gnomesupport.h' to be part of
 # the distributed `.tar.gz' file
-supportinclude_DATA = gnomesupport.h
+supportexecinclude_DATA = gnomesupport.h
 
 # These are internal headers: they are used only when compiling and
 # should not be installed
@@ -29,7 +26,9 @@ libgnomesupport_la_LDFLAGS = -version-info 0:0:0
 
 BUILT_SOURCES = gnomesupport.h
 
-error.c: gnomesupport.h
+# error.o is not always built.  In the case when it is built, make
+# sure gnomesupport.h is built first.
+error.o: gnomesupport.h
 
 gnomesupport.h: gnomesupport.awk $(top_builddir)/config.h
        $(AWK) -f $(srcdir)/gnomesupport.awk < $(top_builddir)/config.h > gsh-t