[gtk-mac-integration] Add a suffix to distinguish GTK3 vs GTK2 version

[John Ralls <jralls src gnome org>]

commit cb6d65f9bf260f7b10af4cc01638f3a05a977071
Author: Daniel Sabo <DanielSabo gmail com>
Date:   Wed Nov 6 19:39:10 2013 -0800

    Add a suffix to distinguish GTK3 vs GTK2 version

 bindings/python/gtkmacintegration/Makefile.am  |    2 +-
 bindings/python/gtkosx_application/Makefile.am |    2 +-
 configure.ac                                   |   18 +++++++++++++++++-
 data/.gitignore                                |    2 +-
 data/Makefile.am                               |    2 +-
 data/gtk-mac-integration.pc.in                 |    4 ++--
 docs/reference/Makefile.am                     |    2 +-
 src/Makefile.am                                |   20 ++++++++++----------
 8 files changed, 34 insertions(+), 18 deletions(-)
---
diff --git a/bindings/python/gtkmacintegration/Makefile.am b/bindings/python/gtkmacintegration/Makefile.am
index 32e9491..3f8562e 100644
--- a/bindings/python/gtkmacintegration/Makefile.am
+++ b/bindings/python/gtkmacintegration/Makefile.am
@@ -22,7 +22,7 @@ _gtkmacintegration_la_LDFLAGS = -module -avoid-version -export-symbols-regex ini
 _gtkmacintegration_la_LIBADD =                         \
        $(MAC_LIBS)                                     \
        $(PYGTK_LIBS)                                   \
-       $(top_builddir)/src/libgtkmacintegration.la
+       $(top_builddir)/src/libgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@.la
 _gtkmacintegration_la_SOURCES =                                \
        gtkmacintegration.c                             \
        gtkmacintegration-module.c
diff --git a/bindings/python/gtkosx_application/Makefile.am b/bindings/python/gtkosx_application/Makefile.am
index efeac9c..2671428 100644
--- a/bindings/python/gtkosx_application/Makefile.am
+++ b/bindings/python/gtkosx_application/Makefile.am
@@ -19,7 +19,7 @@ _gtkosx_application_la_LDFLAGS = -module -avoid-version -export-symbols-regex in
 _gtkosx_application_la_LIBADD =                                \
        $(MAC_LIBS)                                     \
        $(PYGTK_LIBS)                                   \
-       $(top_builddir)/src/libgtkmacintegration.la
+       $(top_builddir)/src/libgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@.la
 _gtkosx_application_la_SOURCES =                               \
        gtkosx_application.c                            \
        gtkosx_application-module.c
diff --git a/configure.ac b/configure.ac
index d1a91b5..9c3cd15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,17 @@ AC_SUBST(GTK_VERSION)
 AC_MSG_RESULT("$GTK_VERSION")
 AM_CONDITIONAL([INTROSPECTION], [test x$GTK_MAJOR = "xgtk+-3.0"])
 
+
+AC_MSG_RESULT("$GTK_MAJOR")
+
+if [test "x$GTK_MAJOR" = xgtk+-3.0]; then
+  GTK_MAC_INTEGRATION_LIB_SUFFIX=gtk3
+else
+  GTK_MAC_INTEGRATION_LIB_SUFFIX=gtk2
+fi
+
+AC_SUBST(GTK_MAC_INTEGRATION_LIB_SUFFIX)
+
 GTK_PYTHON_CHECK
 
 GOBJECT_INTROSPECTION_CHECK([0.10.1])
@@ -94,12 +105,17 @@ AC_CONFIG_FILES(
        bindings/python/gtkmacintegration/Makefile
        bindings/python/gtkosx_application/Makefile
         data/Makefile
-        data/gtk-mac-integration.pc
        docs/Makefile
        docs/reference/Makefile
        strings/Makefile
 )
 
+if [test "x$GTK_MAJOR" = xgtk+-3.0]; then
+  AC_CONFIG_FILES(data/gtk-mac-integration-gtk3.pc:data/gtk-mac-integration.pc.in)
+else
+  AC_CONFIG_FILES(data/gtk-mac-integration-gtk2.pc:data/gtk-mac-integration.pc.in)
+fi
+
 AC_OUTPUT
 
 echo
diff --git a/data/.gitignore b/data/.gitignore
index 92248ca..4102008 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1 +1 @@
-ige-mac-integration.pc
+gtk-mac-integration-*.pc
diff --git a/data/Makefile.am b/data/Makefile.am
index 3d0b2b2..d6aede5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = gtk-mac-integration.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gtk-mac-integration.pc
+pkgconfig_DATA = gtk-mac-integration-$(GTK_MAC_INTEGRATION_LIB_SUFFIX).pc
diff --git a/data/gtk-mac-integration.pc.in b/data/gtk-mac-integration.pc.in
index b02b32c..9ff1d1c 100644
--- a/data/gtk-mac-integration.pc.in
+++ b/data/gtk-mac-integration.pc.in
@@ -7,5 +7,5 @@ Name: gtk-mac-integration
 Description: Mac menu bar and dock integration for GTK+
 Requires: @GTK_MAJOR@
 Version: @VERSION@
