Bump the version to 3.0.0

At the same time, change the library sonames for -3.0 to just -3.
This is necessary since the 2.99 releases installed libraries like
libgtk-3.0.so.0.9903.0, and we want to prevent the library version
number from jumping back. So 3.0 will have libgtk-3.so.0.0.0.

32 files changed, 130 insertions, 125 deletions

diff --git a/README.in b/README.in
index fb4084b71b..a2bc8fbcbc 100644
--- a/README.in
+++ b/README.in
@@ -39,3 +39,8 @@ Release notes for 3.0
   Or online at:
 
   http://library.gnome.org/devel/gtk/3.0/migrating.html
+
+* Note that the library sonames in this release have been changed from
+  libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
+  library versions from going backwards, compared to the 2.90/91/99
+  releases. Applications will have to be recompiled.
diff --git a/configure.ac b/configure.ac
index d806f32e81..3757f0108d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,9 +8,9 @@
 # if backwards compatibility has been broken,
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
-m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [99])
-m4_define([gtk_micro_version], [4])
+m4_define([gtk_major_version], [3])
+m4_define([gtk_minor_version], [0])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
diff --git a/demos/Makefile.am b/demos/Makefile.am
index dc6fcb632b..dfe3a7d752 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -12,11 +12,11 @@ INCLUDES = 				\
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)				\
 	$(MATH_LIB)
 
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 5385dcbbb4..46b805a0bf 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -55,11 +55,11 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)				\
 	-lm
 
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 8a70de8c1a..8f4ad9e89f 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -44,7 +44,7 @@ INCLUDES = 			\
 	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.0.la $(GDK_DEP_LIBS)
+GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 091f06d7b7..6a37a3cf02 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -106,7 +106,7 @@ CPPFLAGS += \
 	-UGTK_DISABLE_SINGLE_INCLUDES
 
 GTKDOC_LIBS = \
-	$(top_builddir)/gtk/libgtk-3.0.la				\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index c4a1c8bfcb..03bef71df4 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -9,13 +9,13 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
-	$(GTK_DEP_LIBS)				\
-	$(GDK_DEP_LIBS)				\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)			\
+	$(GDK_DEP_LIBS)			\
 	-lm
 
 if USE_X11
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 25539e12ee..8ef4e6dafe 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -45,11 +45,11 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 LDADD = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 drawing_LDADD = $(LDADD) \
-	$(top_builddir)/gdk/libgdk-3.0.la
+	$(top_builddir)/gdk/libgdk-3.la
 
 noinst_PROGRAMS = \
 	hello-world				\
diff --git a/gail-3.0-uninstalled.pc.in b/gail-3.0-uninstalled.pc.in
index 50a802e90d..eabd899613 100644
--- a/gail-3.0-uninstalled.pc.in
+++ b/gail-3.0-uninstalled.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Gail
 Description: GNOME Accessibility Implementation Library
 Version: @VERSION@
-Requires: atk gtk+-3. 
+Requires: atk gtk+-3.0
 Libs: ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail.la ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail-util/libgailutil.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/modules/other/gail
diff --git a/gail-3.0.pc.in b/gail-3.0.pc.in
index 5b42e83e11..9777545c02 100644
--- a/gail-3.0.pc.in
+++ b/gail-3.0.pc.in
@@ -7,5 +7,5 @@ Name: Gail
 Description: GNOME Accessibility Implementation Library
 Version: @VERSION@
 Requires: atk gtk+-3.0
-Libs: -L${libdir} -lgailutil-3.0
+Libs: -L${libdir} -lgailutil-3
 Cflags: -I${includedir}/gail-3.0
diff --git a/gdk-3.0.pc.in b/gdk-3.0.pc.in
index 5c7d27e51b..20c54fec5c 100644
--- a/gdk-3.0.pc.in
+++ b/gdk-3.0.pc.in
@@ -8,5 +8,5 @@ Name: GDK
 Description: GTK+ Drawing Kit
 Version: @VERSION@
 Requires: @GDK_PACKAGES@
