diff options
| author | Michael Terry <michael.terry@canonical.com> | 2010-06-19 08:47:50 -0400 |
|---|---|---|
| committer | Michael Terry <michael.terry@canonical.com> | 2010-06-19 08:47:50 -0400 |
| commit | 322884dde9c0131373989c1fc39d92a4ce7e87f9 (patch) | |
| tree | 3ce1f20baef24cf9bee47981e50976cabe78019d | |
| parent | c77d719ce54cf07cb4769d37a91f2f33a769a369 (diff) | |
| download | libayatana-indicator-322884dde9c0131373989c1fc39d92a4ce7e87f9.tar.gz libayatana-indicator-322884dde9c0131373989c1fc39d92a4ce7e87f9.tar.bz2 libayatana-indicator-322884dde9c0131373989c1fc39d92a4ce7e87f9.zip | |
first pass at providing a gtk3 version
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | libindicator/Makefile.am | 19 | ||||
| -rw-r--r-- | libindicator/indicator3.pc.in | 17 |
3 files changed, 42 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8ae0c74..7c706e9 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ############################## GTK_REQUIRED_VERSION=2.18 +GTK3_REQUIRED_VERSION=2.90 DBUS_REQUIRED_VERSION=0.76 GIO_UNIX_REQUIRED_VERSION=2.22 @@ -39,6 +40,13 @@ PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(LIBINDICATOR_CFLAGS) AC_SUBST(LIBINDICATOR_LIBS) +PKG_CHECK_MODULES(LIBINDICATOR3, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + +AC_SUBST(LIBINDICATOR3_CFLAGS) +AC_SUBST(LIBINDICATOR3_LIBS) + ############################## # Custom Junk ############################## @@ -92,6 +100,7 @@ AC_OUTPUT([ Makefile libindicator/Makefile libindicator/indicator.pc +libindicator/indicator3.pc tests/Makefile tools/Makefile ]) 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@ + |