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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/Makefile.in

Issue 11358153: Update libmtp from pre 1.1.4 git to 1.1.5 release. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libmtp/
Patch Set: disable mptz Created 8 years, 1 month 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
« config.h ('K') | « src/Makefile.am ('k') | src/gphoto2-sync.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/Makefile.in
===================================================================
--- src/Makefile.in (revision 166547)
+++ src/Makefile.in (working copy)
@@ -36,9 +36,10 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@LIBUSB1_COMPILE_TRUE@am__append_1 = libusb1-glue.c
-@LIBUSB0_COMPILE_TRUE@am__append_2 = libusb-glue.c
-@LIBOPENUSB_COMPILE_TRUE@am__append_3 = libopenusb1-glue.c
+@MTPZ_COMPILE_TRUE@am__append_1 = mtpz.c
+@LIBUSB1_COMPILE_TRUE@am__append_2 = libusb1-glue.c
+@LIBUSB0_COMPILE_TRUE@am__append_3 = libusb-glue.c
+@LIBOPENUSB_COMPILE_TRUE@am__append_4 = libopenusb1-glue.c
subdir = src
DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libmtp.h.in
@@ -87,14 +88,16 @@
am__libmtp_la_SOURCES_DIST = libmtp.c unicode.c unicode.h util.c \
util.h gphoto2-endian.h _stdint.h ptp.c ptp.h \
libusb-glue.h music-players.h device-flags.h \
- libusb1-glue.c libusb-glue.c libopenusb1-glue.c
-@LIBUSB1_COMPILE_TRUE@am__objects_1 = libmtp_la-libusb1-glue.lo
-@LIBUSB0_COMPILE_TRUE@am__objects_2 = libmtp_la-libusb-glue.lo
-@LIBOPENUSB_COMPILE_TRUE@am__objects_3 = \
+ mtpz.h mtpz.c libusb1-glue.c libusb-glue.c libopenusb1-glue.c
+@MTPZ_COMPILE_TRUE@am__objects_1 = libmtp_la-mtpz.lo
+@LIBUSB1_COMPILE_TRUE@am__objects_2 = libmtp_la-libusb1-glue.lo
+@LIBUSB0_COMPILE_TRUE@am__objects_3 = libmtp_la-libusb-glue.lo
+@LIBOPENUSB_COMPILE_TRUE@am__objects_4 = \
@LIBOPENUSB_COMPILE_TRUE@ libmtp_la-libopenusb1-glue.lo
am_libmtp_la_OBJECTS = libmtp_la-libmtp.lo libmtp_la-unicode.lo \
libmtp_la-util.lo libmtp_la-ptp.lo \
- $(am__objects_1) $(am__objects_2) $(am__objects_3)
+ $(am__objects_1) $(am__objects_2) $(am__objects_3) \
+ $(am__objects_4)
libmtp_la_OBJECTS = $(am_libmtp_la_OBJECTS)
libmtp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmtp_la_CFLAGS) \
@@ -254,7 +257,8 @@
libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \
gphoto2-endian.h _stdint.h ptp.c ptp.h \
libusb-glue.h music-players.h device-flags.h \
- $(am__append_1) $(am__append_2) $(am__append_3)
+ mtpz.h $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4)
include_HEADERS = libmtp.h
EXTRA_DIST = libmtp.h.in libmtp.sym ptp-pack.c
@@ -282,7 +286,7 @@
# ---------------------------------------------------------------------------
CURRENT = 9
AGE = 0
-REVISION = 3
+REVISION = 5
SOVERSION = $(CURRENT):$(REVISION):$(AGE)
LT_CURRENT_MINUS_AGE = `expr $(CURRENT) - $(AGE)`
@COMPILE_MINGW32_TRUE@W32_LIBS = -lws2_32
@@ -372,6 +376,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libopenusb1-glue.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libusb-glue.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libusb1-glue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-mtpz.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-ptp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-unicode.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-util.Plo@am__quote@
@@ -425,6 +430,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmtp_la-ptp.lo `test -f 'ptp.c' || echo '$(srcdir)/'`ptp.c
+libmtp_la-mtpz.lo: mtpz.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-mtpz.lo -MD -MP -MF $(DEPDIR)/libmtp_la-mtpz.Tpo -c -o libmtp_la-mtpz.lo `test -f 'mtpz.c' || echo '$(srcdir)/'`mtpz.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmtp_la-mtpz.Tpo $(DEPDIR)/libmtp_la-mtpz.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mtpz.c' object='libmtp_la-mtpz.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmtp_la-mtpz.lo `test -f 'mtpz.c' || echo '$(srcdir)/'`mtpz.c
+
libmtp_la-libusb1-glue.lo: libusb1-glue.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-libusb1-glue.lo -MD -MP -MF $(DEPDIR)/libmtp_la-libusb1-glue.Tpo -c -o libmtp_la-libusb1-glue.lo `test -f 'libusb1-glue.c' || echo '$(srcdir)/'`libusb1-glue.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmtp_la-libusb1-glue.Tpo $(DEPDIR)/libmtp_la-libusb1-glue.Plo
« config.h ('K') | « src/Makefile.am ('k') | src/gphoto2-sync.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698