From f3dc285322d67289770bdc38427a3b48895a335e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 14:58:15 -0500 Subject: Adding another level of .in for the pc files. --- configure.ac | 4 ++-- libindicator/Makefile.am | 7 +++++-- libindicator/indicator.pc.in | 17 ----------------- libindicator/indicator.pc.in.in | 17 +++++++++++++++++ libindicator/indicator3.pc.in | 17 ----------------- libindicator/indicator3.pc.in.in | 17 +++++++++++++++++ 6 files changed, 41 insertions(+), 38 deletions(-) delete mode 100644 libindicator/indicator.pc.in create mode 100644 libindicator/indicator.pc.in.in delete mode 100644 libindicator/indicator3.pc.in create mode 100644 libindicator/indicator3.pc.in.in diff --git a/configure.ac b/configure.ac index c35802e..535807b 100644 --- a/configure.ac +++ b/configure.ac @@ -125,8 +125,8 @@ AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") AC_CONFIG_FILES([ Makefile libindicator/Makefile -libindicator/indicator.pc -libindicator/indicator3.pc +libindicator/indicator.pc.in +libindicator/indicator3.pc.in tests/Makefile tools/Makefile ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index d63f841..bb60d5c 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,8 +10,11 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator3.pc.in \ - indicator.pc.in + indicator3.pc.in.in \ + indicator.pc.in.in + +%.pc: %.pc.in + cp $< $@ include $(top_srcdir)/Makefile.am.marshal diff --git a/libindicator/indicator.pc.in b/libindicator/indicator.pc.in deleted file mode 100644 index 4e9b177..0000000 --- a/libindicator/indicator.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators/5/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.3 -Requires: gtk+-2.0 -Libs: -lindicator - -Name: libindicator -Description: libindicator. -Version: @VERSION@ - diff --git a/libindicator/indicator.pc.in.in b/libindicator/indicator.pc.in.in new file mode 100644 index 0000000..4e9b177 --- /dev/null +++ b/libindicator/indicator.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators/5/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.3 +Requires: gtk+-2.0 +Libs: -lindicator + +Name: libindicator +Description: libindicator. +Version: @VERSION@ + diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in deleted file mode 100644 index 9fa0eac..0000000 --- a/libindicator/indicator3.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators3/2/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.3 -Requires: gtk+-3.0 -Libs: -lindicator3 - -Name: libindicator3 -Description: libindicator3. -Version: @VERSION@ - diff --git a/libindicator/indicator3.pc.in.in b/libindicator/indicator3.pc.in.in new file mode 100644 index 0000000..9fa0eac --- /dev/null +++ b/libindicator/indicator3.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators3/2/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.3 +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator3. +Version: @VERSION@ + -- cgit v1.2.3 From 746cf4ec825feda7b16ea32fad82d2901c9791d3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 15:05:49 -0500 Subject: Making the API and ABI versions variables --- libindicator/Makefile.am | 12 +++++++++--- libindicator/indicator.pc.in.in | 4 ++-- libindicator/indicator3.pc.in.in | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index bb60d5c..1646023 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -13,12 +13,18 @@ EXTRA_DIST = \ indicator3.pc.in.in \ indicator.pc.in.in +INDICATOR_ABI_VERSION = 6 +INDICATOR_API_VERSION = 4 + %.pc: %.pc.in - cp $< $@ + sed \ + -e "s|\@indicator_api_version\@|$(INDICATOR_API_VERSION)|" \ + -e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \ + $< > $@ include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator +libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator indicator_headers = \ indicator.h \ @@ -54,7 +60,7 @@ libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) libindicator_la_LDFLAGS = \ - -version-info 3:0:0 \ + -version-info $(INDICATOR_ABI_VERSION):0:0 \ -no-undefined \ -export-symbols-regex "^[^_].*" diff --git a/libindicator/indicator.pc.in.in b/libindicator/indicator.pc.in.in index 4e9b177..df4d6c8 100644 --- a/libindicator/indicator.pc.in.in +++ b/libindicator/indicator.pc.in.in @@ -4,10 +4,10 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -indicatordir=${libdir}/indicators/5/ +indicatordir=${libdir}/indicators/@indicator_abi_version@ iconsdir=@datarootdir@/@PACKAGE@/icons/ -Cflags: -I${includedir}/libindicator-0.3 +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ Requires: gtk+-2.0 Libs: -lindicator diff --git a/libindicator/indicator3.pc.in.in b/libindicator/indicator3.pc.in.in index 9fa0eac..1f34567 100644 --- a/libindicator/indicator3.pc.in.in +++ b/libindicator/indicator3.pc.in.in @@ -4,10 +4,10 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -indicatordir=${libdir}/indicators3/2/ +indicatordir=${libdir}/indicators3/@indicator_abi_version@/ iconsdir=@datarootdir@/@PACKAGE@/icons/ -Cflags: -I${includedir}/libindicator-0.3 +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ Requires: gtk+-3.0 Libs: -lindicator3 -- cgit v1.2.3 From f5575b53091bee7985efb3c88bcc1d6fe34edefa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 22:27:48 -0500 Subject: Changing the pkgconfig file version to include the API version --- configure.ac | 4 ++-- libindicator/Makefile.am | 6 +++--- libindicator/indicator-0.4.pc.in.in | 17 +++++++++++++++++ libindicator/indicator.pc.in.in | 17 ----------------- libindicator/indicator3-0.4.pc.in.in | 17 +++++++++++++++++ libindicator/indicator3.pc.in.in | 17 ----------------- 6 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 libindicator/indicator-0.4.pc.in.in delete mode 100644 libindicator/indicator.pc.in.in create mode 100644 libindicator/indicator3-0.4.pc.in.in delete mode 100644 libindicator/indicator3.pc.in.in diff --git a/configure.ac b/configure.ac index 535807b..7d17d0b 100644 --- a/configure.ac +++ b/configure.ac @@ -125,8 +125,8 @@ AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") AC_CONFIG_FILES([ Makefile libindicator/Makefile -libindicator/indicator.pc.in -libindicator/indicator3.pc.in +libindicator/indicator-0.4.pc.in +libindicator/indicator3-0.4.pc.in tests/Makefile tools/Makefile ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 1646023..53c0058 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,8 +10,8 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator3.pc.in.in \ - indicator.pc.in.in + indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \ + indicator-0.$(INDICATOR_API_VERSION).pc.in.in INDICATOR_ABI_VERSION = 6 INDICATOR_API_VERSION = 4 @@ -75,7 +75,7 @@ libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS) libindicator3_la_LIBADD = $(libindicator_la_LIBADD) libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS) -pkgconfig_DATA = indicator$(VER).pc +pkgconfig_DATA = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc pkgconfigdir = $(libdir)/pkgconfig glib_marshal_list = indicator-object-marshal.list diff --git a/libindicator/indicator-0.4.pc.in.in b/libindicator/indicator-0.4.pc.in.in new file mode 100644 index 0000000..df4d6c8 --- /dev/null +++ b/libindicator/indicator-0.4.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators/@indicator_abi_version@ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ +Requires: gtk+-2.0 +Libs: -lindicator + +Name: libindicator +Description: libindicator. +Version: @VERSION@ + diff --git a/libindicator/indicator.pc.in.in b/libindicator/indicator.pc.in.in deleted file mode 100644 index df4d6c8..0000000 --- a/libindicator/indicator.pc.in.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators/@indicator_abi_version@ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ -Requires: gtk+-2.0 -Libs: -lindicator - -Name: libindicator -Description: libindicator. -Version: @VERSION@ - diff --git a/libindicator/indicator3-0.4.pc.in.in b/libindicator/indicator3-0.4.pc.in.in new file mode 100644 index 0000000..1f34567 --- /dev/null +++ b/libindicator/indicator3-0.4.pc.in.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators3/@indicator_abi_version@/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator3. +Version: @VERSION@ + diff --git a/libindicator/indicator3.pc.in.in b/libindicator/indicator3.pc.in.in deleted file mode 100644 index 1f34567..0000000 --- a/libindicator/indicator3.pc.in.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -indicatordir=${libdir}/indicators3/@indicator_abi_version@/ -iconsdir=@datarootdir@/@PACKAGE@/icons/ - -Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ -Requires: gtk+-3.0 -Libs: -lindicator3 - -Name: libindicator3 -Description: libindicator3. -Version: @VERSION@ - -- cgit v1.2.3 From 173c8a74b0a8191c9b70cf8c7486032710f8bf74 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 5 Jul 2011 22:29:32 -0500 Subject: Setting default GTK version to 3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7d17d0b..c951db5 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=2@:>@])], [], - [with_gtk=2]) + [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) -- cgit v1.2.3