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.

3 files changed, 301 insertions, 290 deletions

diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index 5d15fd6a4..73b2cfeb3 100644
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -22,7 +22,6 @@ gtktypebuiltins_vars.c
 gtktypebuiltins_evals.c
 gtk.defs
 testdnd
-stamp-d
-stamp-t
-stamp-m
-s-*
+stamp-gtktypebuiltins.h
+stamp-gtkmarshal.h
+stamp-gtk.defs
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7c7d42144..366b608e3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,124 +1,45 @@
-### Process this file with automake to produce Makefile.in
+## Makefile.am for gtk+/gtk
 
-gtkincludedir = $(includedir)/gtk
+INCLUDES = @STRIP_BEGIN@ \
+	-DG_LOG_DOMAIN=\"Gtk\"				\
+	-DGTK_DISABLE_COMPAT_H				\
+	-DGTK_EXE_PREFIX=\"$(exec_prefix)\"		\
+	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
+	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+	-I$(top_srcdir)					\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_XIM_FLAGS@					\
+	@GTK_LOCALE_FLAGS@				\
+	@GLIB_CFLAGS@					\
+	@x_cflags@					\
+@STRIP_END@
 
+
+#
+# libraries to compile and install
+#
 lib_LTLIBRARIES = libgtk.la
 
-static_SOURCES = \
-	gtkaccelgroup.c		\
-	gtkaccellabel.c		\
-	gtkadjustment.c		\
-	gtkalignment.c		\
-	gtkarg.c		\
-	gtkarrow.c		\
-	gtkaspectframe.c	\
-	gtkbin.c		\
-	gtkbindings.c		\
-	gtkbbox.c		\
-	gtkbox.c		\
-	gtkbutton.c		\
-	gtkcalendar.c		\
-	gtkcheckbutton.c	\
-	gtkcheckmenuitem.c	\
-	gtkclist.c		\
-	gtkcolorsel.c		\
-	gtkcombo.c		\
-	gtkcontainer.c		\
-	gtkctree.c		\
-	gtkcurve.c		\
-	gtkdata.c		\
-	gtkdialog.c		\
-	gtkdnd.c		\
-	gtkdrawingarea.c	\
-	gtkeditable.c           \
-	gtkentry.c		\
-	gtkeventbox.c		\
-	gtkfilesel.c		\
-	gtkfixed.c		\
-	gtkfontsel.c            \
-	gtkframe.c		\
-	gtkgamma.c		\
-	gtkgc.c			\
-	gtkhandlebox.c		\
-	gtkhbbox.c		\
-	gtkhbox.c		\
-	gtkhpaned.c		\
-	gtkhruler.c		\
-	gtkhscale.c		\
-	gtkhscrollbar.c		\
-	gtkhseparator.c		\
-	gtkimage.c		\
-	gtkinputdialog.c	\
-	gtkintl.h		\
-	gtkinvisible.c		\
-	gtkitem.c		\
-	gtkitemfactory.c	\
-	gtklabel.c		\
-	gtklayout.c		\
-	gtklist.c		\
-	gtklistitem.c		\
-	gtkmain.c		\
-	gtkmenu.c		\
-	gtkmenubar.c		\
-	gtkmenufactory.c	\
-	gtkmenuitem.c		\
-	gtkmenushell.c		\
-	gtkmisc.c		\
-	gtknotebook.c		\
-	gtkobject.c		\
-	gtkoptionmenu.c		\
-	gtkpacker.c		\
-	gtkpaned.c		\
-	gtkpixmap.c		\
-	gtkplug.c               \
-	gtkpreview.c		\
-	gtkprogress.c		\
-	gtkprogressbar.c	\
-	gtkradiobutton.c	\
-	gtkradiomenuitem.c	\
-	gtkrange.c		\
-	gtkrc.c			\
-	gtkruler.c		\
-	gtkscale.c		\
-	gtkscrollbar.c		\
-	gtkscrolledwindow.c	\
-	gtkselection.c		\
-	gtkseparator.c		\
-	gtksignal.c		\
-	gtksocket.c             \
-	gtkspinbutton.c		\
-	gtkstyle.c		\
-	gtkstatusbar.c		\
-	gtktable.c		\
-	gtktearoffmenuitem.c    \
-	gtktext.c		\
-	gtkthemes.c		\
-	gtktipsquery.c		\
-	gtktogglebutton.c	\
-	gtktoolbar.c		\
-	gtktooltips.c		\
-	gtktree.c		\
-	gtktreeitem.c		\
-	gtktypeutils.c		\
-	gtkvbbox.c		\
-	gtkvbox.c		\
-	gtkviewport.c		\
-	gtkvpaned.c		\
-	gtkvruler.c		\
-	gtkvscale.c		\
-	gtkvscrollbar.c		\
-	gtkvseparator.c		\
-	gtkwidget.c		\
-	gtkwindow.c		\
-	fnmatch.c		\
-	fnmatch.h
+# libtool stuff: set version and export symbols for resolving
+libgtkincludedir = $(includedir)/gtk
+libgtk_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@
+#	$(top_builddir)/gdk/libgdk.la
 
