Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: Makefile.in

Issue 10825123: libmtp: Do not build and install bits we don't need - udev utilities and examples. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libmtp/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Makefile.in
===================================================================
--- Makefile.in (revision 148712)
+++ Makefile.in (working copy)
@@ -91,9 +91,8 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(udevrulesdir)"
-DATA = $(noinst_DATA) $(pkgconfig_DATA) $(udevrules_DATA)
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+DATA = $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -272,18 +271,11 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = src examples util doc
+SUBDIRS = src util doc
ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmtp.pc
EXTRA_DIST = libmtp.pc libmtp.sh COPYING README.windows.txt
-
-# This stuff only makes sense on Linux so only
-# build and ship it on Linux.
-@USE_LINUX_TRUE@udevrulesdir = @UDEV@/rules.d
-@USE_LINUX_TRUE@udevrules_DATA = @UDEV_RULES@
-@USE_LINUX_TRUE@noinst_DATA = libmtp.usermap libmtp.fdi
-@USE_LINUX_TRUE@CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -370,25 +362,7 @@
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-udevrulesDATA: $(udevrules_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)"
- @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \
- done
-uninstall-udevrulesDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir)
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -719,7 +693,7 @@
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(udevrulesdir)"; do \
+ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -744,7 +718,6 @@
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -775,7 +748,7 @@
info-am:
-install-data-am: install-pkgconfigDATA install-udevrulesDATA
+install-data-am: install-pkgconfigDATA
install-dvi: install-dvi-recursive
@@ -821,7 +794,7 @@
ps-am:
-uninstall-am: uninstall-pkgconfigDATA uninstall-udevrulesDATA
+uninstall-am: uninstall-pkgconfigDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
ctags-recursive install-am install-strip tags-recursive
@@ -837,20 +810,29 @@
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip install-udevrulesDATA installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-pkgconfigDATA \
- uninstall-udevrulesDATA
+ uninstall uninstall-am uninstall-pkgconfigDATA
-@USE_LINUX_TRUE@libmtp.usermap: util/mtp-hotplug
-@USE_LINUX_TRUE@ util/mtp-hotplug > libmtp.usermap
-@USE_LINUX_TRUE@@UDEV_RULES@: util/mtp-hotplug
-@USE_LINUX_TRUE@ util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
-@USE_LINUX_TRUE@libmtp.fdi: util/mtp-hotplug
-@USE_LINUX_TRUE@ util/mtp-hotplug -H > libmtp.fdi
+# This stuff only makes sense on Linux so only
+# build and ship it on Linux.
+#if USE_LINUX
+#udevrulesdir=@UDEV@/rules.d
+#udevrules_DATA=@UDEV_RULES@
+#noinst_DATA=libmtp.usermap libmtp.fdi
+#
+#libmtp.usermap: util/mtp-hotplug
+# util/mtp-hotplug > libmtp.usermap
+#@UDEV_RULES@: util/mtp-hotplug
+# util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@
+#libmtp.fdi: util/mtp-hotplug
+# util/mtp-hotplug -H > libmtp.fdi
+#
+#CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi
+#endif
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
« Makefile.am ('K') | « Makefile.am ('k') | patches/09_do_not_build_udev_and_examples.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698