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

Side by Side Diff: src/Makefile.am

Issue 2345493002: Uprev libmtp to 1.1.12 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master
Patch Set: Re-upload cl Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « patches/21_fix_build_with_new_glibc.patch ('k') | src/Makefile.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 lib_LTLIBRARIES = libmtp.la 1 lib_LTLIBRARIES = libmtp.la
2 2
3 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ 3 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@
4 libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \ 4 libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \
5 gphoto2-endian.h _stdint.h ptp.c ptp.h libusb-glue.h \ 5 gphoto2-endian.h _stdint.h ptp.c ptp.h libusb-glue.h \
6 » music-players.h device-flags.h mtpz.h 6 » music-players.h device-flags.h mtpz.h \
7 » chdk_live_view.h chdk_ptp.h
7 8
8 if MTPZ_COMPILE 9 if MTPZ_COMPILE
9 libmtp_la_SOURCES += mtpz.c 10 libmtp_la_SOURCES += mtpz.c
10 endif 11 endif
11 12
12 if LIBUSB1_COMPILE 13 if LIBUSB1_COMPILE
13 libmtp_la_SOURCES += libusb1-glue.c 14 libmtp_la_SOURCES += libusb1-glue.c
14 endif 15 endif
15 16
16 if LIBUSB0_COMPILE 17 if LIBUSB0_COMPILE
(...skipping 22 matching lines...) Expand all
39 # precedence over adding, so set to 0 if both happened. 40 # precedence over adding, so set to 0 if both happened.
40 # It denotes upward compatibility. 41 # It denotes upward compatibility.
41 # - REVISION (Minor): Increment any time the source changes; set to 42 # - REVISION (Minor): Increment any time the source changes; set to
42 # 0 if you incremented CURRENT. 43 # 0 if you incremented CURRENT.
43 # 44 #
44 # To summarize. Any interface *change* increment CURRENT. If that interface 45 # To summarize. Any interface *change* increment CURRENT. If that interface
45 # change does not break upward compatibility (ie it is an addition), 46 # change does not break upward compatibility (ie it is an addition),
46 # increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed, 47 # increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed,
47 # REVISION is set to 0, otherwise REVISION is incremented. 48 # REVISION is set to 0, otherwise REVISION is incremented.
48 # --------------------------------------------------------------------------- 49 # ---------------------------------------------------------------------------
49 CURRENT=9 50 CURRENT=12
50 AGE=0 51 AGE=3
51 REVISION=5 52 REVISION=0
52 SOVERSION=$(CURRENT):$(REVISION):$(AGE) 53 SOVERSION=$(CURRENT):$(REVISION):$(AGE)
53 LT_CURRENT_MINUS_AGE=`expr $(CURRENT) - $(AGE)` 54 LT_CURRENT_MINUS_AGE=`expr $(CURRENT) - $(AGE)`
54 55
55 if COMPILE_MINGW32 56 if COMPILE_MINGW32
56 W32_LIBS=-lws2_32 57 W32_LIBS=-lws2_32
57 W32_LDFLAGS=-export-dynamic 58 W32_LDFLAGS=-export-dynamic
58 if MS_LIB_EXE 59 if MS_LIB_EXE
59 noinst_DATA=libmtp.lib 60 noinst_DATA=libmtp.lib
60 libmtp.def: $(srcdir)/libmtp.sym 61 libmtp.def: $(srcdir)/libmtp.sym
61 echo "LIBRARY \"@PACKAGE@\"" > libmtp.def 62 echo "LIBRARY \"@PACKAGE@\"" > libmtp.def
62 echo "DESCRIPTION \"Media Transfer Protocol (MTP) library\"" >> libmtp.d ef 63 echo "DESCRIPTION \"Media Transfer Protocol (MTP) library\"" >> libmtp.d ef
63 echo "VERSION @VERSION@" >> libmtp.def 64 echo "VERSION @VERSION@" >> libmtp.def
64 echo >> libmtp.def 65 echo >> libmtp.def
65 echo "EXPORTS" >> libmtp.def 66 echo "EXPORTS" >> libmtp.def
66 cat $< >> libmtp.def 67 cat $< >> libmtp.def
67 libmtp.lib: libmtp.la libmtp.def 68 libmtp.lib: libmtp.la libmtp.def
68 lib -name:libmtp-$(LT_CURRENT_MINUS_AGE).dll -def:libmtp.def -out:$@ 69 lib -name:libmtp-$(LT_CURRENT_MINUS_AGE).dll -def:libmtp.def -out:$@
69 install-data-local: libmtp.lib libmtp.def 70 install-data-local: libmtp.lib libmtp.def
70 $(INSTALL) libmtp.def $(DESTDIR)$(libdir) 71 $(INSTALL) libmtp.def $(DESTDIR)$(libdir)
71 $(INSTALL) libmtp.lib $(DESTDIR)$(libdir) 72 $(INSTALL) libmtp.lib $(DESTDIR)$(libdir)
72 endif 73 endif
73 endif 74 endif
74 75
75 libmtp_la_LDFLAGS=@LDFLAGS@ -no-undefined -export-symbols $(srcdir)/libmtp.sym - version-info $(SOVERSION) $(W32_LDFLAGS) 76 libmtp_la_LDFLAGS=@LDFLAGS@ -no-undefined -export-symbols $(srcdir)/libmtp.sym - version-info $(SOVERSION) $(W32_LDFLAGS)
76 libmtp_la_LIBADD=$(W32_LIBS) $(LTLIBICONV) @LIBUSB_LIBS@ 77 libmtp_la_LIBADD=$(W32_LIBS) $(LTLIBICONV) @LIBUSB_LIBS@
77 libmtp_la_DEPENDENCIES=$(srcdir)/libmtp.sym 78 libmtp_la_DEPENDENCIES=$(srcdir)/libmtp.sym
78 79
79 DISTCLEANFILES = _stdint.h gphoto2-endian.h 80 DISTCLEANFILES = _stdint.h gphoto2-endian.h
OLDNEW
« no previous file with comments | « patches/21_fix_build_with_new_glibc.patch ('k') | src/Makefile.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698