summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Brill <egore@gmx.de>2012-05-22 12:14:37 +0100
committerRichard Hughes <richard@hughsie.com>2012-05-22 12:14:37 +0100
commita44ac58af394245c1363629ba9d2de6ee6936d34 (patch)
tree6b8ee1b4ef3f8eb9541cc4830c84ed27984dff78
parent6a5bffec8e1473371e8828a8f92a56f52014e04c (diff)
downloadcolord-a44ac58af394245c1363629ba9d2de6ee6936d34.tar.gz
Do not install any parts of colord-sane if --disable-sane is specified
Signed-off-by: Richard Hughes <richard@hughsie.com>
-rw-r--r--contrib/colord-sane/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/colord-sane/Makefile.am b/contrib/colord-sane/Makefile.am
index 6240c53..7b415b9 100644
--- a/contrib/colord-sane/Makefile.am
+++ b/contrib/colord-sane/Makefile.am
@@ -1,3 +1,4 @@
+if HAVE_SANE
introspectiondir = $(datadir)/dbus-1/interfaces
dist_introspection_DATA = \
org.freedesktop.colord.sane.xml
@@ -17,7 +18,6 @@ INCLUDES = \
-DLOCALEDIR=\""$(localedir)"\"
if HAVE_GUDEV
-if HAVE_SANE
COLORD_LIBS = \
$(top_builddir)/libcolord/libcolord.la
@@ -37,7 +37,6 @@ colord_sane_LDADD = \
colord_sane_CFLAGS = \
$(WARNINGFLAGS_C)
endif
-endif
dbusdir = $(sysconfdir)/dbus-1/system.d
dist_dbus_DATA = org.freedesktop.colord-sane.conf
@@ -72,3 +71,4 @@ DISTCLEANFILES = \
$(systemdservicemain_DATA)
-include $(top_srcdir)/git.mk
+endif