-Libs: -L${libdir} -lgdk-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
+Libs: -L${libdir} -lgdk-3 @GDK_EXTRA_LIBS@
 Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 8bab7db71f..1e51edd02b 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -157,23 +157,23 @@ common_sources = 		\
 	gdkmarshalers.c		\
 	gdkmarshalers.h
 
-libgdk_3_0_la_SOURCES = $(common_sources)
-libgdk_3_0_la_LIBADD = $(GDK_DEP_LIBS)
-libgdk_3_0_la_LDFLAGS = $(LDADD)
+libgdk_3_la_SOURCES = $(common_sources)
+libgdk_3_la_LIBADD = $(GDK_DEP_LIBS)
+libgdk_3_la_LDFLAGS = $(LDADD)
 
 if USE_X11
-libgdk_3_0_la_LIBADD += x11/libgdk-x11.la
+libgdk_3_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
-libgdk_3_0_la_LIBADD += quartz/libgdk-quartz.la
+libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
 if USE_WIN32
-libgdk_3_0_la_SOURCES += gdkkeynames.c
-libgdk_3_0_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+libgdk_3_la_SOURCES += gdkkeynames.c
+libgdk_3_la_LIBADD += win32/libgdk-win32.la
+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
 endif # USE_WIN32
 
 if HAVE_INTROSPECTION
@@ -184,11 +184,11 @@ introspection_files = 		\
         gdkenumtypes.c		\
         gdkenumtypes.h
 
-Gdk-3.0.gir: libgdk-3.0.la Makefile
+Gdk-3.0.gir: libgdk-3.la Makefile
 Gdk_3_0_gir_SCANNERFLAGS = 	\
 	--c-include="gdk/gdk.h"
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_3_0_gir_LIBS = libgdk-3.0.la
+Gdk_3_0_gir_LIBS = libgdk-3.la
 Gdk_3_0_gir_FILES = $(introspection_files)
 Gdk_3_0_gir_CFLAGS = $(INCLUDES)
 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
@@ -235,13 +235,13 @@ x11_introspection_files = 		\
 	x11/gdkx11visual.h		\
 	x11/gdkx11window.h
 
-GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile
+GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
 GdkX11_3_0_gir_SCANNERFLAGS = 		\
 	--identifier-prefix=Gdk		\
 	--c-include="gdk/gdkx.h"	\
 	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_3_0_gir_LIBS = libgdk-3.0.la
+GdkX11_3_0_gir_LIBS = libgdk-3.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
 GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
@@ -297,7 +297,7 @@ if OS_LINUX
 TESTS = abicheck.sh
 endif
 
-lib_LTLIBRARIES = libgdk-3.0.la
+lib_LTLIBRARIES = libgdk-3.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += $(gdk_built_sources)
@@ -305,7 +305,7 @@ EXTRA_HEADERS =
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.0.la
+	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
 endif
 
 #note: not gdkconfig.h
@@ -349,7 +349,7 @@ stamp-gc-h: $(top_builddir)/config.status
 dist-hook: ../build/win32/vs9/gdk.vcproj
 
 ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
-	for F in $(libgdk_3_0_la_SOURCES); do \
+	for F in $(libgdk_3_la_SOURCES); do \
 		case $$F in \
 		*.c) echo '   <File RelativePath="..\..\..\gdk\'$$F'" />' \
 		     ;; \
diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index 2bfefafcfa..6db651fe2a 100755
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
 cpp -P -DGDK_WINDOWING_X11  ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
-nm -D -g --defined-only .libs/libgdk-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
+nm -D -g --defined-only .libs/libgdk-3.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index 5cadc6d35c..75dd9b4cea 100644
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
 
 progs_ldadd = \
 	$(GDK_DEP_LIBS) \
-	$(top_builddir)/gdk/libgdk-$(GTK_API_VERSION).la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(NULL)
 
 #TEST_PROGS              += check-gdk-cairo
