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

Side by Side Diff: src/Makefile.am

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 unified diff | Download patch | Annotate | Revision Log
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 6 » music-players.h device-flags.h mtpz.h
7
8 if MTPZ_COMPILE
9 libmtp_la_SOURCES += mtpz.c
10 endif
7 11
8 if LIBUSB1_COMPILE 12 if LIBUSB1_COMPILE
9 libmtp_la_SOURCES += libusb1-glue.c 13 libmtp_la_SOURCES += libusb1-glue.c
10 endif 14 endif
11 15
12 if LIBUSB0_COMPILE 16 if LIBUSB0_COMPILE
13 libmtp_la_SOURCES += libusb-glue.c 17 libmtp_la_SOURCES += libusb-glue.c
14 endif 18 endif
15 19
16 if LIBOPENUSB_COMPILE 20 if LIBOPENUSB_COMPILE
(...skipping 20 matching lines...) Expand all
37 # - REVISION (Minor): Increment any time the source changes; set to 41 # - REVISION (Minor): Increment any time the source changes; set to
38 # 0 if you incremented CURRENT. 42 # 0 if you incremented CURRENT.
39 # 43 #
40 # To summarize. Any interface *change* increment CURRENT. If that interface 44 # To summarize. Any interface *change* increment CURRENT. If that interface
41 # change does not break upward compatibility (ie it is an addition), 45 # change does not break upward compatibility (ie it is an addition),
42 # increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed, 46 # increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed,
43 # REVISION is set to 0, otherwise REVISION is incremented. 47 # REVISION is set to 0, otherwise REVISION is incremented.
44 # --------------------------------------------------------------------------- 48 # ---------------------------------------------------------------------------
45 CURRENT=9 49 CURRENT=9
46 AGE=0 50 AGE=0
47 REVISION=3 51 REVISION=5
48 SOVERSION=$(CURRENT):$(REVISION):$(AGE) 52 SOVERSION=$(CURRENT):$(REVISION):$(AGE)
49 LT_CURRENT_MINUS_AGE=`expr $(CURRENT) - $(AGE)` 53 LT_CURRENT_MINUS_AGE=`expr $(CURRENT) - $(AGE)`
50 54
51 if COMPILE_MINGW32 55 if COMPILE_MINGW32
52 W32_LIBS=-lws2_32 56 W32_LIBS=-lws2_32
53 W32_LDFLAGS=-export-dynamic 57 W32_LDFLAGS=-export-dynamic
54 if MS_LIB_EXE 58 if MS_LIB_EXE
55 noinst_DATA=libmtp.lib 59 noinst_DATA=libmtp.lib
56 libmtp.def: $(srcdir)/libmtp.sym 60 libmtp.def: $(srcdir)/libmtp.sym
57 echo "LIBRARY \"@PACKAGE@\"" > libmtp.def 61 echo "LIBRARY \"@PACKAGE@\"" > libmtp.def
58 echo "DESCRIPTION \"Media Transfer Protocol (MTP) library\"" >> libmtp.d ef 62 echo "DESCRIPTION \"Media Transfer Protocol (MTP) library\"" >> libmtp.d ef
59 echo "VERSION @VERSION@" >> libmtp.def 63 echo "VERSION @VERSION@" >> libmtp.def
60 echo >> libmtp.def 64 echo >> libmtp.def
61 echo "EXPORTS" >> libmtp.def 65 echo "EXPORTS" >> libmtp.def
62 cat $< >> libmtp.def 66 cat $< >> libmtp.def
63 libmtp.lib: libmtp.la libmtp.def 67 libmtp.lib: libmtp.la libmtp.def
64 lib -name:libmtp-$(LT_CURRENT_MINUS_AGE).dll -def:libmtp.def -out:$@ 68 lib -name:libmtp-$(LT_CURRENT_MINUS_AGE).dll -def:libmtp.def -out:$@
65 install-data-local: libmtp.lib libmtp.def 69 install-data-local: libmtp.lib libmtp.def
66 $(INSTALL) libmtp.def $(DESTDIR)$(libdir) 70 $(INSTALL) libmtp.def $(DESTDIR)$(libdir)
67 $(INSTALL) libmtp.lib $(DESTDIR)$(libdir) 71 $(INSTALL) libmtp.lib $(DESTDIR)$(libdir)
68 endif 72 endif
69 endif 73 endif
70 74
71 libmtp_la_LDFLAGS=@LDFLAGS@ -no-undefined -export-symbols $(srcdir)/libmtp.sym - version-info $(SOVERSION) $(W32_LDFLAGS) 75 libmtp_la_LDFLAGS=@LDFLAGS@ -no-undefined -export-symbols $(srcdir)/libmtp.sym - version-info $(SOVERSION) $(W32_LDFLAGS)
72 libmtp_la_LIBADD=$(W32_LIBS) $(LTLIBICONV) @LIBUSB_LIBS@ 76 libmtp_la_LIBADD=$(W32_LIBS) $(LTLIBICONV) @LIBUSB_LIBS@
73 libmtp_la_DEPENDENCIES=$(srcdir)/libmtp.sym 77 libmtp_la_DEPENDENCIES=$(srcdir)/libmtp.sym
74 78
75 DISTCLEANFILES = _stdint.h gphoto2-endian.h 79 DISTCLEANFILES = _stdint.h gphoto2-endian.h
OLDNEW
« config.h ('K') | « patches/13_cherrypick_15d18e31.patch ('k') | src/Makefile.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698