diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 09:59:36 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 09:59:36 -0600 |
| commit | e6a847b01ec74c372069a4bfb2918017c58429e0 (patch) | |
| tree | 9b5839fd9c6c0ef0af5e6d739d717cda144d8353 /libindicator | |
| parent | 022e4bfbcb06a66552007abc8f9f329ce86c9995 (diff) | |
| parent | 10d7e22266bf5591f1544d97db00ea631fbc57d5 (diff) | |
| download | libayatana-indicator-e6a847b01ec74c372069a4bfb2918017c58429e0.tar.gz libayatana-indicator-e6a847b01ec74c372069a4bfb2918017c58429e0.tar.bz2 libayatana-indicator-e6a847b01ec74c372069a4bfb2918017c58429e0.zip | |
Merging in the GTK3 basis for the build
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/Makefile.am | 27 | ||||
| -rw-r--r-- | libindicator/indicator3.pc.in | 17 |
2 files changed, 39 insertions, 5 deletions
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index f942f0d..39cb2b7 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -1,12 +1,21 @@ +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 = \ + indicator3.pc.in \ indicator.pc.in include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator-0.3/libindicator +libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator indicator_headers = \ indicator.h \ @@ -19,9 +28,6 @@ indicator_headers = \ libindicatorinclude_HEADERS = \ $(indicator_headers) -lib_LTLIBRARIES = \ - libindicator.la - libindicator_la_SOURCES = \ $(indicator_headers) \ dbus-shared.h \ @@ -47,7 +53,18 @@ libindicator_la_LDFLAGS = \ -no-undefined \ -export-symbols-regex "^[^_].*" -pkgconfig_DATA = indicator.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) +libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS) + +pkgconfig_DATA = indicator$(VER).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..74b93c5 --- /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}/indicators3/1/ +iconsdir=@datarootdir@/@PACKAGE@/icons/ + +Cflags: -I${includedir}/libindicator3-0.3 +Requires: gtk+-3.0 +Libs: -lindicator3 + +Name: libindicator3 +Description: libindicator3. +Version: @VERSION@ + |