aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-23 08:39:11 -0600
committerTed Gould <ted@gould.cx>2012-02-23 08:39:11 -0600
commit76e3d09219f1dd4f7dcb1e99dcaec562ff7cdcaf (patch)
treecf5421ae824f5efb0e3607e0f76e312c6c7b1324
parentcc124ba5add6debff0f4053f43e3f2e160b2039c (diff)
downloadayatana-indicator-session-76e3d09219f1dd4f7dcb1e99dcaec562ff7cdcaf.tar.gz
ayatana-indicator-session-76e3d09219f1dd4f7dcb1e99dcaec562ff7cdcaf.tar.bz2
ayatana-indicator-session-76e3d09219f1dd4f7dcb1e99dcaec562ff7cdcaf.zip
Move the variables into the list straight up as they'll be NULL if undefined
-rw-r--r--src/Makefile.am11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 4da3fc5..a1e443e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,17 +136,12 @@ indicator_session_service_CFLAGS = \
$(GCONF_CFLAGS) \
-DLIBEXECDIR=\"$(libexecdir)\" \
-Wall -Werror \
- -DG_LOG_DOMAIN=\"Indicator-Session\"
+ -DG_LOG_DOMAIN=\"Indicator-Session\" \
+ $(GUDEV_CFLAGS)
indicator_session_service_LDADD = \
$(SESSIONSERVICE_LIBS) \
- $(GCONF_LIBS)
-
-if HAS_GUDEV
-indicator_session_service_CFLAGS += \
- $(GUDEV_CFLAGS)
-indicator_session_service_LDADD += \
+ $(GCONF_LIBS) \
$(GUDEV_LIBS)
-endif
#################
# GTK Logout Stuff