diff options
| author | Ted Gould <ted@gould.cx> | 2011-07-07 00:32:12 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-07-07 00:32:12 -0500 |
| commit | 709208d42375adfe05102f9dbddd638a81776e16 (patch) | |
| tree | d8399537ea41dbddf2f816e51bb670867da833a0 /libindicator/Makefile.am | |
| parent | 9a18c1c095a420b16431b4f411d627786448a81a (diff) | |
| parent | c1034173faf54120c693c984123f343968621359 (diff) | |
| download | libayatana-indicator-709208d42375adfe05102f9dbddd638a81776e16.tar.gz libayatana-indicator-709208d42375adfe05102f9dbddd638a81776e16.tar.bz2 libayatana-indicator-709208d42375adfe05102f9dbddd638a81776e16.zip | |
* New upstream release.
* Build Fixes
* Adding license to test files (LP: #684886)
* Bump API/ABI versions appropriately and make easier to edit them in
the future
* Adding a name-hint to the indicator entries
* Merging scroll functions into a single good one (LP: #804618)
Diffstat (limited to 'libindicator/Makefile.am')
| -rw-r--r-- | libindicator/Makefile.am | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index d63f841..4433655 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,12 +10,23 @@ 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)|" \ + $< > $@ + +CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc 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 +62,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 +77,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 |