From 322884dde9c0131373989c1fc39d92a4ce7e87f9 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Sat, 19 Jun 2010 08:47:50 -0400 Subject: first pass at providing a gtk3 version --- libindicator/Makefile.am | 19 ++++++++++++++++--- libindicator/indicator3.pc.in | 17 +++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 libindicator/indicator3.pc.in (limited to 'libindicator') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 983a6a5..e6f7390 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -2,11 +2,13 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator.pc.in + indicator.pc.in \ + indicator3.pc.in include $(top_srcdir)/Makefile.am.marshal libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator +libindicator3includedir=$(includedir)/libindicator-3.3/libindicator indicator_headers = \ indicator.h \ @@ -16,11 +18,15 @@ indicator_headers = \ indicator-service.h \ indicator-service-manager.h + libindicatorinclude_HEADERS = \ $(indicator_headers) +libindicator3include_HEADERS = \ + $(indicator3_headers) lib_LTLIBRARIES = \ - libindicator.la + libindicator.la \ + libindicator3.la libindicator_la_SOURCES = \ $(indicator_headers) \ @@ -33,16 +39,23 @@ libindicator_la_SOURCES = \ indicator-object-marshal.c \ indicator-service.c \ indicator-service-manager.c +libindicator3_la_SOURCES = $(libindicator_la_SOURCES) libindicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ -DG_LOG_DOMAIN=\"libindicator\" \ -Wall -Werror +libindicator3_la_CFLAGS = \ + $(LIBINDICATOR3_CFLAGS) \ + -DG_LOG_DOMAIN=\"libindicator\" \ + -Wall -Werror libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) +libindicator3_la_LIBADD = \ + $(LIBINDICATOR3_LIBS) -pkgconfig_DATA = indicator.pc +pkgconfig_DATA = indicator.pc indicator3.pc pkgconfigdir = $(libdir)/pkgconfig glib_marshal_list = indicator-object-marshal.list diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in new file mode 100644 index 0000000..47b3461 --- /dev/null +++ b/libindicator/indicator3.pc.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +indicatordir=${libdir}/indicators/3/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator-3.3 +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator. +Version: @VERSION@ + -- cgit v1.2.3 From 923a1d5b25bbc33513984d413acdad9a5d446ab9 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Sat, 19 Jun 2010 09:32:03 -0400 Subject: don't use 3.3 version, rather use indicator3 --- libindicator/Makefile.am | 4 ++-- libindicator/indicator3.pc.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libindicator') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index e6f7390..172e2b2 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = \ include $(top_srcdir)/Makefile.am.marshal libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator -libindicator3includedir=$(includedir)/libindicator-3.3/libindicator +libindicator3includedir=$(includedir)/libindicator3-0.3/libindicator indicator_headers = \ indicator.h \ @@ -22,7 +22,7 @@ indicator_headers = \ libindicatorinclude_HEADERS = \ $(indicator_headers) libindicator3include_HEADERS = \ - $(indicator3_headers) + $(indicator_headers) lib_LTLIBRARIES = \ libindicator.la \ diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in index 47b3461..ba7098c 100644 --- a/libindicator/indicator3.pc.in +++ b/libindicator/indicator3.pc.in @@ -7,11 +7,11 @@ includedir=@includedir@ indicatordir=${libdir}/indicators/3/ iconsdir=@datarootdir@/@PACKAGE@/icons/ -Cflags: -I${includedir}/libindicator-3.3 +Cflags: -I${includedir}/libindicator3-0.3 Requires: gtk+-3.0 Libs: -lindicator3 Name: libindicator3 -Description: libindicator. +Description: libindicator3. Version: @VERSION@ -- cgit v1.2.3 From ecc6acd2a576fcc11d51ded532f570fb29ab475e Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 6 Oct 2010 10:58:49 -0400 Subject: instead of always building gtk2 and gtk3, add a --with-gtk= flag to configure to specify which to build with --- libindicator/Makefile.am | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'libindicator') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 172e2b2..4932f07 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -1,14 +1,20 @@ +if USE_GTK3 +VER=3 +lib_LTLIBRARIES = libindicator3.la +else +VER= +lib_LTLIBRARIES = libindicator.la +endif + BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator.pc.in \ - indicator3.pc.in + indicator$(VER).pc.in include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator -libindicator3includedir=$(includedir)/libindicator3-0.3/libindicator +libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator indicator_headers = \ indicator.h \ @@ -18,15 +24,8 @@ indicator_headers = \ indicator-service.h \ indicator-service-manager.h - libindicatorinclude_HEADERS = \ $(indicator_headers) -libindicator3include_HEADERS = \ - $(indicator_headers) - -lib_LTLIBRARIES = \ - libindicator.la \ - libindicator3.la libindicator_la_SOURCES = \ $(indicator_headers) \ @@ -39,23 +38,26 @@ libindicator_la_SOURCES = \ indicator-object-marshal.c \ indicator-service.c \ indicator-service-manager.c -libindicator3_la_SOURCES = $(libindicator_la_SOURCES) libindicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ -DG_LOG_DOMAIN=\"libindicator\" \ -Wall -Werror -libindicator3_la_CFLAGS = \ - $(LIBINDICATOR3_CFLAGS) \ - -DG_LOG_DOMAIN=\"libindicator\" \ - -Wall -Werror libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) -libindicator3_la_LIBADD = \ - $(LIBINDICATOR3_LIBS) -pkgconfig_DATA = indicator.pc indicator3.pc +# We duplicate these here because Automake won't let us use $(VER) on the left hand side. +# Since we carefully use $(VER) in the right hand side above, we can assign the same values. +# Only one version of the library is every compiled at the same time, so it is safe to reuse +# the right hand sides like this. +libindicator3includedir = $(libindicatorincludedir) +libindicator3include_HEADERS = $(indicator_headers) +libindicator3_la_SOURCES = $(libindicator_la_SOURCES) +libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS) +libindicator3_la_LIBADD = $(libindicator_la_LIBADD) + +pkgconfig_DATA = indicator$(VER).pc pkgconfigdir = $(libdir)/pkgconfig glib_marshal_list = indicator-object-marshal.list -- cgit v1.2.3 From 5c848a14979bf12357c88a7e90422d1deb045ed5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 09:33:27 -0600 Subject: Putting the GTK3 indicators in a different directory. --- libindicator/indicator3.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libindicator') diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in index ba7098c..74b93c5 100644 --- a/libindicator/indicator3.pc.in +++ b/libindicator/indicator3.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -indicatordir=${libdir}/indicators/3/ +indicatordir=${libdir}/indicators3/1/ iconsdir=@datarootdir@/@PACKAGE@/icons/ Cflags: -I${includedir}/libindicator3-0.3 -- cgit v1.2.3 From 10d7e22266bf5591f1544d97db00ea631fbc57d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 09:38:56 -0600 Subject: Making sure to get both pc files in the tarball --- libindicator/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libindicator') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 94cf3e0..39cb2b7 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -10,7 +10,8 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c CLEANFILES = DISTCLEANFILES = EXTRA_DIST = \ - indicator$(VER).pc.in + indicator3.pc.in \ + indicator.pc.in include $(top_srcdir)/Makefile.am.marshal -- cgit v1.2.3