diff --git a/gtk+-3.0-uninstalled.pc.in b/gtk+-3.0-uninstalled.pc.in
index dbccc16111..3fc11c60af 100644
--- a/gtk+-3.0-uninstalled.pc.in
+++ b/gtk+-3.0-uninstalled.pc.in
@@ -6,5 +6,5 @@ Name: GTK+ Uninstalled
 Description: GTK+ Graphical UI Library (${target} target), Not Installed
 Version: @VERSION@
 Requires: gdk-@GTK_API_VERSION@-uninstalled @GTK_PACKAGES@
-Libs: ${pc_top_builddir}/${pcfiledir}/gtk/libgtk-@GTK_API_VERSION@.la @GTK_EXTRA_LIBS@
+Libs: ${pc_top_builddir}/${pcfiledir}/gtk/libgtk-3.la @GTK_EXTRA_LIBS@
 Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GTK_EXTRA_CFLAGS@
diff --git a/gtk+-3.0.pc.in b/gtk+-3.0.pc.in
index cc318822a8..d5d83939e1 100644
--- a/gtk+-3.0.pc.in
+++ b/gtk+-3.0.pc.in
@@ -11,5 +11,5 @@ Name: GTK+
 Description: GTK+ Graphical UI Library
 Version: @VERSION@
 Requires: gdk-@GTK_API_VERSION@ @GTK_PACKAGES@
-Libs: -L${libdir} -lgtk-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
+Libs: -L${libdir} -lgtk-3 @GTK_EXTRA_LIBS@
 Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index ce6f41de72..63d6eec445 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -108,7 +108,7 @@ endif
 
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
-	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)
 deps =
 
@@ -879,7 +879,7 @@ gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_sr
 gtktestutils.c: gtktypefuncs.c
 
 # target platform:
-lib_LTLIBRARIES = libgtk-3.0.la
+lib_LTLIBRARIES = libgtk-3.la
 
 gtkincludedir = $(includedir)/gtk-3.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
@@ -887,22 +887,22 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
-libgtk_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_3_0_la_LIBADD = $(libadd)
-libgtk_3_0_la_DEPENDENCIES = $(deps)
+libgtk_3_la_SOURCES = $(gtk_c_sources)
+libgtk_3_la_LDFLAGS = $(libtool_opts)
+libgtk_3_la_LIBADD = $(libadd)
+libgtk_3_la_DEPENDENCIES = $(deps)
 
-#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+#libgtk_win32_3_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 
 if USE_WIN32
-libgtk_3_0_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
-libgtk_3_0_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
+libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.0.la
+	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
 endif
 
 if USE_QUARTZ
@@ -949,13 +949,13 @@ distclean-local:
 	  rm -f $(MAINTAINERCLEANFILES); \
 	fi
 
-DEPS = libgtk-3.0.la $(top_builddir)/gdk/libgdk-3.0.la
+DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
 
 TEST_DEPS = $(DEPS) immodules.cache
 
 LDADDS =								\
