aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2010-11-24 18:00:06 -0500
committerKen VanDine <ken.vandine@canonical.com>2010-11-24 18:00:06 -0500
commitb0c8eb12c211d7e1009fd8c7be525fd73c603a6d (patch)
treee98cf800a6683de5f117d7d9e4d319bf1532807c
parent7d8375c7694f91fb05f72cf175a0a0219ba19bb1 (diff)
downloadlibayatana-indicator-b0c8eb12c211d7e1009fd8c7be525fd73c603a6d.tar.gz
libayatana-indicator-b0c8eb12c211d7e1009fd8c7be525fd73c603a6d.tar.bz2
libayatana-indicator-b0c8eb12c211d7e1009fd8c7be525fd73c603a6d.zip
Build indicator-loader3
-rw-r--r--tools/Makefile.am14
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6c67491..287d34f 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
@@ -24,6 +26,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