← Back to branch summary

~ubuntu-branches/ubuntu/wily/libimobiledevice/wily

« back to all changes in this revision

Viewing changes to tools/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki, Matthias Niess, Timo Jyrinki
  • Date: 2014-03-14 08:44:15 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20140314084415-twglhjx6bqzmir8v
Tags: 1.1.5+git20140313.bafe6a9e-0ubuntu1
https://launchpad.net/bugs/1207812
[ Matthias Niess ]
* Replace a duplicate 'backup' util man page with the one for 'crashreport'

[ Timo Jyrinki ]
* New upstream snapshot. (LP: #1207812)
* Drop patches include in the upstream snapshot:
  - debian/patches/CVE-2013-2142.patch
  - debian/patches/git_explicitly_cast_ssl_enabled.patch
* Drop the python patch, new upstream method seems to work:
  - debian/patches/09_use_python_config.patch
* Refreshed remaining patches:
  - debian/patches/01-libs.private.patch
  - debian/patches/02-fix-link-errors.patch
* Drop libimobiledevice-doc, the git does not include html documentation
* Updated libimobiledevice4.symbols 
* Add missing man page for the 'idevicename' util

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/Makefile.am
1
1
AM_CPPFLAGS = -I$(top_srcdir)/include
2
2
 
3
 
AM_CFLAGS = $(GLOBAL_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(openssl_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS)
4
 
AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(openssl_LIBS) $(libplist_LIBS) $(libgcrypt_LIBS)
 
3
AM_CFLAGS = $(GLOBAL_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgcrypt_CFLAGS) $(openssl_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS)
 
4
AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgcrypt_LIBS) $(openssl_LIBS) $(libplist_LIBS) $(libgcrypt_LIBS)
5
5
 
6
 
bin_PROGRAMS = idevice_id ideviceinfo idevicepair idevicesyslog ideviceimagemounter idevicescreenshot ideviceenterrecovery idevicedate idevicebackup idevicebackup2 ideviceprovision idevicedebugserverproxy idevicediagnostics
 
6
bin_PROGRAMS = idevice_id ideviceinfo idevicename idevicepair idevicesyslog ideviceimagemounter idevicescreenshot ideviceenterrecovery idevicedate idevicebackup idevicebackup2 ideviceprovision idevicedebugserverproxy idevicediagnostics
7
7
 
8
8
ideviceinfo_SOURCES = ideviceinfo.c
9
9
ideviceinfo_CFLAGS = $(AM_CFLAGS)
10
10
ideviceinfo_LDFLAGS = $(AM_LDFLAGS)
11
11
ideviceinfo_LDADD = ../src/libimobiledevice.la
12
12
 
 
13
idevicename_SOURCES = idevicename.c
 
14
idevicename_CFLAGS = $(AM_CFLAGS)
 
15
idevicename_LDFLAGS = $(AM_LDFLAGS)
 
16
idevicename_LDADD = ../src/libimobiledevice.la
 
17
 
13
18
idevicepair_SOURCES = idevicepair.c
14
 
idevicepair_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src
15
 
idevicepair_LDFLAGS = $(AM_LDFLAGS)
 
19
idevicepair_CFLAGS = $(AM_CFLAGS)
 
20
idevicepair_LDFLAGS = $(top_srcdir)/common/libinternalcommon.la $(AM_LDFLAGS)
16
21
idevicepair_LDADD = ../src/libimobiledevice.la
17
22
 
18
23
idevicesyslog_SOURCES = idevicesyslog.c
60
65
ideviceprovision_LDFLAGS = $(AM_LDFLAGS)
61
66
ideviceprovision_LDADD = ../src/libimobiledevice.la
62
67
 
63
 
idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c socket.c thread.c
 
68
idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c
64
69
idevicedebugserverproxy_CFLAGS = $(AM_CFLAGS)
65
 
idevicedebugserverproxy_LDFLAGS = $(AM_LDFLAGS)
 
70
idevicedebugserverproxy_LDFLAGS = $(top_srcdir)/common/libinternalcommon.la $(AM_LDFLAGS)
66
71
idevicedebugserverproxy_LDADD = ../src/libimobiledevice.la
67
72
 
68
73
idevicediagnostics_SOURCES = idevicediagnostics.c
70
75
idevicediagnostics_LDFLAGS = $(AM_LDFLAGS)
71
76
idevicediagnostics_LDADD = ../src/libimobiledevice.la
72
77
 
73
 
EXTRA_DIST = socket.h thread.h
 
78
if !WIN32
 
79
bin_PROGRAMS += idevicecrashreport
 
80
idevicecrashreport_SOURCES = idevicecrashreport.c
 
81
idevicecrashreport_CFLAGS = $(AM_CFLAGS)
 
82
idevicecrashreport_LDFLAGS = $(top_srcdir)/common/libinternalcommon.la $(AM_LDFLAGS)
 
83
idevicecrashreport_LDADD = ../src/libimobiledevice.la
 
84
endif