-	libgtk-3.0.la							\
-	$(top_builddir)/gdk/libgdk-3.0.la				\
+	libgtk-3.la							\
+	$(top_builddir)/gdk/libgdk-3.la				\
 	$(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
@@ -966,7 +966,7 @@ introspection_files = \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
 Gtk_3_0_gir_SCANNERFLAGS = 			\
 	--add-include-path=$(top_builddir)/gdk	\
 	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
@@ -980,7 +980,7 @@ Gtk_3_0_gir_CFLAGS = \
 		-UGDK_DISABLE_DEPRECATED \
 		-UGTK_DISABLE_DEPRECATED \
 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = libgtk-3.0.la
+Gtk_3_0_gir_LIBS = libgtk-3.la
 Gtk_3_0_gir_FILES = $(introspection_files)
 Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
 INTROSPECTION_GIRS += Gtk-3.0.gir
diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh
index ecb8439bc3..6f94739f8c 100755
--- a/gtk/abicheck.sh
+++ b/gtk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
 cpp -P -DG_OS_UNIX -DGDK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
-nm -D -g --defined-only .libs/libgtk-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
+nm -D -g --defined-only .libs/libgtk-3.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index bca3961d7b..17bbc38eab 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -11,11 +11,11 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 progs_ldadd = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = $(TEST_PROGS)
diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index 161d075af0..de4562ba7b 100644
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -13,8 +13,8 @@ INCLUDES = \
 
 
 LDADDS = \
-	$(top_builddir)/gdk/libgdk-3.0.la		\
-	$(top_builddir)/gtk/libgtk-3.0.la		\
+	$(top_builddir)/gdk/libgdk-3.la		\
+	$(top_builddir)/gtk/libgtk-3.la		\
 	$(GTK_DEP_LIBS)
 
 enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index 051d2acde3..2a90796b74 100644
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -12,9 +12,9 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 LDADDS = \
-	$(GTK_DEP_LIBS)							\
-	$(top_builddir)/gdk/libgdk-3.0.la				\
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(GTK_DEP_LIBS)				\
+	$(top_builddir)/gdk/libgdk-3.la		\
+	$(top_builddir)/gtk/libgtk-3.la
 
 enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
 
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index eb078f98f4..2ba9dcf99c 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -17,10 +17,10 @@ INCLUDES = \
 	$(INCLUDED_IMMODULE_DEFINE)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 687d8f619f..7285efbec8 100644
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -141,8 +141,8 @@ libgail_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libgail_la_LIBADD =  \
-	$(top_builddir)/gtk/libgtk-3.0.la				\
-	$(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la				\
+	$(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.la	\
 	$(GTK_DEP_LIBS)							\
 	$(INTLLIBS)
 
diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am
index 43765d417f..4e9c192c50 100644
--- a/modules/other/gail/libgail-util/Makefile.am
+++ b/modules/other/gail/libgail-util/Makefile.am
@@ -29,7 +29,7 @@ uninstall-ms-lib:
 endif
 
 
-lib_LTLIBRARIES = libgailutil-3.0.la
+lib_LTLIBRARIES = libgailutil-3.la
 
 util_c_sources =		\
 	gailmisc.c		\
@@ -42,13 +42,13 @@ util_public_h_sources =		\
 	gailtextutil.h		\
 	gail-util.h
 
-libgailutil_3_0_la_SOURCES = 	\
+libgailutil_3_la_SOURCES = 	\
 	$(util_c_sources)
 
 libgailutilinclude_HEADERS =	\
 	$(util_public_h_sources)
 
-libgailutil_3_0_la_CPPFLAGS = \
+libgailutil_3_la_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/gdk	\
 	-I$(top_builddir)/gdk	\
@@ -58,23 +58,23 @@ libgailutil_3_0_la_CPPFLAGS = \
 	-DGDK_DISABLE_DEPRECATED\
 	-DGTK_DISABLE_DEPRECATED
 
-libgailutil_3_0_la_CFLAGS = \
+libgailutil_3_la_CFLAGS = \
 	$(GTK_DEP_CFLAGS)	\
 	$(GTK_DEBUG_FLAGS)	\
 	$(AM_CFLAGS)
 
-libgailutil_3_0_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
+libgailutil_3_la_LIBADD = \
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)
 
-libgailutil_3_0_la_LDFLAGS = \
+libgailutil_3_la_LDFLAGS = \
 	-version-info $(GAIL_LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(export_symbols)			\
         $(LDFLAGS)
 
-gailutil.lib: libgailutil-3.0.la gailutil.def
+gailutil.lib: libgailutil-3.la gailutil.def
 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
 
 install-data-local: install-ms-lib install-def-file
diff --git a/modules/other/gail/tests/Makefile.am b/modules/other/gail/tests/Makefile.am
index 9f94b2ba2e..c164efc8a6 100644
--- a/modules/other/gail/tests/Makefile.am
+++ b/modules/other/gail/tests/Makefile.am
@@ -56,7 +56,7 @@ libferret_la_LDFLAGS =		\
 	$(LDFLAGS)
 
 libferret_la_LIBADD =			    \
-	$(top_builddir)/gtk/libgtk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
         $(GTK_DEP_LIBS)  		    \
 	$(GAIL_INET_LIBS)
 endif
@@ -66,8 +66,8 @@ libtestaction_la_SOURCES = 	\
 
 libtestaction_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -78,8 +78,8 @@ libtestbutton_la_SOURCES = 	\
 
 libtestbutton_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -90,8 +90,8 @@ libtestcombo_la_SOURCES = 	\
 
 libtestcombo_la_LDFLAGS =		\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -100,8 +100,8 @@ libtestcomponent_la_SOURCES =	\
 
 libtestcomponent_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -110,8 +110,8 @@ libtestimage_la_SOURCES = 	\
 
 libtestimage_la_LDFLAGS =		\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -122,8 +122,8 @@ libtestmenuitem_la_SOURCES = 	\
 
 libtestmenuitem_la_LDFLAGS =		\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -134,8 +134,8 @@ libtestnotebook_la_SOURCES = 	\
 
 libtestnotebook_la_LDFLAGS =		\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -146,8 +146,8 @@ libtestobject_la_SOURCES = 	\
 
 libtestobject_la_LDFLAGS =		\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -158,8 +158,8 @@ libtestpaned_la_SOURCES = 	\
 
 libtestpaned_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -170,8 +170,8 @@ libtestprops_la_SOURCES = 	\
 
 libtestprops_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -180,8 +180,8 @@ libtestselection_la_SOURCES = \
 
 libtestselection_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -190,8 +190,8 @@ libteststatusbar_la_SOURCES = \
 
 libteststatusbar_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -204,8 +204,8 @@ libtesttable_la_SOURCES = 	\
 
 libtesttable_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -218,8 +218,8 @@ libtesttext_la_SOURCES = 	\
 
 libtesttext_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -230,8 +230,8 @@ libtesttoplevel_la_SOURCES = 	\
 
 libtesttoplevel_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -242,8 +242,8 @@ libtesttreetable_la_SOURCES =	\
 
 libtesttreetable_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
@@ -252,8 +252,8 @@ libtestvalues_la_SOURCES = 	\
 
 libtestvalues_la_LDFLAGS =	\
 	-rpath $(moduledir) -module -avoid-version $(no_undefined) \
-	$(top_builddir)/gtk/libgtk-3.0.la \
-	$(top_builddir)/gdk/libgdk-3.0.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(top_builddir)/gdk/libgdk-3.la \
 	$(GTK_DEP_LIBS)	\
 	$(LDFLAGS)
 
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 54feaac16a..c04fa46649 100644
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
 	$(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index 402ae34379..9b25bc974f 100644
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -28,7 +28,7 @@ libprintbackend_file_la_LDFLAGS =  \
 	-avoid-version -module $(no_undefined)
 
 libprintbackend_file_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 noinst_HEADERS =			\
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 8142b6827b..38236525b7 100644
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
 	$(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index c67d8b251e..9d7109d0c3 100644
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
 	$(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index 822514fe46..69b3ff1ba6 100644
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -28,7 +28,7 @@ libprintbackend_test_la_LDFLAGS =  \
 	-avoid-version -module $(no_undefined)
 
 libprintbackend_test_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 noinst_HEADERS =			\
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 18e45f40d0..9a35a17830 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -11,11 +11,11 @@ INCLUDES =				\
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)
 
 noinst_PROGRAMS	= 	\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8aaabf7e2d..318bbfef40 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,12 +12,12 @@ INCLUDES =				\
 	$(GDK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
-	$(GTK_DEP_LIBS)				\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)			\
 	-lm
 
 if USE_X11