[Xfce4-commits] [xfce/garcon] 02/02: Drop libgarcon-2

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/garcon.

commit 07b4dbe0768cca731c2c5a93bf5b7384b4dfeb90
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon May 1 08:16:47 2017 +0300

    Drop libgarcon-2
    
    libgarcon-1 doesn't have any changes that require a libgarcon-2,
    both versions of garcon-gtk[23] work just fine with libgarcon-1.
---
 .gitignore            |  3 +++
 configure.ac.in       |  1 -
 garcon/Makefile.am    | 35 ++---------------------------------
 garcon/garcon-2.pc.in | 13 -------------
 4 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5bd358e..b23f5e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,9 +51,11 @@ config.status
 config.sub
 configure
 configure.in
+ChangeLog
 depcomp
 garcon-1.pc
 garcon-config.h
+INSTALL
 POTFILES
 data/xfce/xfce-accessories.directory
 data/xfce/xfce-development.directory
@@ -74,6 +76,7 @@ garcon-gtk/garcon-gtk3-1.pc
 garcon/garcon-2.pc
 garcon/garcon-marshal.c
 garcon/garcon-marshal.h
+garcon/stamp-garcon-marshal.h
 gtk-doc.m4
 tests/test-display-menu
 tests/test-display-menu-gtk2
diff --git a/configure.ac.in b/configure.ac.in
index 9b963e4..2c8c7fb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -162,7 +162,6 @@ docs/reference/Makefile
 docs/reference/version.xml
 garcon/Makefile
 garcon/garcon-1.pc
-garcon/garcon-2.pc
 garcon/garcon-config.h
 garcon-gtk/Makefile
 garcon-gtk/garcon-gtk2-1.pc
diff --git a/garcon/Makefile.am b/garcon/Makefile.am
index d57e0ca..c9d7e7e 100644
--- a/garcon/Makefile.am
+++ b/garcon/Makefile.am
@@ -26,8 +26,7 @@ AM_CPPFLAGS = 								\
 	$(PLATFORM_CFLAGS)
 
 lib_LTLIBRARIES = 							\
-	libgarcon-1.la							\
-	libgarcon-2.la
+	libgarcon-1.la
 
 libgarcon_built_public_sources =					\
 	garcon-marshal.h
@@ -104,42 +103,12 @@ libgarcon_1_la_LIBADD = 						\
 	$(GOBJECT_LIBS)							\
 	$(GTHREAD_LIBS)
 
-libgarcon2_includedir = $(includedir)/garcon-2/garcon
-
-libgarcon2_include_HEADERS = $(libgarcon_headers)
-
-libgarcon_2_la_SOURCES =						\
-	$(libgarcon_sources)						\
-	$(libgarcon_headers)
-
-libgarcon_2_la_CFLAGS = 						\
-	$(GIO_CFLAGS)							\
-	$(GLIB_CFLAGS)							\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(GOBJECT_CFLAGS)						\
-	$(GTHREAD_CFLAGS)						\
-	$(PLATFORM_CFLAGS)
-
-libgarcon_2_la_LDFLAGS =						\
-	-no-undefined							\
-	-export-dynamic							\
-	-version-info $(GARCON_VERINFO)					\
-	-export-symbols-regex "^[^_].*"					\
-	$(PLATFORM_LDFLAGS)
-
-libgarcon_2_la_LIBADD = 						\
-	$(GIO_LIBS)							\
-	$(GLIB_LIBS)							\
-	$(LIBXFCE4UTIL_LIBS)						\
-	$(GOBJECT_LIBS)							\
-	$(GTHREAD_LIBS)
-
 EXTRA_DIST =								\
 	garcon-config.h.in						\
 	garcon-marshal.list
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = garcon-1.pc garcon-2.pc
+pkgconfig_DATA = garcon-1.pc
 
 DISTCLEANFILES =							\
 	stamp-garcon-marshal.h						\
diff --git a/garcon/garcon-2.pc.in b/garcon/garcon-2.pc.in
deleted file mode 100644
index 10e4356..0000000
--- a/garcon/garcon-2.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-garcon_api_version=@GARCON_VERSION_API@
-
-Name: @PACKAGE_TARNAME@
-Description: Freedesktop.org compliant menu library
-Requires: glib-2.0 gio-2.0 gthread-2.0 gobject-2.0
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lgarcon-${garcon_api_version}
-Cflags: -I${includedir}/garcon-${garcon_api_version}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.