diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 14:56:35 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 14:56:35 -0500 |
| commit | 1a4eadca8def1f57740a19d993adba7f770d932d (patch) | |
| tree | 895fae89893f50f7c6e68b1c6f3a97c75c0e0b61 /libindicator/Makefile.am | |
| parent | 948cb8ef96ab75f7f468d535450ce065af3e2c26 (diff) | |
| parent | e87aa8f4e30f315a8ce8acece383c50e32290481 (diff) | |
| download | libayatana-indicator-1a4eadca8def1f57740a19d993adba7f770d932d.tar.gz libayatana-indicator-1a4eadca8def1f57740a19d993adba7f770d932d.tar.bz2 libayatana-indicator-1a4eadca8def1f57740a19d993adba7f770d932d.zip | |
* New upstream release.
* Adding a small file to set debugging environment variables
* Allowing to build for GTK 2/3 and build parallel libraries
* debian/control: Adding package libindicator-debugenv
Diffstat (limited to 'libindicator/Makefile.am')
| -rw-r--r-- | libindicator/Makefile.am | 27 |
1 files changed, 22 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 |