diff options
| author | Ted Gould <ted@gould.cx> | 2011-07-05 15:05:49 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-07-05 15:05:49 -0500 |
| commit | 746cf4ec825feda7b16ea32fad82d2901c9791d3 (patch) | |
| tree | 4a1263ff4f1e5b48bd8c0655ddffcb5fc8f8a1c3 | |
| parent | f3dc285322d67289770bdc38427a3b48895a335e (diff) | |
| download | libayatana-indicator-746cf4ec825feda7b16ea32fad82d2901c9791d3.tar.gz libayatana-indicator-746cf4ec825feda7b16ea32fad82d2901c9791d3.tar.bz2 libayatana-indicator-746cf4ec825feda7b16ea32fad82d2901c9791d3.zip | |
Making the API and ABI versions variables
| -rw-r--r-- | libindicator/Makefile.am | 12 | ||||
| -rw-r--r-- | libindicator/indicator.pc.in.in | 4 | ||||
| -rw-r--r-- | 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 |