diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 18:39:14 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 18:39:14 -0500 |
| commit | 8915dd59667cd7aae74860ee063374b24734e03c (patch) | |
| tree | feb3574fe5e40cb56d5cd1035b44f3ada3eac2dc /tools | |
| parent | 1a4eadca8def1f57740a19d993adba7f770d932d (diff) | |
| download | libayatana-indicator-8915dd59667cd7aae74860ee063374b24734e03c.tar.gz libayatana-indicator-8915dd59667cd7aae74860ee063374b24734e03c.tar.bz2 libayatana-indicator-8915dd59667cd7aae74860ee063374b24734e03c.zip | |
* debian/rules
- Added build targets to build with gtk3 enabled in additional to
default build with gtk2
* debian/control
- Updated build depends to support building with gtk+-3.0
- Added dh-autoreconf build depends
- Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries
binaries
* libindicator/Makefile.am and tools/Makefile.am
- Fixes needed for building with-gtk=3
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 6c67491..9861ac1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,11 +1,13 @@ if USE_GTK3 INDICATOR_LIB = -lindicator3 +libexec_PROGRAMS = indicator-loader3 +VER=3 else +VER= INDICATOR_LIB = -lindicator +libexec_PROGRAMS = indicator-loader endif -libexec_PROGRAMS = \ - indicator-loader ############################# # Indicator Loader @@ -17,6 +19,7 @@ indicator_loader_SOURCES = \ indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -Wall -Werror \ -DBUILD_DIR="\"$(builddir)\"" indicator_loader_LDADD = \ @@ -24,6 +27,14 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ $(INDICATOR_LIB) +# 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. +indicator_loader3_SOURCES = $(indicator_loader_SOURCES) +indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) +indicator_loader3_LDADD = $(indicator_loader_LDADD) + xsessiondir = $(sysconfdir)/X11/Xsession.d xsession_DATA = 80indicator-debugging |