--- Makefile.in.orig	Wed Mar 17 16:15:35 1999
+++ Makefile.in	Wed Mar 17 16:56:12 1999
@@ -72,9 +72,9 @@
 xinput_progs = @xinput_progs@
 
 SRC_SUBDIRS = glib gdk gtk
-SUBDIRS = $(SRC_SUBDIRS) docs
+SUBDIRS = $(SRC_SUBDIRS)
 
-bin_SCRIPTS = gtk-config
+bin_SCRIPTS = gtk10-config
 
 EXTRA_DIST =	\
 	gtk+.spec	\
@@ -147,7 +147,7 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  gtk-config
+CONFIG_CLEAN_FILES =  gtk10-config
 SCRIPTS =  $(bin_SCRIPTS)
 
 DATA =  $(m4data_DATA)
@@ -199,7 +199,10 @@
 	rm -f config.h
 
 maintainer-clean-hdr:
-gtk-config: $(top_builddir)/config.status gtk-config.in
+gtk10-config.in: gtk-config.in
+	cp gtk-config.in gtk10-config.in
+
+gtk10-config: $(top_builddir)/config.status gtk10-config.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)
@@ -221,25 +224,6 @@
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
 
-install-m4dataDATA: $(m4data_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(m4datadir)
-	@list='$(m4data_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(m4datadir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(m4datadir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(m4datadir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(m4datadir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-m4dataDATA:
-	$(NORMAL_UNINSTALL)
-	list='$(m4data_DATA)'; for p in $$list; do \
-	  rm -f $(m4datadir)/$$p; \
-	done
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -374,21 +358,19 @@
 all-recursive-am: config.h
 	$(MAKE) all-recursive
 
-all-am: Makefile $(SCRIPTS) $(DATA) config.h
+all-am: Makefile $(SCRIPTS) config.h
 
 install-exec-am: install-binSCRIPTS
 
-install-data-am: install-m4dataDATA
-
-uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
+uninstall-am: uninstall-binSCRIPTS
 
 install-exec: install-exec-recursive install-exec-am
 	@$(NORMAL_INSTALL)
 
-install-data: install-data-recursive install-data-am
+install-data: install-data-recursive
 	@$(NORMAL_INSTALL)
 
-install: install-recursive install-exec-am install-data-am
+install: install-recursive install-exec-am
 	@:
 
 uninstall: uninstall-recursive uninstall-am
@@ -439,7 +421,7 @@
 
 .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
 maintainer-clean-hdr uninstall-binSCRIPTS install-binSCRIPTS \
-uninstall-m4dataDATA install-m4dataDATA install-data-recursive \
+install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
--- glib/Makefile.in.orig	Mon Sep 21 13:20:33 1998
+++ glib/Makefile.in	Wed Mar 17 16:15:38 1999
@@ -74,11 +74,9 @@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-configincludedir = $(pkglibdir)/include
+lib_LTLIBRARIES = libglib10.la
 
-lib_LTLIBRARIES = libglib.la
-
-libglib_la_SOURCES = \
+libglib10_la_SOURCES = \
 		garray.c	\
 		gcache.c	\
 		gerror.c	\
@@ -95,17 +93,14 @@
 		gutils.c
 
 include_HEADERS = \
-		glib.h
-
-configinclude_DATA = \
-		glibconfig.h
+		glib.h glibconfig.h
 
-libglib_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0
+libglib10_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0
 
 INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = testglib
-testglib_LDADD = libglib.la
+testglib_LDADD = libglib10.la
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = glibconfig.h
@@ -117,15 +112,15 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libglib_la_LIBADD = 
-libglib_la_OBJECTS =  garray.lo gcache.lo gerror.lo ghash.lo glist.lo \
+libglib10_la_LIBADD = 
+libglib10_la_OBJECTS =  garray.lo gcache.lo gerror.lo ghash.lo glist.lo \
 gmem.lo gmessages.lo gprimes.lo gslist.lo gtimer.lo gtree.lo gstring.lo \
 gscanner.lo gutils.lo
 PROGRAMS =  $(noinst_PROGRAMS)
 
 testglib_SOURCES = testglib.c
 testglib_OBJECTS =  testglib.o
-testglib_DEPENDENCIES =  libglib.la
+testglib_DEPENDENCIES =  libglib10.la
 testglib_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -145,10 +140,10 @@
 
 TAR = tar
 GZIP = --best
-SOURCES = $(libglib_la_SOURCES) testglib.c
-OBJECTS = $(libglib_la_OBJECTS) testglib.o
+SOURCES = $(libglib10_la_SOURCES) testglib.c
+OBJECTS = $(libglib10_la_OBJECTS) testglib.o
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) glibconfig.h
+all: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) glibconfig.h
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
@@ -251,8 +246,8 @@
 
 maintainer-clean-libtool:
 
-libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
+libglib10.la: $(libglib10_la_OBJECTS) $(libglib10_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libglib10_la_LDFLAGS) $(libglib10_la_OBJECTS) $(libglib10_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
 
--- gdk/Makefile.in.orig	Wed Mar 17 17:19:30 1999
+++ gdk/Makefile.in	Wed Mar 17 17:19:56 1999
@@ -73,9 +73,9 @@
 
 gdkincludedir = $(includedir)/gdk
 
-lib_LTLIBRARIES = libgdk.la
+lib_LTLIBRARIES = libgdk10.la
 
-libgdk_la_SOURCES = \
+libgdk10_la_SOURCES = \
 	hangulinput.c	\
 	gdk.c		\
 	gdkcc.c		\
@@ -116,7 +116,7 @@
 	gdktypes.h	\
 	gdkx.h
 
-libgdk_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 \
+libgdk10_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 \
 	@x_ldflags@ @x_libs@
 
 INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ 
@@ -149,8 +149,8 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgdk_la_LIBADD = 
-libgdk_la_OBJECTS =  hangulinput.lo gdk.lo gdkcc.lo gdkcolor.lo \
+libgdk10_la_LIBADD = 
+libgdk10_la_OBJECTS =  hangulinput.lo gdk.lo gdkcc.lo gdkcolor.lo \
 gdkcursor.lo gdkdnd.lo gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo \
 gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrectangle.lo \
 gdkregion.lo gdkselection.lo gdkvisual.lo gdkwindow.lo gdkxid.lo \
@@ -180,8 +180,8 @@
 .deps/gdkregion.P .deps/gdkselection.P .deps/gdkvisual.P \
 .deps/gdkwindow.P .deps/gdkxid.P .deps/gxid.P .deps/gxid_lib.P \
 .deps/hangulinput.P
-SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
-OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
+SOURCES = $(libgdk10_la_SOURCES) $(gxid_SOURCES)
+OBJECTS = $(libgdk10_la_OBJECTS) $(gxid_OBJECTS)
 
 default: all
 
@@ -246,8 +246,8 @@
 
 maintainer-clean-libtool:
 
-libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
+libgdk10.la: $(libgdk10_la_OBJECTS) $(libgdk10_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libgdk10_la_LDFLAGS) $(libgdk10_la_OBJECTS) $(libgdk10_la_LIBADD) $(LIBS)
 
 mostlyclean-binPROGRAMS:
 
@@ -373,31 +373,6 @@
 	../glib/glibconfig.h gdkcursors.h
 gxid_lib.lo gxid_lib.o: gxid_lib.c ../config.h gxid_lib.h gxid_proto.h
 
-MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--include .deps/.P
-.deps/.P: $(BUILT_SOURCES)
-	echo > $@
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-
-maintainer-clean-depend:
-	rm -rf .deps
-
-.deps/%.P: %.c
-	@echo "Computing dependencies for $<..."
-	@o='o'; \
-	test -n "$o" && o='$$o'; \
-	$(MKDEP) $< >$@.tmp \
-	  && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
-	  && rm -f $@.tmp
 info:
 dvi:
 check: all
--- gtk/Makefile.in.orig	Wed Mar 17 17:26:57 1999
+++ gtk/Makefile.in	Wed Mar 17 17:28:43 1999
@@ -73,9 +73,9 @@
 
 gtkincludedir = $(includedir)/gtk
 
-lib_LTLIBRARIES = libgtk.la
+lib_LTLIBRARIES = libgtk10.la
 
-libgtk_la_SOURCES = \
+libgtk10_la_SOURCES = \
 	gtkaccelerator.c	\
 	gtkadjustment.c		\
 	gtkaspectframe.c	\
@@ -263,7 +263,7 @@
 	gtkwindow.h             \
 	gtktypebuiltins.h
 
-libgtk_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0
+libgtk10_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0
 
 EXTRA_DIST = \
 	line-arrow.xbm 		\
@@ -291,41 +291,41 @@
 noinst_PROGRAMS = testgtk testinput testselection simple 
 
 testgtk_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtk10.la				\
+	$(top_builddir)/gdk/libgdk10.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglib10.la		\
 	-lm
 
 testinput_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtk10.la				\
+	$(top_builddir)/gdk/libgdk10.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglib10.la		\
 	-lm
 
 testselection_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtk10.la				\
+	$(top_builddir)/gdk/libgdk10.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglib10.la		\
 	-lm
 
 simple_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtk10.la				\
+	$(top_builddir)/gdk/libgdk10.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglib10.la		\
 	-lm
 
 DEPS = \
-	libgtk.la		                \
-	$(top_builddir)/gdk/libgdk.la		\
-	$(top_builddir)/glib/libglib.la
+	libgtk10.la		                \
+	$(top_builddir)/gdk/libgdk10.la		\
+	$(top_builddir)/glib/libglib10.la
 
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
@@ -345,8 +345,8 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgtk_la_LIBADD = 
-libgtk_la_OBJECTS =  gtkaccelerator.lo gtkadjustment.lo \
+libgtk10_la_LIBADD = 
+libgtk10_la_OBJECTS =  gtkaccelerator.lo gtkadjustment.lo \
 gtkaspectframe.lo gtkalignment.lo gtkarrow.lo gtkbin.lo gtkbbox.lo \
 gtkbox.lo gtkbutton.lo gtkcheckbutton.lo gtkcheckmenuitem.lo \
 gtkclist.lo gtkcolorsel.lo gtkcombo.lo gtkcontainer.lo gtkcurve.lo \
@@ -422,8 +422,8 @@
 .deps/gtkvscale.P .deps/gtkvscrollbar.P .deps/gtkvseparator.P \
 .deps/gtkwidget.P .deps/gtkwindow.P .deps/simple.P .deps/testgtk.P \
 .deps/testinput.P .deps/testselection.P
-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c simple.c
-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o
+SOURCES = $(libgtk10_la_SOURCES) testgtk.c testinput.c testselection.c simple.c
+OBJECTS = $(libgtk10_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o
 
 default: all
 
@@ -490,8 +490,8 @@
 
 maintainer-clean-libtool:
 
-libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
+libgtk10.la: $(libgtk10_la_OBJECTS) $(libgtk10_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libgtk10_la_LDFLAGS) $(libgtk10_la_OBJECTS) $(libgtk10_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
 
@@ -568,31 +568,6 @@
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
 
-MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--include .deps/.P
-.deps/.P: $(BUILT_SOURCES)
-	echo > $@
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-
-maintainer-clean-depend:
-	rm -rf .deps
-
-.deps/%.P: %.c
-	@echo "Computing dependencies for $<..."
-	@o='o'; \
-	test -n "$o" && o='$$o'; \
-	$(MKDEP) $< >$@.tmp \
-	  && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
-	  && rm -f $@.tmp
 info:
 dvi:
 check: all
@@ -609,7 +584,7 @@
 
 uninstall: uninstall-libLTLIBRARIES uninstall-gtkincludeHEADERS
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
