summaryrefslogtreecommitdiff
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-19 16:46:00 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-19 16:46:00 +0200
commit3a5d7105589e39b43fe5e9256e8137d7e783141d (patch)
tree6a0c9fda7110bbee1213b0d347e11c84a8266875 /src/Makefile.in
parentf1a6c049e615f5739183d2558df9db5bca43cd68 (diff)
parent05e2631353c9f9522564ca06efc8fc5ba3a863cb (diff)
Merge tag 'upstream/3.17.90'
Upstream version 3.17.90
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index c47e058..f8e3ab5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -310,6 +310,8 @@ simple_scan_SOURCES = \
book.vala \
book-view.vala \
colord.vapi \
+ fixes.vapi \
+ packagekit-glib2.vapi \
page.vala \
page-view.vala \
sane.vapi \
@@ -319,8 +321,8 @@ simple_scan_SOURCES = \
autosave-manager.vala \
resources.c
-simple_scan_VALAFLAGS = --pkg=zlib --pkg=gudev-1.0 --pkg=gio-2.0 \
- --pkg=gtk+-3.0 \
+simple_scan_VALAFLAGS = --pkg=posix --pkg=zlib --pkg=gusb \
+ --pkg=gio-2.0 --pkg=gtk+-3.0 \
--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
--debug --target-glib 2.38 $(am__append_1)
simple_scan_CFLAGS = \
@@ -334,7 +336,8 @@ simple_scan_CFLAGS = \
-DUI_DIR=\"$(datadir)/simple-scan/\" \
-DICON_DIR=\"$(datadir)/simple-scan/icons\" \
-DGCONF_DIR=\"/apps/simple-scan\" \
- -DSIMPLE_SCAN_BINARY=\"simple-scan\"
+ -DSIMPLE_SCAN_BINARY=\"simple-scan\" \
+ -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
simple_scan_LDADD = \
$(SIMPLE_SCAN_LIBS) \
@@ -347,9 +350,6 @@ CLEANFILES = \
resources.c \
*_vala.stamp
-DISTCLEANFILES = \
- Makefile.in
-
all: all-am
.SUFFIXES:
@@ -625,9 +625,9 @@ $(srcdir)/autosave-manager.c: $(srcdir)/simple_scan_vala.stamp
@if test -f $@; then :; else \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/simple_scan_vala.stamp; \
fi
-$(srcdir)/simple_scan_vala.stamp: config.vapi book.vala book-view.vala colord.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
+$(srcdir)/simple_scan_vala.stamp: config.vapi book.vala book-view.vala colord.vapi fixes.vapi packagekit-glib2.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
$(AM_V_at)rm -f $@ && echo stamp > $@-t
- $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C config.vapi book.vala book-view.vala colord.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
+ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C config.vapi book.vala book-view.vala colord.vapi fixes.vapi packagekit-glib2.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
$(AM_V_at)mv -f $@-t $@
ID: $(am__tagged_files)
@@ -746,7 +746,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"