diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libindicator/Makefile.am | 19 | ||||
| -rw-r--r-- | libindicator/indicator-0.4.pc.in.in (renamed from libindicator/indicator.pc.in) | 4 | ||||
| -rw-r--r-- | libindicator/indicator3-0.4.pc.in.in (renamed from libindicator/indicator3.pc.in) | 4 |
4 files changed, 21 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c35802e..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) @@ -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-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 d63f841..53c0058 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,12 +10,21 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator3.pc.in \ - indicator.pc.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 + +%.pc: %.pc.in + 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 \ @@ -51,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 "^[^_].*" @@ -66,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.pc.in b/libindicator/indicator-0.4.pc.in.in index 4e9b177..df4d6c8 100644 --- a/libindicator/indicator.pc.in +++ b/libindicator/indicator-0.4.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 b/libindicator/indicator3-0.4.pc.in.in index 9fa0eac..1f34567 100644 --- a/libindicator/indicator3.pc.in +++ b/libindicator/indicator3-0.4.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 |