-libgtk_la_SOURCES = \
-	$(static_SOURCES)	\
-	gtkmarshal.c
 
-# Source headers which are non-autogenerated headers
-source_headers = \
+#
+# setup source file variables
+#
+# GTK+ header files for public installation (non-generated)
+gtk_public_h_sources = @STRIP_BEGIN@ \
 	gtk.h			\
 	gtkaccelgroup.h		\
 	gtkaccellabel.h		\
@@ -151,6 +72,7 @@ source_headers = \
 	gtkentry.h		\
 	gtkenums.h		\
 	gtkeventbox.h		\
+	gtkfeatures.h		\
 	gtkfilesel.h		\
 	gtkfixed.h		\
 	gtkfontsel.h		\
@@ -227,100 +149,230 @@ source_headers = \
 	gtkvscrollbar.h		\
 	gtkvseparator.h		\
 	gtkwidget.h		\
-	gtkwindow.h
-
-gtkinclude_HEADERS = 		\
-	$(source_headers) 	\
-	gtkfeatures.h		\
+	gtkwindow.h		\
+@STRIP_END@
+# GTK+ header files that don't get installed
+gtk_private_h_sources = @STRIP_BEGIN@ \
+@STRIP_END@
+# GTK+ C sources to build the library from
+gtk_c_sources = @STRIP_BEGIN@ \
+	gtkaccelgroup.c		\
+	gtkaccellabel.c		\
+	gtkadjustment.c		\
+	gtkalignment.c		\
+	gtkarg.c		\
+	gtkarrow.c		\
+	gtkaspectframe.c	\
+	gtkbin.c		\
+	gtkbindings.c		\
+	gtkbbox.c		\
+	gtkbox.c		\
+	gtkbutton.c		\
+	gtkcalendar.c		\
+	gtkcheckbutton.c	\
+	gtkcheckmenuitem.c	\
+	gtkclist.c		\
+	gtkcolorsel.c		\
+	gtkcombo.c		\
+	gtkcontainer.c		\
+	gtkctree.c		\
+	gtkcurve.c		\
+	gtkdata.c		\
+	gtkdialog.c		\
+	gtkdnd.c		\
+	gtkdrawingarea.c	\
+	gtkeditable.c           \
+	gtkentry.c		\
+	gtkeventbox.c		\
+	gtkfilesel.c		\
+	gtkfixed.c		\
+	gtkfontsel.c            \
+	gtkframe.c		\
+	gtkgamma.c		\
+	gtkgc.c			\
+	gtkhandlebox.c		\
+	gtkhbbox.c		\
+	gtkhbox.c		\
+	gtkhpaned.c		\
+	gtkhruler.c		\
+	gtkhscale.c		\
+	gtkhscrollbar.c		\
+	gtkhseparator.c		\
+	gtkimage.c		\
+	gtkinputdialog.c	\
+	gtkintl.h		\
+	gtkinvisible.c		\
+	gtkitem.c		\
+	gtkitemfactory.c	\
+	gtklabel.c		\
+	gtklayout.c		\
+	gtklist.c		\
+	gtklistitem.c		\
+	gtkmain.c		\
+	gtkmarshal.c		\
+	gtkmenu.c		\
+	gtkmenubar.c		\
+	gtkmenufactory.c	\
+	gtkmenuitem.c		\
+	gtkmenushell.c		\
+	gtkmisc.c		\
+	gtknotebook.c		\
+	gtkobject.c		\
+	gtkoptionmenu.c		\
+	gtkpacker.c		\
+	gtkpaned.c		\
+	gtkpixmap.c		\
+	gtkplug.c               \
+	gtkpreview.c		\
+	gtkprogress.c		\
+	gtkprogressbar.c	\
+	gtkradiobutton.c	\
+	gtkradiomenuitem.c	\
+	gtkrange.c		\
+	gtkrc.c			\
+	gtkruler.c		\
+	gtkscale.c		\
+	gtkscrollbar.c		\
+	gtkscrolledwindow.c	\
+	gtkselection.c		\
+	gtkseparator.c		\
+	gtksignal.c		\
+	gtksocket.c             \
+	gtkspinbutton.c		\
+	gtkstyle.c		\
+	gtkstatusbar.c		\
+	gtktable.c		\
+	gtktearoffmenuitem.c    \
+	gtktext.c		\
+	gtkthemes.c		\
+	gtktipsquery.c		\
+	gtktogglebutton.c	\
+	gtktoolbar.c		\
+	gtktooltips.c		\
+	gtktree.c		\
+	gtktreeitem.c		\
+	gtktypeutils.c		\
+	gtkvbbox.c		\
+	gtkvbox.c		\
+	gtkviewport.c		\
+	gtkvpaned.c		\
+	gtkvruler.c		\
+	gtkvscale.c		\
+	gtkvscrollbar.c		\
+	gtkvseparator.c		\
+	gtkwidget.c		\
+	gtkwindow.c		\
+	fnmatch.c		\
+	fnmatch.h		\
+@STRIP_END@
+# we use our own built_sources variable rules to avoid automake's
+# BUILT_SOURCES oddities
+# we generate frequently rebuild files piggyback on a stamp file, so sources
+# depending on them only get rebuild when the built source actually changed
+# content
+#
+# built sources that don't get installed
+gtk_built_sources = @STRIP_BEGIN@ \
+	stamp-gtktypebuiltins.h	\
+	stamp-gtkmarshal.h	\
+	gtktypebuiltins_vars.c	\
+	gtktypebuiltins_ids.c	\
+	gtktypebuiltins_evals.c	\
+	gtkmarshal.c		\
+	stamp-gtk.defs		\
+	gtk.defs		\
+@STRIP_END@
+# built sources that get installed with the header files
+gtk_built_public_sources = @STRIP_BEGIN@ \
 	gtkmarshal.h		\
