aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am7
-rw-r--r--tools/Makefile.in7
2 files changed, 11 insertions, 3 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 168cea8..6c67491 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,8 @@
+if USE_GTK3
+INDICATOR_LIB = -lindicator3
+else
+INDICATOR_LIB = -lindicator
+endif
libexec_PROGRAMS = \
indicator-loader
@@ -17,7 +22,7 @@ indicator_loader_CFLAGS = \
indicator_loader_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
xsessiondir = $(sysconfdir)/X11/Xsession.d
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 5e54885..f5a77ff 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -52,7 +52,8 @@ am_indicator_loader_OBJECTS = \
indicator_loader-indicator-loader.$(OBJEXT)
indicator_loader_OBJECTS = $(am_indicator_loader_OBJECTS)
am__DEPENDENCIES_1 =
-indicator_loader_DEPENDENCIES = $(am__DEPENDENCIES_1)
+indicator_loader_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
@@ -237,6 +238,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
+@USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
#############################
# Indicator Loader
@@ -252,7 +255,7 @@ indicator_loader_CFLAGS = \
indicator_loader_LDADD = \
$(LIBINDICATOR_LIBS) \
-L$(top_builddir)/libindicator/.libs \
- -lindicator
+ $(INDICATOR_LIB)
xsessiondir = $(sysconfdir)/X11/Xsession.d
xsession_DATA = 80indicator-debugging