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. --- libindicator/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libindicator/Makefile.am') 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 -- 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 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'libindicator/Makefile.am') 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 "^[^_].*" -- 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 --- libindicator/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libindicator/Makefile.am') 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 -- cgit v1.2.3 From cce6c17c1fd178a53fc9a79b57e0daef41d6aa4b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Jul 2011 16:35:49 -0500 Subject: Cleaning up the built pc file --- libindicator/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libindicator/Makefile.am') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 53c0058..4433655 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -22,6 +22,8 @@ INDICATOR_API_VERSION = 4 -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.$(INDICATOR_API_VERSION)/libindicator -- cgit v1.2.3