-	gtktypebuiltins.h
-
-# note gtk.defs, gtktypebuiltin* and gtkmarshal.[ch] aren't here, but
-# their stamps are.  Another trick is to use the temporary output files as
-# the stamp files.
-BUILT_SOURCES = \
-	s-gd s-gtb s-gtbv s-gtbi s-gtbe \
-	stamp-m 
-
-# cause the built sources to be rebuild when possible, even with --include-deps
-$(static_SOURCES): $(BUILT_SOURCES)
-
-# More headers to use when autogenerating.
-gdk_headers = \
-	../gdk/gdktypes.h \
-	../gdk/gdkrgb.h
-
-# generate gtk.defs file from gtk-boxed.defs and *.h
-gtk.defs: @REBUILD@ s-gd
-	@:
-
-s-gd: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+	gtktypebuiltins.h	\
+@STRIP_END@
+# non-header sources (headers should be specified in the above variables)
+# that don't serve as direct make target sources, i.e. they don't have
+# their own .lo rules and don't get publically installed
+gtk_extra_sources = @STRIP_BEGIN@ \
+	gtkfeatures.h.in	\
+	makeenums.pl		\
+	makeenums.awk		\
+	maketypes.awk		\
+	makeenums.h		\
+	gtkargcollector.c	\
+	gtk-boxed.defs		\
+	genmarshal.pl		\
+	gtkmarshal.list		\
+@STRIP_END@
+# Extra headers that are used for enum type array/id generation
+gdk_headers = @STRIP_BEGIN@ \
+	../gdk/gdktypes.h	\
+	../gdk/gdkrgb.h		\
+@STRIP_END@
+
+#
+# setup GTK+ sources and their dependancies
+#
+libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources)
+libgtk_la_SOURCES = $(gtk_c_sources)
+MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
+EXTRA_HEADERS +=
+EXTRA_DIST += $(gtk_private_h_sources)
+EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
+
+#
+# rules to generate built sources
+#
+gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
+CLEANFILES += $(gen_sources)
+COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
+$(OBJECTS): COPYING 	# this is our oldest-source-stamp
+gtk.defs: @REBUILD@ # stamp-gtk.defs
+	-test -e "$@" || touch $(srcdir)/gtk.defs
+stamp-gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
 	cd $(srcdir) \
