Make gtk3 version parallel-installable

Fix pkg-config, library, gtk-doc and gir versioning.

7 files changed, 26 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 452a266..4f74b7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,13 +5,11 @@ ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libwnck-1.0.pc
+pkgconfig_DATA = libwnck-3.0.pc
 
 EXTRA_DIST = \
 	HACKING				\
-	MAINTAINERS			\
-	libwnck-1.0.pc.in		\
-	libwnck-1.0-uninstalled.pc.in
+	MAINTAINERS
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
diff --git a/configure.ac b/configure.ac
index b2d13b5..46362cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,8 +174,8 @@ Makefile
 doc/Makefile
 po/Makefile.in
 libwnck/Makefile
-libwnck-1.0.pc
-libwnck-1.0-uninstalled.pc
+libwnck-3.0.pc
+libwnck-3.0-uninstalled.pc
 ])
 
 dnl ---------------------------------------------------------------------------
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e49e298..ec7bde4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,6 +2,7 @@
 
 # The name of the module.
 DOC_MODULE=libwnck
+DOC_MODULE_VERSION=3.0
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=libwnck-docs.sgml
@@ -42,7 +43,7 @@ extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(LIBWNCK_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
-GTKDOC_LIBS = $(top_builddir)/libwnck/libwnck-1.la $(LIBWNCK_LIBS)
+GTKDOC_LIBS = $(top_builddir)/libwnck/libwnck-3.la $(LIBWNCK_LIBS)
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/doc/libwnck-docs.sgml b/doc/libwnck-docs.sgml
index bf40a8a..3c59f7b 100644
--- a/doc/libwnck-docs.sgml
+++ b/doc/libwnck-docs.sgml
@@ -110,5 +110,5 @@ that case.
       <title>Index of new symbols in 2.22</title>
     </index> 
   </part>
-
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
diff --git a/libwnck-1.0-uninstalled.pc.in b/libwnck-3.0-uninstalled.pc.in
index eab80df..2e78d54 100644
--- a/libwnck-1.0-uninstalled.pc.in
+++ b/libwnck-3.0-uninstalled.pc.in
@@ -6,8 +6,8 @@ includedir=@includedir@
 Name: libwnck
 Description: Window Navigator Construction Kit library
 Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gtk+-2.0
+Requires: glib-2.0 gobject-2.0 gtk+-2.3
 Requires.private: @X11_PACKAGE@ pango cairo @STARTUP_NOTIFICATION_PACKAGE@ @XRES_PACKAGE@
-Libs: ${pc_top_builddir}/${pcfiledir}/libwnck/libwnck-1.la
+Libs: ${pc_top_builddir}/${pcfiledir}/libwnck/libwnck-3.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}
 
diff --git a/libwnck-1.0.pc.in b/libwnck-3.0.pc.in
index e5f110f..f7820e1 100644
--- a/libwnck-1.0.pc.in
+++ b/libwnck-3.0.pc.in
@@ -6,8 +6,8 @@ includedir=@includedir@
 Name: libwnck
 Description: Window Navigator Construction Kit library
 Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gtk+-2.0
+Requires: glib-2.0 gobject-2.0 gtk+-3.0
 Requires.private: @X11_PACKAGE@ pango cairo @STARTUP_NOTIFICATION_PACKAGE@ @XRES_PACKAGE@
-Libs: -L${libdir} -lwnck-1
-Cflags: -I${includedir}/libwnck-1.0
+Libs: -L${libdir} -lwnck-3
+Cflags: -I${includedir}/libwnck-3.0
 
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
index 3db97dd..daa17d9 100644
--- a/libwnck/Makefile.am
+++ b/libwnck/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libwnck-1.la
+lib_LTLIBRARIES = libwnck-3.la
 bin_PROGRAMS =			\
 	wnckprop		\
 	wnck-urgency-monitor
@@ -32,7 +32,7 @@ wnck_headers =			\
 
 wnck_built_installed_headers = wnck-enum-types.h
 
-libwnckincludedir = $(includedir)/libwnck-1.0/libwnck
+libwnckincludedir = $(includedir)/libwnck-3.0/libwnck
 libwnckinclude_HEADERS =		\
 	$(wnck_headers)			\
 	$(wnck_built_installed_headers)
@@ -63,7 +63,7 @@ wnck_accessibility_files =			\
 wnck_built_headers = $(wnck_built_installed_headers) wnck-marshal.h inlinepixbufs.h
 wnck_built_cfiles = wnck-enum-types.c wnck-marshal.c
 
-libwnck_1_la_SOURCES = 		\
+libwnck_3_la_SOURCES = 		\
 	$(wnck_built_headers)	\
 	$(wnck_built_cfiles)	\
 	$(wnck_sources)		\
@@ -72,19 +72,19 @@ libwnck_1_la_SOURCES = 		\
 	xutils.h		\
 	$(wnck_accessibility_files)
 
-$(libwnck_1_la_OBJECTS): $(wnck_built_headers)
+$(libwnck_3_la_OBJECTS): $(wnck_built_headers)
 
-libwnck_1_la_CPPFLAGS =			\
+libwnck_3_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
 	$(XLIB_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"Wnck\"		\
 	-DSN_API_NOT_YET_FROZEN=1
 
-libwnck_1_la_LIBADD =	\
+libwnck_3_la_LIBADD =	\
 	$(LIBWNCK_LIBS)	\
 	$(XLIB_LIBS)
 
-libwnck_1_la_LDFLAGS =								\
+libwnck_3_la_LDFLAGS =								\
 	-version-info $(LIBWNCK_CURRENT):$(LIBWNCK_REVISION):$(LIBWNCK_AGE)	\
 	-no-undefined								\
 	-export-symbols-regex "^[^_].*"
@@ -164,13 +164,13 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 if HAVE_INTROSPECTION
 introspection_sources = $(wnck_sources) $(libwnckinclude_HEADERS)
 
-Wnck-1.0.gir: libwnck-1.la
-Wnck_1_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0 Gtk-2.0
-Wnck_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Wnck_1_0_gir_LIBS = libwnck-1.la
-Wnck_1_0_gir_SCANNERFLAGS = --pkg-export=libwnck-1.0
-Wnck_1_0_gir_FILES = $(introspection_sources)
-INTROSPECTION_GIRS += Wnck-1.0.gir
+Wnck-3.0.gir: libwnck-3.la
+Wnck_3_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0 Gtk-3.0
+Wnck_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Wnck_3_0_gir_LIBS = libwnck-3.la
+Wnck_3_0_gir_SCANNERFLAGS = --pkg-export=libwnck-3.0
+Wnck_3_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += Wnck-3.0.gir
 
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)