From b0ee9dfa429053ac5314c1d94042657ba1b6c9fc Mon Sep 17 00:00:00 2001
From: Olivier Duchateau <duchateau.olivier@gmail.com>
Date: Sun, 11 Jun 2017 14:36:42 +0200
Subject: [PATCH] garcon-gtk2-1.pc should be optional.

---
 garcon-gtk/Makefile.am | 73 ++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/garcon-gtk/Makefile.am b/garcon-gtk/Makefile.am
index 5f9b4d0..3590266 100644
--- a/garcon-gtk/Makefile.am
+++ b/garcon-gtk/Makefile.am
@@ -35,99 +35,102 @@ libgarcon_gtk_headers = \
 libgarcon_gtk_sources = \
 	garcon-gtk-menu.c
 
-##
-## GTK+ 2 support library
-##
-if ENABLE_GTK2_LIBRARY
 
-lib_LTLIBRARIES += libgarcon-gtk2-1.la
-
-libgarcon_gtk2includedir = \
-	$(includedir)/garcon-gtk2-1/garcon-gtk
+libgarcon_gtk3includedir = \
+	$(includedir)/garcon-gtk3-1/garcon-gtk
 
-libgarcon_gtk2include_HEADERS = \
+libgarcon_gtk3include_HEADERS = \
 	$(libgarcon_gtk_headers)
 
-libgarcon_gtk2_1_la_SOURCES = \
+libgarcon_gtk3_1_la_SOURCES = \
 	$(libgarcon_gtk_sources) \
 	$(libgarcon_gtk_headers)
 
-libgarcon_gtk2_1_la_CFLAGS = \
+libgarcon_gtk3_1_la_CFLAGS = \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GTK2_CFLAGS) \
+	$(GTK3_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
-	$(LIBXFCE4UI_CFLAGS) \
+	$(LIBXFCE4UI2_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-libgarcon_gtk2_1_la_LDFLAGS = \
+libgarcon_gtk3_1_la_LDFLAGS = \
 	-no-undefined \
 	-export-dynamic \
 	-version-info $(GARCON_VERINFO) \
 	-export-symbols-regex "^[^_].*" \
 	$(PLATFORM_LDFLAGS)
-	
-libgarcon_gtk2_1_la_LIBADD = \
+
+libgarcon_gtk3_1_la_LIBADD = \
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
-	$(GTK2_LIBS) \
+	$(GTK3_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
-	$(LIBXFCE4UI_LIBS)
+	$(LIBXFCE4UI2_LIBS)
 
-libgarcon_gtk2_1_la_DEPENDENCIES = \
+libgarcon_gtk3_1_la_DEPENDENCIES = \
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
-endif
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = garcon-gtk3-1.pc
 
-libgarcon_gtk3includedir = \
-	$(includedir)/garcon-gtk3-1/garcon-gtk
+##
+## GTK+ 2 support library
+##
+if ENABLE_GTK2_LIBRARY
 
-libgarcon_gtk3include_HEADERS = \
+lib_LTLIBRARIES += libgarcon-gtk2-1.la
+
+libgarcon_gtk2includedir = \
+	$(includedir)/garcon-gtk2-1/garcon-gtk
+
+libgarcon_gtk2include_HEADERS = \
 	$(libgarcon_gtk_headers)
 
-libgarcon_gtk3_1_la_SOURCES = \
+libgarcon_gtk2_1_la_SOURCES = \
 	$(libgarcon_gtk_sources) \
 	$(libgarcon_gtk_headers)
 
-libgarcon_gtk3_1_la_CFLAGS = \
+libgarcon_gtk2_1_la_CFLAGS = \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GTK3_CFLAGS) \
+	$(GTK2_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
-	$(LIBXFCE4UI2_CFLAGS) \
+	$(LIBXFCE4UI_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-libgarcon_gtk3_1_la_LDFLAGS = \
+libgarcon_gtk2_1_la_LDFLAGS = \
 	-no-undefined \
 	-export-dynamic \
 	-version-info $(GARCON_VERINFO) \
 	-export-symbols-regex "^[^_].*" \
 	$(PLATFORM_LDFLAGS)
-
-libgarcon_gtk3_1_la_LIBADD = \
+	
+libgarcon_gtk2_1_la_LIBADD = \
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
-	$(GTK3_LIBS) \
+	$(GTK2_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
-	$(LIBXFCE4UI2_LIBS)
+	$(LIBXFCE4UI_LIBS)
 
-libgarcon_gtk3_1_la_DEPENDENCIES = \
+libgarcon_gtk2_1_la_DEPENDENCIES = \
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
+pkgconfig_DATA += garcon-gtk2-1.pc
+
+endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = garcon-gtk2-1.pc garcon-gtk3-1.pc
 
 # Required for gtk-doc and make distcheck
 dist-hook: all
-- 
2.9.4