[gdl] Build against gtk-3.0 and change names accordingly

[Johannes Schmid <jhs src gnome org>]

commit 70ee318276f56107f3c058cf0e058d891b03d612
Author: Johannes Schmid <jhs gnome org>
Date:   Sun Jun 27 20:24:10 2010 +0200

    Build against gtk-3.0 and change names accordingly

 autogen.sh      |    2 +-
 configure.in    |   16 ++++++++--------
 gdl-1.0.pc.in   |   13 -------------
 gdl-3.0.pc.in   |   12 ++++++++++++
 gdl/Makefile.am |   18 +++++++++---------
 5 files changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index eda4f48..fc7102d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.11 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index 415cac3..92eced1 100644
--- a/configure.in
+++ b/configure.in
@@ -11,11 +11,11 @@ AC_INIT(gdl)
 AM_CONFIG_HEADER(config.h)
 
 GDL_MAJOR_VERSION=2
-GDL_MINOR_VERSION=31
-GDL_MICRO_VERSION=2
+GDL_MINOR_VERSION=90
+GDL_MICRO_VERSION=0
 
 dnl increment if the interface has additions, changes, removals.
-GDL_CURRENT=3
+GDL_CURRENT=4
 
 dnl increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -46,10 +46,10 @@ AC_SUBST(GDL_MINOR_VERSION)
 AC_SUBST(GDL_MICRO_VERSION)
 AC_SUBST(GDL_VERSION)
 
-SNAPSHOT=0_`date +%Y%m%d_%H%M%S`_cvs
+SNAPSHOT=0_`date +%Y%m%d_%H%M%S`_git
 AC_SUBST(SNAPSHOT)
 
-GTK_REQUIRED=2.20.0
+GTK_REQUIRED=2.90.4
 XML_REQUIRED=2.2.8
 
 AC_SUBST(GTK_REQUIRED)
@@ -82,7 +82,7 @@ AC_SUBST(XML_CFLAGS)
 AC_SUBST(XML_LIBS)
 
 PKG_CHECK_MODULES(GDL_DEPENDENCIES, 
-	gtk+-2.0 >= $GTK_REQUIRED)
+	gtk+-3.0 >= $GTK_REQUIRED)
 AC_SUBST(GDL_DEPENDENCIES_CFLAGS)
 AC_SUBST(GDL_DEPENDENCIES_LIBS)
 
@@ -119,7 +119,7 @@ GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
 AC_SUBST(GLIB_MKENUMS)
 
 ALL_LINGUAS=""
-GETTEXT_PACKAGE=gdl-1
+GETTEXT_PACKAGE=gdl-3
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
 IT_PROG_INTLTOOL([0.35.0])
@@ -150,5 +150,5 @@ po/Makefile.in
 docs/Makefile
 docs/reference/Makefile
 gdl.spec
-gdl-1.0.pc
+gdl-3.0.pc
 ])
diff --git a/gdl-3.0.pc.in b/gdl-3.0.pc.in
new file mode 100644
index 0000000..0c4c703
--- /dev/null
+++ b/gdl-3.0.pc.in
@@ -0,0 +1,12 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@/libgdl-3.0
+datarootdir= datarootdir@
+
+Name: gdl
+Description: Gnome Docking Library
+Version: @VERSION@
+Requires: gtk+-3.0 libxml-2.0
+Libs: -L${libdir} -lgdl-3
+Cflags: -I${includedir}
diff --git a/gdl/Makefile.am b/gdl/Makefile.am
index b0ed68b..c54cff7 100644
--- a/gdl/Makefile.am
+++ b/gdl/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS) 	\
 	$(EXTRA_CPPFLAGS)
 
-lib_LTLIBRARIES = libgdl-1.la
+lib_LTLIBRARIES = libgdl-3.la
 
 BUILT_SOURCES = \
 	libgdlmarshal.c \
@@ -31,7 +31,7 @@ libgdl_headers = \
 	gdl-dock-bar.h \
 	gdl-dock-placeholder.h
 	
-libgdl_1_la_SOURCES = \
+libgdl_3_la_SOURCES = \
 	$(libgdl_headers) \
 	gdl-i18n.h \
 	gdl-i18n.c \
@@ -59,19 +59,19 @@ libgdl_1_la_SOURCES = \
 	libgdlmarshal.h \
 	libgdlmarshal.c
 
-libgdl_1_la_LIBADD = \
+libgdl_3_la_LIBADD = \
 	$(GDL_DEPENDENCIES_LIBS) \
 	$(XML_LIBS)
 
-libgdl_1_la_LDFLAGS = $(EXTRA_LDFLAGS) \
+libgdl_3_la_LDFLAGS = $(EXTRA_LDFLAGS) \
 		      -version-info $(GDL_CURRENT):$(GDL_REVISION):$(GDL_AGE)
 
 noinst_PROGRAMS=test-dock
 
 test_dock_sources=test-dock.c
-test_dock_LDADD=libgdl-1.la $(XML_LIBS)
+test_dock_LDADD=libgdl-3.la $(XML_LIBS)
 
-libgdlincludedir = $(includedir)/libgdl-1.0/gdl
+libgdlincludedir = $(includedir)/libgdl-3.0/gdl
 libgdlinclude_HEADERS = \
 	$(libgdl_headers) \
 	libgdltypebuiltins.h
@@ -138,10 +138,10 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
-introspection_sources = $(libgdl_1_la_SOURCES)
+introspection_sources = $(libgdl_3_la_SOURCES)
 
-Gdl- GDL_CURRENT@.gir: libgdl-1.la
-Gdl_ GDL_CURRENT@_gir_INCLUDES = GObject-2.0 Gtk-2.0
+Gdl- GDL_CURRENT@.gir: libgdl-3.la
+Gdl_ GDL_CURRENT@_gir_INCLUDES = GObject-2.0 Gtk-3.0
 Gdl_ GDL_CURRENT@_gir_CFLAGS = $(INCLUDES)
 Gdl_ GDL_CURRENT@_gir_LIBS = libgdl-1.la
 Gdl_ GDL_CURRENT@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))