diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-07 23:32:06 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-07 23:32:06 -0600 |
| commit | dc5880fcc8294268712b9daf12e939a0c66673a8 (patch) | |
| tree | 296b471979044564e9bfe15c3e2e490ef2ed969f /tools | |
| parent | 2bbbabcbaee91c6c5f5ab75c31a9a47305228a68 (diff) | |
| parent | f7b8662cc0e5abd018f11345205536dda7d56646 (diff) | |
| download | libayatana-indicator-dc5880fcc8294268712b9daf12e939a0c66673a8.tar.gz libayatana-indicator-dc5880fcc8294268712b9daf12e939a0c66673a8.tar.bz2 libayatana-indicator-dc5880fcc8294268712b9daf12e939a0c66673a8.zip | |
Syncing up to trunk
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 14 |
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 |