diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-08 14:07:18 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-08 14:07:18 -0600 |
| commit | 809366b5730013d53d81fe998510ca71da6f4049 (patch) | |
| tree | b88e665ed502e57d5882128dde3382d61ae30352 /tools | |
| parent | e87aa8f4e30f315a8ce8acece383c50e32290481 (diff) | |
| parent | c5c78aad9e7710a18640ea44c2a5af154b2943bc (diff) | |
| download | libayatana-indicator-809366b5730013d53d81fe998510ca71da6f4049.tar.gz libayatana-indicator-809366b5730013d53d81fe998510ca71da6f4049.tar.bz2 libayatana-indicator-809366b5730013d53d81fe998510ca71da6f4049.zip | |
Merging in dual build from Ubuntu Desktop
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 6c67491..795e4fc 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,7 +27,15 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ $(INDICATOR_LIB) -xsessiondir = $(sysconfdir)/X11/Xsession.d +# 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 = $(pkgdatadir) xsession_DATA = 80indicator-debugging |