summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorRaja R Harinath <harinath@src.gnome.org>1999-03-27 22:31:28 +0000
committerRaja R Harinath <harinath@src.gnome.org>1999-03-27 22:31:28 +0000
commit76fa851107ac73b78f153886f17a34fe80b3a9a7 (patch)
treea39fcefdfa901e5e2dd3e717bdc265ae0d31c63f /support
parent9467512f6c461ddfd7b49bf009f8f4f731483409 (diff)
downloadshared-mime-info-76fa851107ac73b78f153886f17a34fe80b3a9a7.tar.gz
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
Diffstat (limited to 'support')
-rw-r--r--support/ChangeLog10
-rw-r--r--support/Makefile.am11
2 files changed, 15 insertions, 6 deletions
diff --git a/support/ChangeLog b/support/ChangeLog
index 2c8e9e33..15b0d484 100644
--- 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 aec04195..11d68a53 100644
--- 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