Update to libtool-1.2b, change library versioning scheme to drop

Tue Sep 15 14:57:30 1998  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
	change library versioning scheme to drop LT_RELEASE
	from the -l line, while keeping it in the soname.

Tue Sep 15 14:10:33 1998  Owen Taylor  <otaylor@redhat.com>

	* configure.in Makefile.in: define a MAINT-like variable REBUILD
	which is set if Perl and awk are found, and autogenerated sources
	can be rebuilt. Remove the auto-generated sources from
	CVS.

	Add dependencies so that the autogenerated sources are
	rebuilt if the files they depend on change.
	(This unfortunately currently results in the entire
	gtk/ directory being rebuilt when any header changes.
	Moving all enums to gtkenums.h would fix this.)

1 files changed, 36 insertions, 28 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 99cd4ccf87..89e6fd50af 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -3,9 +3,9 @@
 gtkincludedir = $(includedir)/gtk
 DEFS += -DG_LOG_DOMAIN=\"Gtk\"
 
-lib_LTLIBRARIES = libgtk-1.1.la
+lib_LTLIBRARIES = libgtk.la
 
-libgtk_1_1_la_SOURCES = \
+libgtk_la_SOURCES = \
 	gtkaccelgroup.c		\
 	gtkaccellabel.c		\
 	gtkadjustment.c		\
@@ -107,7 +107,8 @@ libgtk_1_1_la_SOURCES = \
 	fnmatch.c		\
 	fnmatch.h
 
-gtkinclude_HEADERS = \
+# Source headers are are non-autogenerated headers
+source_headers = \
 	gtk.h			\
 	gtkaccelgroup.h		\
 	gtkaccellabel.h		\
@@ -160,7 +161,6 @@ gtkinclude_HEADERS = \
 	gtklist.h		\
 	gtklistitem.h		\
 	gtkmain.h		\
-	gtkmarshal.h		\
 	gtkmenu.h		\
 	gtkmenubar.h		\
 	gtkmenufactory.h	\
@@ -210,61 +210,71 @@ gtkinclude_HEADERS = \
 	gtkvscrollbar.h		\
 	gtkvseparator.h		\
 	gtkwidget.h		\
-	gtkwindow.h             \
+	gtkwindow.h
+
+gtkinclude_HEADERS = 		\
+	$(source_headers) 	\
+	gtkmarshal.h		\
 	gtktypebuiltins.h
 
-.PHONY: auto-files auto-files-1
-auto-files:
-	rm -f $(srcdir)/gtk.defs
-	$(MAKE) auto-files-1
+BUILT_SOURCES = \
+	gtktypebuiltins.h 		\
+	gtktypebuiltins_evals.c 	\
+	gtktypebuiltins_ids.c 		\
+        gtktypebuiltins_vars.c 		\
+	gtkmarshal.c 			\
+        gtkmarshal.h 
 
-auto-files-1: gtk.defs
-auto-files-1: gtktypebuiltins_evals.c gtktypebuiltins_ids.c
-auto-files-1: gtktypebuiltins_vars.c gtktypebuiltins.h
+# More headers to use when autogenerating.
+gdk_headers = \
+	$(top_srcdir)/gdk/gdktypes.h \
+	$(top_srcdir)/gdk/gdkrgb.h
 
 # generate gtk.defs file from gtk-boxed.defs and *.h
-gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs
+gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+	src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%` ; \
 	srcdir=$(srcdir) \
-	  perl $(srcdir)/makeenums.pl defs $(srcdir)/gtk*.h \
-               $(top_srcdir)/gdk/gdk*.h > gd.tmp
+	  perl $(srcdir)/makeenums.pl defs $$src_headers \
+               $(gdk_headers) > gd.tmp
 	cat $(srcdir)/gtk-boxed.defs >> gd.tmp
 	cp gd.tmp $(srcdir)/gtk.defs
 	rm -f gd.tmp
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
 	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
 	cp gtb.tmp $(srcdir)/gtktypebuiltins.h
 	rm -f gtb.tmp
 
 # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
 	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
 	cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
 	rm -f gtbv.tmp
 
 # generate type entries for type-id registration
-gtktypebuiltins_ids.c: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
 	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp
 	cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c
 	rm -f gtbi.tmp
 
 # generate enum value arrays
-gtktypebuiltins_evals.c: @MAINT@ makeenums.pl gtk.defs
+gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
 	srcdir=$(srcdir) \
 	  perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \
                $(top_srcdir)/gdk/gdk*.h > gtbe.tmp
 	cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c
 	rm -f gtbe.tmp
 
-gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list genmarshal.pl
+gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
 	srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl
 
 # ???
 # special remake rules
-makeenums.h: @MAINT@ gtk.h gtkprivate.h
+# makeenums.h: @REBUILD@ gtk.h gtkprivate.h
 
-libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libgtk_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
 
 EXTRA_DIST = \
 	line-arrow.xbm 		\
@@ -300,15 +310,13 @@ INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
 
 noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple 
 
-# FIXME, we currently rely on linking against libglib-1.1
-
 DEPS =	\
-	libgtk-@LT_RELEASE@.la				\
-	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la
+	libgtk.la					\
+	$(top_builddir)/gdk/libgdk.la
 
 LDADDS = \
-	libgtk-@LT_RELEASE@.la				\
-	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
+	libgtk.la					\
+	$(top_builddir)/gdk/libgdk.la			\
 	@x_ldflags@					\
 	@x_libs@					\
 	@GLIB_LIBS@                                     \