-	&& $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \
-	&& cat gtk-boxed.defs >> s-gd \
-	&& (cmp -s s-gd gtk.defs || cp s-gd gtk.defs)
-
-# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: @REBUILD@ s-gtb
-	@:
-
-s-gtb: @REBUILD@ s-gd maketypes.awk
+	&& $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) > xgen-gdef \
+	&& cat gtk-boxed.defs >> xgen-gdef \
+	&& (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
+	&& rm -f xgen-gdef \
+	&& echo timestamp > $@
+gtkmarshal.h: @REBUILD@ # stamp-gtkmarshal.h
+	-test -e "$@" || touch $(srcdir)/gtkmarshal.h
+stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.h
+gtkmarshal.c stamp-gtkmarshal.h: @REBUILD@ genmarshal.pl gtkmarshal.list
+	$(PERL) genmarshal.pl gtkmarshal.list xgen-gmh xgen-gmc \
+	&& (test -z "$(INDENT)" || $(INDENT) xgen-gmh) \
+	&& (test -z "$(INDENT)" || $(INDENT) xgen-gmc) \
+	&& cp xgen-gmc gtkmarshal.c \
+	&& (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
+	&& rm -f xgen-gmh xgen-gmc \
+	&& echo timestamp > stamp-gtkmarshal.h
+gtktypebuiltins.h: @REBUILD@ # stamp-gtktypebuiltins.h
+	-test -e "$@" || touch $(srcdir)/gtktypebuiltins.h
+stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk gtk.defs gtktypebuiltins.h
 	cd $(srcdir) \
-	&& $(AWK) -f maketypes.awk gtk.defs macros > s-gtb \
-	&& (cmp -s s-gtb gtktypebuiltins.h || cp s-gtb gtktypebuiltins.h)
-
-# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: @REBUILD@ s-gtbv
-	@:
-s-gtbv: @REBUILD@ s-gd maketypes.awk
+	&& $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \
+	&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \
+	&& rm -f xgen-gtbh \
+	&& echo timestamp > $@
+gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk gtk.defs
 	cd $(srcdir) \
-	&& $(AWK) -f maketypes.awk gtk.defs variables > s-gtbv \
-	&& (cmp -s s-gtbv gtktypebuiltins_vars.c || cp s-gtbv gtktypebuiltins_vars.c)
-
-# generate type entries for type-id registration
-gtktypebuiltins_ids.c: @REBUILD@ s-gtbi
-	@:
-
-s-gtbi: @REBUILD@ s-gd maketypes.awk
+	&& $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \
+	&& cp xgen-gtbvc $@ \
+	&& rm -f xgen-gtbvc
+gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk gtk.defs
 	cd $(srcdir) \
-	&& $(AWK) -f maketypes.awk gtk.defs entries > s-gtbi \
-	&& (cmp -s s-gtbi gtktypebuiltins_ids.c || cp s-gtbi gtktypebuiltins_ids.c)
-
-# generate enum value arrays
-gtktypebuiltins_evals.c: @REBUILD@ s-gtbe 
-	@:
-
-s-gtbe: @REBUILD@ makeenums.pl s-gd
+	&& $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
+	&& cp xgen-gtbic $@ \
+	&& rm -f xgen-gtbic
+gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers)
 	cd $(srcdir) \
-	&& $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) > \
-	s-gtbe \
-	&& (cmp -s s-gtbe gtktypebuiltins_evals.c || cp s-gtbe gtktypebuiltins_evals.c)
+	&& $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) > xgen-gtbec \
+	&& cp xgen-gtbec $@ \
+	&& rm -f xgen-gtbec
 