-Libs: -L${libdir} -lgtkmacintegration
-Cflags: -I${includedir}/gtkmacintegration -DMAC_INTEGRATION
+Libs: -L${libdir} -lgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@
+Cflags: -I${includedir}/gtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@ -DMAC_INTEGRATION
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 53e4092..2877c4a 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -89,7 +89,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS = $(GLIB_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/src/libgtkmacintegration.la -lgobject-2.0
+GTKDOC_LIBS = $(top_builddir)/src/libgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@.la -lgobject-2.0
 DYLD_LOAD_PATH=$(top_builddir)/src/.libs
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e1120b..e4c7c15 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(WARN_CFLAGS)
 
 -include $(INTROSPECTION_MAKEFILE)
 
-lib_LTLIBRARIES = libgtkmacintegration.la
+lib_LTLIBRARIES = libgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@.la
 
-libgtkmacintegration_la_SOURCES =                      \
+libgtkmacintegration_ GTK_MAC_INTEGRATION_LIB_SUFFIX@_la_SOURCES =                     \
        GtkApplicationDelegate.h                        \
        GtkApplicationDelegate.c                        \
        GtkApplicationNotify.h                          \
@@ -34,12 +34,12 @@ libgtkmacintegration_la_SOURCES =                   \
        gtk-mac-private.h                               \
        $(integration_HEADERS)
 
-libgtkmacintegration_la_CFLAGS = $(MAC_CFLAGS) -xobjective-c
-libgtkmacintegration_la_OBJCFLAGS = $(MAC_CFLAGS)
-libgtkmacintegration_la_LIBADD =  $(MAC_LIBS) -lobjc
-libgtkmacintegration_la_LDFLAGS = -framework Carbon -framework ApplicationServices -version-info 
$(GTK_MAC_INTEGRATION_LT_VERSION)
+libgtkmacintegration_ GTK_MAC_INTEGRATION_LIB_SUFFIX@_la_CFLAGS = $(MAC_CFLAGS) -xobjective-c
+libgtkmacintegration_ GTK_MAC_INTEGRATION_LIB_SUFFIX@_la_OBJCFLAGS = $(MAC_CFLAGS)
+libgtkmacintegration_ GTK_MAC_INTEGRATION_LIB_SUFFIX@_la_LIBADD =  $(MAC_LIBS) -lobjc
+libgtkmacintegration_ GTK_MAC_INTEGRATION_LIB_SUFFIX@_la_LDFLAGS = -framework Carbon -framework 
ApplicationServices -version-info $(GTK_MAC_INTEGRATION_LT_VERSION)
 
-integration_includedir = $(includedir)/gtkmacintegration
+integration_includedir = $(includedir)/gtkmacintegration-$(GTK_MAC_INTEGRATION_LIB_SUFFIX)
 integration_include_HEADERS =                          \
        gtk-mac-integration.h                           \
        gtkosxapplication.h                             \
@@ -51,7 +51,7 @@ integration_include_HEADERS =                         \
 noinst_PROGRAMS = test-integration
 test_integration_SOURCES = test-integration.c
 test_integration_CFLAGS = $(MAC_CFLAGS)
-test_integration_LDADD =  $(MAC_LIBS) libgtkmacintegration.la
+test_integration_LDADD =  $(MAC_LIBS) libgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@.la
 
 EXTRA_DIST = testui.xml
 
@@ -60,7 +60,7 @@ if INTROSPECTION
 test_integration_CFLAGS += -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_2
 
 if HAVE_INTROSPECTION
-GtkosxApplication-1.0.gir: $(INTROSPECTION_SCANNER) libgtkmacintegration.la
+GtkosxApplication-1.0.gir: $(INTROSPECTION_SCANNER) libgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@.la
 GtkosxApplication_1_0_gir_SCANNERFLAGS = \
        --identifier-prefix=Gtkosx \
        --warn-all
@@ -69,7 +69,7 @@ GtkosxApplication_1_0_gir_INCLUDES = Atk-1.0 GLib-2.0 Gtk-3.0
 
 GtkosxApplication_1_0_gir_CFLAGS = \
                $(AM_CPPFLAGS)
-GtkosxApplication_1_0_gir_LIBS = libgtkmacintegration.la
+GtkosxApplication_1_0_gir_LIBS = libgtkmacintegration- GTK_MAC_INTEGRATION_LIB_SUFFIX@.la
 GtkosxApplication_1_0_gir_FILES = \
        gtkosxapplication.h \
        gtkosxapplication.c