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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: patches/00_disable_playlist.patch

Issue 2364793002: Revert "Uprev libmtp to 1.1.12" (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master
Patch Set: Created 4 years, 3 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
« no previous file with comments | « missing ('k') | patches/01_build_fixes.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/00_disable_playlist.patch
diff --git a/patches/00_disable_playlist.patch b/patches/00_disable_playlist.patch
index 6e44fcf997dc71d365ab15a4e9b85065bc99c90c..6a0a573c18227d86970ed2bb92083070762c3119 100644
--- a/patches/00_disable_playlist.patch
+++ b/patches/00_disable_playlist.patch
@@ -1,7 +1,7 @@
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 46ac70f..0bac1b3 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
+Index: examples/Makefile.am
+===================================================================
+--- examples/Makefile.am (revision 148515)
++++ examples/Makefile.am (working copy)
@@ -1,6 +1,6 @@
bin_PROGRAMS=mtp-connect mtp-detect mtp-tracks mtp-files \
- mtp-folders mtp-trexist mtp-playlists mtp-getplaylist \
@@ -11,7 +11,7 @@ index 46ac70f..0bac1b3 100644
mtp-thumb mtp-reset mtp-filetree
mtp_connect_SOURCES=connect.c connect.h delfile.c getfile.c newfolder.c \
-@@ -11,9 +11,6 @@ mtp_tracks_SOURCES=tracks.c util.c util.h common.h
+@@ -11,9 +11,6 @@
mtp_files_SOURCES=files.c util.c util.h common.h
mtp_folders_SOURCES=folders.c util.c util.h common.h
mtp_trexist_SOURCES=trexist.c util.c util.h common.h
@@ -21,11 +21,11 @@ index 46ac70f..0bac1b3 100644
mtp_format_SOURCES=format.c util.c util.h common.h
mtp_albumart_SOURCES=albumart.c util.c util.h common.h
mtp_albums_SOURCES=albums.c util.c util.h common.h
-diff --git a/examples/Makefile.in b/examples/Makefile.in
-index 8d6e224..85e1a8b 100644
---- a/examples/Makefile.in
-+++ b/examples/Makefile.in
-@@ -90,10 +90,10 @@ build_triplet = @build@
+Index: examples/Makefile.in
+===================================================================
+--- examples/Makefile.in (revision 148515)
++++ examples/Makefile.in (working copy)
+@@ -36,10 +36,10 @@
host_triplet = @host@
bin_PROGRAMS = mtp-connect$(EXEEXT) mtp-detect$(EXEEXT) \
mtp-tracks$(EXEEXT) mtp-files$(EXEEXT) mtp-folders$(EXEEXT) \
@@ -38,8 +38,8 @@ index 8d6e224..85e1a8b 100644
+ mtp-emptyfolders$(EXEEXT) \
mtp-thumb$(EXEEXT) mtp-reset$(EXEEXT) mtp-filetree$(EXEEXT)
subdir = examples
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -153,18 +153,6 @@ am_mtp_format_OBJECTS = format.$(OBJEXT) util.$(OBJEXT)
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -95,18 +95,6 @@
mtp_format_OBJECTS = $(am_mtp_format_OBJECTS)
mtp_format_LDADD = $(LDADD)
mtp_format_DEPENDENCIES = ../src/libmtp.la
@@ -58,7 +58,7 @@ index 8d6e224..85e1a8b 100644
am_mtp_reset_OBJECTS = reset.$(OBJEXT) util.$(OBJEXT)
mtp_reset_OBJECTS = $(am_mtp_reset_OBJECTS)
mtp_reset_LDADD = $(LDADD)
-@@ -219,16 +207,14 @@ SOURCES = $(mtp_albumart_SOURCES) $(mtp_albums_SOURCES) \
+@@ -140,16 +128,14 @@
$(mtp_connect_SOURCES) $(mtp_detect_SOURCES) \
$(mtp_emptyfolders_SOURCES) $(mtp_files_SOURCES) \
$(mtp_filetree_SOURCES) $(mtp_folders_SOURCES) \
@@ -76,8 +76,8 @@ index 8d6e224..85e1a8b 100644
+ $(mtp_format_SOURCES) \
$(mtp_reset_SOURCES) $(mtp_thumb_SOURCES) \
$(mtp_tracks_SOURCES) $(mtp_trexist_SOURCES)
- am__can_run_installinfo = \
-@@ -397,9 +383,6 @@ mtp_tracks_SOURCES = tracks.c util.c util.h common.h
+ ETAGS = etags
+@@ -294,9 +280,6 @@
mtp_files_SOURCES = files.c util.c util.h common.h
mtp_folders_SOURCES = folders.c util.c util.h common.h
mtp_trexist_SOURCES = trexist.c util.c util.h common.h
@@ -87,26 +87,23 @@ index 8d6e224..85e1a8b 100644
mtp_format_SOURCES = format.c util.c util.h common.h
mtp_albumart_SOURCES = albumart.c util.c util.h common.h
mtp_albums_SOURCES = albums.c util.c util.h common.h
-@@ -529,18 +512,6 @@ mtp-format$(EXEEXT): $(mtp_format_OBJECTS) $(mtp_format_DEPENDENCIES) $(EXTRA_mt
+@@ -411,15 +394,6 @@
+ mtp-format$(EXEEXT): $(mtp_format_OBJECTS) $(mtp_format_DEPENDENCIES) $(EXTRA_mtp_format_DEPENDENCIES)
@rm -f mtp-format$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(mtp_format_OBJECTS) $(mtp_format_LDADD) $(LIBS)
-
+ $(LINK) $(mtp_format_OBJECTS) $(mtp_format_LDADD) $(LIBS)
-mtp-getplaylist$(EXEEXT): $(mtp_getplaylist_OBJECTS) $(mtp_getplaylist_DEPENDENCIES) $(EXTRA_mtp_getplaylist_DEPENDENCIES)
- @rm -f mtp-getplaylist$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(mtp_getplaylist_OBJECTS) $(mtp_getplaylist_LDADD) $(LIBS)
--
+- $(LINK) $(mtp_getplaylist_OBJECTS) $(mtp_getplaylist_LDADD) $(LIBS)
-mtp-newplaylist$(EXEEXT): $(mtp_newplaylist_OBJECTS) $(mtp_newplaylist_DEPENDENCIES) $(EXTRA_mtp_newplaylist_DEPENDENCIES)
- @rm -f mtp-newplaylist$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(mtp_newplaylist_OBJECTS) $(mtp_newplaylist_LDADD) $(LIBS)
--
+- $(LINK) $(mtp_newplaylist_OBJECTS) $(mtp_newplaylist_LDADD) $(LIBS)
-mtp-playlists$(EXEEXT): $(mtp_playlists_OBJECTS) $(mtp_playlists_DEPENDENCIES) $(EXTRA_mtp_playlists_DEPENDENCIES)
- @rm -f mtp-playlists$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(mtp_playlists_OBJECTS) $(mtp_playlists_LDADD) $(LIBS)
--
+- $(LINK) $(mtp_playlists_OBJECTS) $(mtp_playlists_LDADD) $(LIBS)
mtp-reset$(EXEEXT): $(mtp_reset_OBJECTS) $(mtp_reset_DEPENDENCIES) $(EXTRA_mtp_reset_DEPENDENCIES)
@rm -f mtp-reset$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(mtp_reset_OBJECTS) $(mtp_reset_LDADD) $(LIBS)
-@@ -574,11 +545,8 @@ distclean-compile:
+ $(LINK) $(mtp_reset_OBJECTS) $(mtp_reset_LDADD) $(LIBS)
+@@ -450,11 +424,8 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/folders.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getfile.Po@am__quote@
@@ -118,10 +115,10 @@ index 8d6e224..85e1a8b 100644
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reset.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendfile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendtr.Po@am__quote@
-diff --git a/src/libmtp.c b/src/libmtp.c
-index 665f334..b38b7a2 100644
---- a/src/libmtp.c
-+++ b/src/libmtp.c
+Index: src/libmtp.c
+===================================================================
+--- src/libmtp.c (revision 148515)
++++ src/libmtp.c (working copy)
@@ -40,7 +40,9 @@
#include "ptp.h"
#include "libusb-glue.h"
@@ -131,8 +128,8 @@ index 665f334..b38b7a2 100644
+#endif
#include "util.h"
- #include "mtpz.h"
-@@ -6965,6 +6967,7 @@ int LIBMTP_Set_Track_Name(LIBMTP_mtpdevice_t *device,
+ #include <stdlib.h>
+@@ -6764,6 +6766,7 @@
return ret;
}
@@ -140,7 +137,7 @@ index 665f334..b38b7a2 100644
/**
* This function renames a single playlist object file holder.
* This simply means that the <code>PTP_OPC_ObjectFileName</code>
-@@ -7001,6 +7004,7 @@ int LIBMTP_Set_Playlist_Name(LIBMTP_mtpdevice_t *device,
+@@ -6800,6 +6803,7 @@
playlist->name = strdup(newname);
return ret;
}
@@ -148,7 +145,7 @@ index 665f334..b38b7a2 100644
/**
* This function renames a single album.
-@@ -7418,6 +7422,7 @@ uint32_t LIBMTP_Create_Folder(LIBMTP_mtpdevice_t *device, char *name,
+@@ -7217,6 +7221,7 @@
return new_id;
}
@@ -156,7 +153,7 @@ index 665f334..b38b7a2 100644
/**
* This creates a new playlist metadata structure and allocates memory
* for it. Notice that if you add strings to this structure they
-@@ -7614,6 +7619,7 @@ LIBMTP_playlist_t *LIBMTP_Get_Playlist(LIBMTP_mtpdevice_t *device, uint32_t cons
+@@ -7413,6 +7418,7 @@
return pl;
}
@@ -164,7 +161,7 @@ index 665f334..b38b7a2 100644
/**
* This function creates a new abstract list such as a playlist
-@@ -8170,6 +8176,7 @@ static int update_abstract_list(LIBMTP_mtpdevice_t *device,
+@@ -7967,6 +7973,7 @@
}
@@ -172,7 +169,7 @@ index 665f334..b38b7a2 100644
/**
* This routine creates a new playlist based on the metadata
* supplied. If the <code>tracks</code> field of the metadata
-@@ -8268,6 +8275,7 @@ int LIBMTP_Update_Playlist(LIBMTP_mtpdevice_t *device,
+@@ -8065,6 +8072,7 @@
metadata->tracks,
metadata->no_tracks);
}
@@ -180,10 +177,10 @@ index 665f334..b38b7a2 100644
/**
* This creates a new album metadata structure and allocates memory
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d00e372..39f1c61 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am (revision 148515)
++++ src/Makefile.am (working copy)
@@ -1,9 +1,9 @@
lib_LTLIBRARIES = libmtp.la
@@ -191,16 +188,16 @@ index d00e372..39f1c61 100644
-libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h playlist-spl.c \
+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 playlist-spl.h mtpz.h \
-+ music-players.h device-flags.h mtpz.h \
- chdk_live_view.h chdk_ptp.h
+- music-players.h device-flags.h playlist-spl.h mtpz.h
++ music-players.h device-flags.h mtpz.h
- if MTPZ_COMPILE
-diff --git a/src/libmtp.h.in b/src/libmtp.h.in
-index ac37b3e..4b742e1 100644
---- a/src/libmtp.h.in
-+++ b/src/libmtp.h.in
-@@ -1001,7 +1001,7 @@ uint32_t LIBMTP_Create_Folder(LIBMTP_mtpdevice_t*, char *, uint32_t, uint32_t);
+ if LIBUSB1_COMPILE
+ libmtp_la_SOURCES += libusb1-glue.c
+Index: src/libmtp.h.in
+===================================================================
+--- src/libmtp.h.in (revision 148515)
++++ src/libmtp.h.in (working copy)
+@@ -966,7 +966,7 @@
int LIBMTP_Set_Folder_Name(LIBMTP_mtpdevice_t *, LIBMTP_folder_t *, const char *);
/** @} */
@@ -209,7 +206,7 @@ index ac37b3e..4b742e1 100644
/**
* @}
* @defgroup playlists The audio/video playlist management API.
-@@ -1014,6 +1014,7 @@ LIBMTP_playlist_t *LIBMTP_Get_Playlist(LIBMTP_mtpdevice_t *, uint32_t const);
+@@ -979,6 +979,7 @@
int LIBMTP_Create_New_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const);
int LIBMTP_Update_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const);
int LIBMTP_Set_Playlist_Name(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t *, const char *);
@@ -217,11 +214,11 @@ index ac37b3e..4b742e1 100644
/**
* @}
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 5cdbab8..2c4cc96 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -140,8 +140,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+Index: src/Makefile.in
+===================================================================
+--- src/Makefile.in (revision 148515)
++++ src/Makefile.in (working copy)
+@@ -85,16 +85,16 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
am__libmtp_la_SOURCES_DIST = libmtp.c unicode.c unicode.h util.c \
@@ -229,10 +226,10 @@ index 5cdbab8..2c4cc96 100644
- libusb-glue.h music-players.h device-flags.h playlist-spl.h \
+ util.h gphoto2-endian.h _stdint.h ptp.c ptp.h \
+ libusb-glue.h music-players.h device-flags.h \
- mtpz.h chdk_live_view.h chdk_ptp.h mtpz.c libusb1-glue.c \
- libusb-glue.c libopenusb1-glue.c
+ mtpz.h mtpz.c libusb1-glue.c libusb-glue.c libopenusb1-glue.c
@MTPZ_COMPILE_TRUE@am__objects_1 = libmtp_la-mtpz.lo
-@@ -150,7 +150,7 @@ am__libmtp_la_SOURCES_DIST = libmtp.c unicode.c unicode.h util.c \
+ @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 \
@@ -241,7 +238,7 @@ index 5cdbab8..2c4cc96 100644
$(am__objects_1) $(am__objects_2) $(am__objects_3) \
$(am__objects_4)
libmtp_la_OBJECTS = $(am_libmtp_la_OBJECTS)
-@@ -360,8 +360,8 @@ top_srcdir = @top_srcdir@
+@@ -252,8 +252,8 @@
lib_LTLIBRARIES = libmtp.la
libmtp_la_CFLAGS = @LIBUSB_CFLAGS@
libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \
@@ -249,10 +246,10 @@ index 5cdbab8..2c4cc96 100644
- libusb-glue.h music-players.h device-flags.h playlist-spl.h \
+ gphoto2-endian.h _stdint.h ptp.c ptp.h \
+ libusb-glue.h music-players.h device-flags.h \
- mtpz.h chdk_live_view.h chdk_ptp.h $(am__append_1) \
- $(am__append_2) $(am__append_3) $(am__append_4)
+ mtpz.h $(am__append_1) $(am__append_2) $(am__append_3) \
+ $(am__append_4)
include_HEADERS = libmtp.h
-@@ -486,7 +486,6 @@ distclean-compile:
+@@ -373,7 +373,6 @@
@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@
@@ -260,17 +257,17 @@ index 5cdbab8..2c4cc96 100644
@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@
-@@ -533,13 +532,6 @@ libmtp_la-util.lo: util.c
+@@ -419,13 +418,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmtp_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
+ @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-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-libmtp_la-playlist-spl.lo: playlist-spl.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-playlist-spl.lo -MD -MP -MF $(DEPDIR)/libmtp_la-playlist-spl.Tpo -c -o libmtp_la-playlist-spl.lo `test -f 'playlist-spl.c' || echo '$(srcdir)/'`playlist-spl.c
--@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmtp_la-playlist-spl.Tpo $(DEPDIR)/libmtp_la-playlist-spl.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='playlist-spl.c' object='libmtp_la-playlist-spl.lo' libtool=yes @AMDEPBACKSLASH@
+-@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-playlist-spl.lo -MD -MP -MF $(DEPDIR)/libmtp_la-playlist-spl.Tpo -c -o libmtp_la-playlist-spl.lo `test -f 'playlist-spl.c' || echo '$(srcdir)/'`playlist-spl.c
+-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmtp_la-playlist-spl.Tpo $(DEPDIR)/libmtp_la-playlist-spl.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='playlist-spl.c' object='libmtp_la-playlist-spl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmtp_la-playlist-spl.lo `test -f 'playlist-spl.c' || echo '$(srcdir)/'`playlist-spl.c
+-@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-playlist-spl.lo `test -f 'playlist-spl.c' || echo '$(srcdir)/'`playlist-spl.c
-
libmtp_la-ptp.lo: ptp.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-ptp.lo -MD -MP -MF $(DEPDIR)/libmtp_la-ptp.Tpo -c -o libmtp_la-ptp.lo `test -f 'ptp.c' || echo '$(srcdir)/'`ptp.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmtp_la-ptp.Tpo $(DEPDIR)/libmtp_la-ptp.Plo
+ @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-ptp.lo -MD -MP -MF $(DEPDIR)/libmtp_la-ptp.Tpo -c -o libmtp_la-ptp.lo `test -f 'ptp.c' || echo '$(srcdir)/'`ptp.c
+ @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmtp_la-ptp.Tpo $(DEPDIR)/libmtp_la-ptp.Plo
« no previous file with comments | « missing ('k') | patches/01_build_fixes.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698