-$(srcdir)/gtkmarshal.c $(srcdir)/gtkmarshal.h: @REBUILD@ stamp-m
-	@:
-
-stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl
-	(srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
-	&& (cmp -s s-gmc $(srcdir)/gtkmarshal.c || cp s-gmc $(srcdir)/gtkmarshal.c) \
-	&& rm -f s-gmc \
-	&& (cmp -s s-gmh $(srcdir)/gtkmarshal.h || cp s-gmh $(srcdir)/gtkmarshal.h) \
-	&& rm -f s-gmh) \
-	&& echo timestamp > stamp-m
-
-libgtk_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
-	-release $(LT_RELEASE) 					\
-	@GLIB_DEPLIBS@ 						\
-	@x_ldflags@						\
-	@x_libs@ 						\
-	-lm
-#	$(top_builddir)/gdk/libgdk.la
 
 gtkconfdir = $(sysconfdir)/gtk
 gtkconf_DATA = gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.iso-8859-2
 
 # We create a dummy theme for the default GTK+ theme
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk
 	echo "# Empty gtkrc for default theme" > \
@@ -335,86 +387,33 @@ install-data-local:
 uninstall-local:
 	rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc
 
-EXTRA_DIST = \
-	line-arrow.xbm 		\
-	line-wrap.xbm 		\
-	testgtk.1 		\
-	testgtkrc 		\
-	testgtkrc2 		\
-	gtkfeatures.h.in	\
-	makeenums.pl		\
-	makeenums.awk		\
-	maketypes.awk		\
-	makeenums.h		\
-	gtkargcollector.c	\
-	gtktypebuiltins_vars.c	\
-	gtktypebuiltins_ids.c	\
-	gtktypebuiltins_evals.c	\
-	gtk-boxed.defs		\
-	gtk.defs		\
-	genmarshal.pl		\
-	gtkmarshal.list		\
-	check-y.xpm		\
-	check-n.xpm		\
-	test.xpm		\
-	marble.xpm		\
-	3DRings.xpm		\
-	FilesQueue.xpm		\
-	Modeller.xpm		\
-	tree_plus.xpm		\
-	tree_minus.xpm		\
-	tree_plus.xbm		\
-	tree_minus.xbm          \
-        circles.xbm		\
-	gtkrc.iso-8859-2        \
-	gtkrc.ja 		\
-	gtkrc.ko		\
-	gtkrc.ru
-
-INCLUDES = \
-	-DGTK_DISABLE_COMPAT_H				\
-	-DG_LOG_DOMAIN=\"Gtk\"				\
-	-DGTK_EXE_PREFIX=\"$(exec_prefix)\"		\
-	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
-	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
-	-I$(top_srcdir)					\
-	@GTK_DEBUG_FLAGS@				\
-	@GTK_XIM_FLAGS@					\
-	@GTK_LOCALE_FLAGS@				\
-	@GLIB_CFLAGS@					\
-	@x_cflags@
-
-noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple 
-# testthreads
-
-DEPS =	\
-	libgtk.la					\
-	$(top_builddir)/gdk/libgdk.la
-
-LDADDS = \
-	libgtk.la					\
-	$(top_builddir)/gdk/libgdk.la			\
-	@x_ldflags@					\
-	@x_libs@					\
-	@GLIB_LIBS@                                     \
-	-lm
-
+#
+# test programs, not to be installed
+#
+noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads
+DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
+LDADDS = @STRIP_BEGIN@ \
+	libgtk.la			\
+	$(top_builddir)/gdk/libgdk.la	\
+	@x_ldflags@			\
+	@x_libs@			\
+	@GLIB_LIBS@			\
+	-lm				\
+@STRIP_END@
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
-#testthreads_DEPENDENCIES = $(DEPS)
 testselection_DEPENDENCIES = $(DEPS)
 testrgb_DEPENDENCIES = $(DEPS)
 testdnd_DEPENDENCIES = $(DEPS)
 simple_DEPENDENCIES = $(DEPS)
-
+#testthreads_DEPENDENCIES = $(DEPS)
 testgtk_LDADD = $(LDADDS)
 testinput_LDADD = $(LDADDS)
-#testthreads_LDADD = $(LDADDS)
 testselection_LDADD = $(LDADDS)
 testrgb_LDADD = $(LDADDS)
 testdnd_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
+#testthreads_LDADD = $(LDADDS)
 
 .PHONY: files test test-debug
 
@@ -433,5 +432,29 @@ test-debug: testgtk
 	cd $$builddir; cd $(srcdir); \
 	$(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
 
-$(srcdir)/gtksignal.h: $(srcdir)/gtkmarshal.h
-	@:
+EXTRA_DIST += @STRIP_BEGIN@ \
+	testgtk.1 		\
+	testgtkrc 		\
+	testgtkrc2 		\
+        circles.xbm		\
+	line-arrow.xbm 		\
+	line-wrap.xbm 		\
+	tree_plus.xbm		\
+	tree_minus.xbm          \
+	3DRings.xpm		\
+	FilesQueue.xpm		\
+	Modeller.xpm		\
+	check-y.xpm		\
+	check-n.xpm		\
+	marble.xpm		\
+	tree_minus.xpm		\
+	tree_plus.xpm		\
+	test.xpm		\
+	check-y.xpm		\
+	check-n.xpm		\
+	test.xpm		\
+	gtkrc.iso-8859-2        \
+	gtkrc.ja 		\
+	gtkrc.ko		\
+	gtkrc.ru		\
+@STRIP_END@
diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl
index db0487b99..3b5fdfaf8 100755
--- a/gtk/genmarshal.pl
+++ b/gtk/genmarshal.pl
@@ -20,25 +20,17 @@
 		"CALLBACK"=>"CALLBACK"
 		);
 
-$srcdir = $ENV{'srcdir'} || '.';
-$indent = $ENV{'INDENT'};
-
-sub indent {
-    my $filename = shift;
-    if (defined($indent) && $indent ne "") {
-	system($indent, $filename);
-	# we try the most likely names for backup files
-	system("rm", "-f", "$filename.bak", "$filename~");
-    }
+if ($#ARGV != 2) {
+	die ("Wrong number of arguments given, need <source> <target.h> <target.c>");
 }
 
-open(IL, "<$srcdir/gtkmarshal.list") || die("Open failed: $!");
-open(OH, ">s-gmh") || die("Open failed: $!");
-open(OS, ">s-gmc") || die("Open failed: $!");
+open(IL, "<" . $ARGV[0]) || die ("Open failed: $!");
+open(OH, ">" . $ARGV[1]) || die ("Open failed: $!");
+open(OS, ">" . $ARGV[2]) || die ("Open failed: $!");
 
 print OH <<EOT;
-#ifndef __GTKMARSHAL_H__
-#define __GTKMARSHAL_H__ 1
+#ifndef __GTK_MARSHAL_H__
+#define __GTK_MARSHAL_H__
 
 #include <gtk/gtktypeutils.h>
 #include <gtk/gtkobject.h>
@@ -196,10 +188,7 @@ print OH <<EOT;
 }
 #endif /* __cplusplus */
 
-#endif /* __GTKMARSHAL_H__ */
+#endif /* __GTK_MARSHAL_H__ */
 EOT
 
 close(IL); close(OH); close(OS);
-
-indent("s-gmh");
-indent("s-gmc");