invoke indent on gtkmarshal.*. rewrote source generation rules, use

Mon Aug 23 19:11:17 1999  Tim Janik  <timj@gtk.org>

        * gtk/Makefile.am:
        invoke indent on gtkmarshal.*.
        rewrote source generation rules, use COPYING as oldest source tag for
        a piggyback rule to generate all sources from (don't touch it ;).
        major cleanups, strip spaces on build rules for GNU Make.

        * gtk/genmarshal.pl: don't operate on hardcoded filenames but take
        source and target files from commandline arguments. don't invoke indent.

        * gdk/Makefile.am: minor cleanups, strip spaces on build rules for
        GNU Make.

        * docs/Makefile.am: added generation.txt.

        * Makefile.am: require automake 1.4, build README from README.in and
        INSTALL from INSTALL.in in dist-hook.

        * README.in:
        * INSTALL.in: new files to autogenerate README and INSTALL from.

        * gtk/COPYING:
        * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC
        LICENSE.

        * configure.in: figure wether we have GNU Make, version update to
        Gtk+ 1.2.4, interface age 2, binary age 4.

        * NEWS: updates.

        * docs/generation.txt: minor additions/corrections.

1 files changed, 66 insertions, 42 deletions

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 316172702..6c68265c6 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,19 +1,47 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am for gtk+/gdk
 
-gdkincludedir = $(includedir)/gdk
-
-lib_LTLIBRARIES = libgdk.la
-
-INCLUDES = \
+INCLUDES = @STRIP_BEGIN@ \
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-I$(top_srcdir)		\
 	@GTK_DEBUG_FLAGS@ 	\
 	@GTK_XIM_FLAGS@		\
 	@GTK_LOCALE_FLAGS@	\
 	@GLIB_CFLAGS@		\
-	@x_cflags@ 
+	@x_cflags@ 		\
+@STRIP_END@
 
-libgdk_la_SOURCES = \
+#
+# libraries to compile and install
+#
+lib_LTLIBRARIES = libgdk.la
+
+# libtool stuff: set version and export symbols for resolving
+libgdkincludedir = $(includedir)/gdk
+libgdk_la_LDFLAGS = @STRIP_BEGIN@ \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+	-release $(LT_RELEASE) \
+	-export-dynamic \
+	@GLIB_DEPLIBS@	\
+	@x_ldflags@	\
+	@x_libs@	\
+	-lm		\
+@STRIP_END@
+
+#
+# setup source file variables
+#
+# GDK header files for public installation (non-generated)
+gdk_public_h_sources = @STRIP_BEGIN@ \
+	gdk.h		\
+	gdkcursors.h	\
+	gdkrgb.h	\
+	gdki18n.h	\
+	gdkkeysyms.h	\
+	gdkprivate.h	\
+	gdktypes.h	\
+	gdkx.h		\
+@STRIP_END@
+gdk_c_sources = @STRIP_BEGIN@ \
 	gdk.c		\
 	gdkcc.c		\
 	gdkcolor.c	\
@@ -44,42 +72,23 @@ libgdk_la_SOURCES = \
 	MwmUtil.h       \
 	gxid_lib.h	\
 	gxid_proto.h	\
-        gxid_lib.c
-## this last one is ifdef'd out unless XINPUT_GXI is defined
-## It's easier than trying to get automake to handle compiling
-## it conditionally
-
-gdkinclude_HEADERS = \
-	gdk.h		\
-	gdkcursors.h	\
-	gdkrgb.h	\
-	gdki18n.h	\
-	gdkkeysyms.h	\
-	gdkprivate.h	\
-	gdktypes.h	\
-	gdkx.h
-
-LDADDS = \
-	@x_ldflags@	\
-	@x_libs@	\
-	@GLIB_LIBS@	\
-	-lm
-
-libgdk_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
-         @GLIB_DEPLIBS@	\
-         @x_ldflags@	\
-         @x_libs@	\
-         -lm
-
-EXTRA_PROGRAMS = gxid
-
-bin_PROGRAMS = @xinput_progs@
-
-gxid_SOURCES = gxid.c
+        gxid_lib.c	\
+@STRIP_END@
 
-gxid_LDADD = $(LDADDS)
+#
+# setup GDK sources and their dependancies
+#
+libgdkinclude_HEADERS = $(gdk_public_h_sources)
+libgdk_la_SOURCES = $(gdk_c_sources)
+MAINTAINERCLEANFILES +=
+EXTRA_HEADERS +=
+EXTRA_DIST +=
+EXTRA_DIST +=
 
+#
+# rules to generate built sources
+#
+# we only need to remake these headers once a new X version is released
 X-derived-headers:
 	sed -e 's/^#define[ 	]*XC\([^ 	]*\)[ 	]*\([^ 	]*\)[ 	]*.*$$/GDK\1 = \2,/' \
 	    -e 'tb' -e 'd' -e ':b' \
@@ -89,6 +98,21 @@ X-derived-headers:
 	    -e 'tb' -e 'd' -e ':b' -e 's/ 0X/ 0x/' \
 	    < @x_includes@/X11/keysymdef.h > gdkkeysyms.h
 
+#
+# extra programs
+#
+EXTRA_PROGRAMS = gxid
+bin_PROGRAMS = @xinput_progs@
+LDADDS = @STRIP_BEGIN@ \
+	@x_ldflags@	\
+	@x_libs@	\
+	@GLIB_LIBS@	\
+	-lm		\
+@STRIP_END@
+gxid_SOURCES = gxid.c
+gxid_LDADD = $(LDADDS)
+
+
 .PHONY: files
 
 files: