Unfold automake variables into multiple lines for maintainability

author: Martin Szulecki 2020-06-08 18:54:10 +0200
committer: Martin Szulecki 2020-06-08 19:09:18 +0200
commit: f5c963b8c1b8a62c41c081767aec3ab4e1ae5690 (patch)
tree: 963aa91195c24778624445764e3c6f2d36bc449f
parent: 960fb407eb362bb0e90326a30a984c1af1e5b0dd (diff)
download: libimobiledevice-f5c963b8c1b8a62c41c081767aec3ab4e1ae5690.tar.gz
libimobiledevice-f5c963b8c1b8a62c41c081767aec3ab4e1ae5690.tar.bz2
6 files changed, 198 insertions, 95 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 054e2a1..4e3facb 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,17 +1,30 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
+AM_CPPFLAGS = \
+        -I$(top_srcdir)/include \
+        -I$(top_srcdir)
-AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libplist_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(openssl_CFLAGS) $(LFS_CFLAGS)
+AM_CFLAGS = \
-AM_LDFLAGS = $(libusbmuxd_LIBS) $(libplist_LIBS) ${libpthread_LIBS}
+        $(GLOBAL_CFLAGS) \
+        $(libusbmuxd_CFLAGS) \
+        $(libplist_CFLAGS) \
+        $(libgnutls_CFLAGS) \
+        $(libtasn1_CFLAGS) \
+        $(openssl_CFLAGS) \
+        $(LFS_CFLAGS)
+AM_LDFLAGS = \
+        $(libusbmuxd_LIBS) \
+        $(libplist_LIBS) \
+        ${libpthread_LIBS}
 noinst_LTLIBRARIES = libinternalcommon.la
 libinternalcommon_la_LIBADD = 
 libinternalcommon_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
 libinternalcommon_la_SOURCES = \
-                       socket.c socket.h \
+        socket.c socket.h \
-                       thread.c thread.h \
+        thread.c thread.h \
-                       debug.c debug.h \
+        debug.c debug.h \
-                       userpref.c userpref.h \
+        userpref.c userpref.h \
-                       utils.c utils.h
+        utils.c utils.h
 if WIN32
 libinternalcommon_la_LIBADD += -lole32 -lws2_32
diff --git a/cython/Makefile.am b/cython/Makefile.am
index 4dbd6fa..7e1b31a 100644
--- a/cython/Makefile.am
+++ b/cython/Makefile.am
@@ -1,38 +1,55 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+        -I$(top_srcdir)/include
-AM_CFLAGS = $(GLOBAL_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(openssl_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS) $(PTHREAD_CFLAGS)
+AM_CFLAGS = \
-AM_LIBS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(openssl_LIBS) $(libplist_LIBS) $(PTHREAD_LIBS)
+        $(GLOBAL_CFLAGS) \
+        $(libgnutls_CFLAGS) \
+        $(libtasn1_CFLAGS) \
+        $(openssl_CFLAGS) \
+        $(libplist_CFLAGS) \
+        $(LFS_CFLAGS) \
+        $(PTHREAD_CFLAGS)
+AM_LIBS = \
+        $(libgnutls_LIBS) \
+        $(libtasn1_LIBS) \
+        $(openssl_LIBS) \
+        $(libplist_LIBS) \
+        $(PTHREAD_LIBS)
 if HAVE_CYTHON
 BUILT_SOURCES = imobiledevice.c
 PXDINCLUDES = imobiledevice.pxd $(CYTHON_PLIST_INCLUDE_DIR)/plist.pxd
-PXIINCLUDES =                                   \
+PXIINCLUDES = \
-        lockdown.pxi                            \
+        lockdown.pxi \
-        mobilesync.pxi                          \
+        mobilesync.pxi \
-        notification_proxy.pxi          \
+        notification_proxy.pxi \
-        sbservices.pxi                          \
+        sbservices.pxi \
-        mobilebackup.pxi                        \
+        mobilebackup.pxi \
-        mobilebackup2.pxi                       \
+        mobilebackup2.pxi \
-        afc.pxi                                         \
+        afc.pxi \
-        file_relay.pxi                          \
+        file_relay.pxi \
-        screenshotr.pxi                         \
+        screenshotr.pxi \
-        installation_proxy.pxi          \
+        installation_proxy.pxi \
-        webinspector.pxi                        \
+        webinspector.pxi \
-        heartbeat.pxi                           \
+        heartbeat.pxi \
-        diagnostics_relay.pxi           \
+        diagnostics_relay.pxi \
-        misagent.pxi                            \
+        misagent.pxi \
-        house_arrest.pxi                        \
+        house_arrest.pxi \
-        restore.pxi                                     \
+        restore.pxi \
-        mobile_image_mounter.pxi    \
+        mobile_image_mounter.pxi \
        debugserver.pxi
-CLEANFILES =            \
+CLEANFILES = \
-        *.pyc                   \
+        *.pyc \
-        *.pyo                   \
+        *.pyo \
        imobiledevice.c
-EXTRA_DIST = imobiledevice.pyx imobiledevice.pxd $(PXIINCLUDES)
+EXTRA_DIST = \
+        imobiledevice.pyx \
+        imobiledevice.pxd \
+        $(PXIINCLUDES)
 imobiledevicedir = $(pyexecdir)
 imobiledevice_LTLIBRARIES = imobiledevice.la
diff --git a/docs/Makefile.am b/docs/Makefile.am
index d355ac0..5ed81fe 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,22 @@
-man_MANS = idevice_id.1 ideviceinfo.1 idevicesyslog.1 idevicebackup.1 idevicebackup2.1 ideviceimagemounter.1 idevicescreenshot.1 idevicepair.1 ideviceenterrecovery.1 idevicedate.1 ideviceprovision.1 idevicedebugserverproxy.1 idevicediagnostics.1 idevicecrashreport.1 idevicename.1 idevicedebug.1 idevicenotificationproxy.1 idevicesetlocation.1
+man_MANS = \
+        idevice_id.1 \
+        ideviceinfo.1 \
+        idevicesyslog.1 \
+        idevicebackup.1 \
+        idevicebackup2.1 \
+        ideviceimagemounter.1 \
+        idevicescreenshot.1 \
+        idevicepair.1 \
+        ideviceenterrecovery.1 \
+        idevicedate.1 \
+        ideviceprovision.1 \
+        idevicedebugserverproxy.1 \
+        idevicediagnostics.1 \
+        idevicecrashreport.1 \
+        idevicename.1 \
+        idevicedebug.1 \
+        idevicenotificationproxy.1 \
+        idevicesetlocation.1
 EXTRA_DIST = $(man_MANS)
diff --git a/include/Makefile.am b/include/Makefile.am
index e48bb95..e23b2a9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,27 +1,30 @@
-EXTRA_DIST = asprintf.h endianness.h
+EXTRA_DIST = \
+        asprintf.h \
+        endianness.h
-nobase_include_HEADERS = libimobiledevice/libimobiledevice.h \
+nobase_include_HEADERS = \
-                         libimobiledevice/lockdown.h \
+        libimobiledevice/libimobiledevice.h \
-                         libimobiledevice/afc.h \
+        libimobiledevice/lockdown.h \
-                         libimobiledevice/file_relay.h \
+        libimobiledevice/afc.h \
-                         libimobiledevice/notification_proxy.h \
+        libimobiledevice/file_relay.h \
-                         libimobiledevice/installation_proxy.h \
+        libimobiledevice/notification_proxy.h \
-                         libimobiledevice/sbservices.h \
+        libimobiledevice/installation_proxy.h \
-                         libimobiledevice/mobile_image_mounter.h \
+        libimobiledevice/sbservices.h \
-                         libimobiledevice/screenshotr.h \
+        libimobiledevice/mobile_image_mounter.h \
-                         libimobiledevice/mobilesync.h \
+        libimobiledevice/screenshotr.h \
-                         libimobiledevice/mobilebackup.h \
+        libimobiledevice/mobilesync.h \
-                         libimobiledevice/house_arrest.h \
+        libimobiledevice/mobilebackup.h \
-                         libimobiledevice/mobilebackup2.h \
+        libimobiledevice/house_arrest.h \
-                         libimobiledevice/misagent.h \
+        libimobiledevice/mobilebackup2.h \
-                         libimobiledevice/restore.h\
+        libimobiledevice/misagent.h \
-                         libimobiledevice/webinspector.h\
+        libimobiledevice/restore.h \
-                         libimobiledevice/heartbeat.h\
+        libimobiledevice/webinspector.h \
-                         libimobiledevice/diagnostics_relay.h\
+        libimobiledevice/heartbeat.h \
-                         libimobiledevice/debugserver.h\
+        libimobiledevice/diagnostics_relay.h \
-                         libimobiledevice/syslog_relay.h\
+        libimobiledevice/debugserver.h \
-                         libimobiledevice/mobileactivation.h\
+        libimobiledevice/syslog_relay.h \
-                         libimobiledevice/preboard.h\
+        libimobiledevice/mobileactivation.h \
-                         libimobiledevice/companion_proxy.h\
+        libimobiledevice/preboard.h \
-                         libimobiledevice/property_list_service.h\
+        libimobiledevice/companion_proxy.h \
-                         libimobiledevice/service.h
+        libimobiledevice/property_list_service.h \
+        libimobiledevice/service.h
diff --git a/src/Makefile.am b/src/Makefile.am
index feabf40..9933277 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,37 +1,56 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
+AM_CPPFLAGS = \
+        -I$(top_srcdir)/include \
+        -I$(top_srcdir)
-AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS) $(openssl_CFLAGS) $(PTHREAD_CFLAGS)
+AM_CFLAGS = \
-AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS) $(openssl_LIBS) $(PTHREAD_LIBS)
+        $(GLOBAL_CFLAGS) \
+        $(libusbmuxd_CFLAGS) \
+        $(libgnutls_CFLAGS) \
+        $(libtasn1_CFLAGS) \
+        $(libplist_CFLAGS) \
+        $(LFS_CFLAGS) \
+        $(openssl_CFLAGS) \
+        $(PTHREAD_CFLAGS)
+AM_LDFLAGS = \
+        $(libgnutls_LIBS) \
+        $(libtasn1_LIBS) \
+        $(libplist_LIBS) \
+        $(libusbmuxd_LIBS) \
+        $(libgcrypt_LIBS) \
+        $(openssl_LIBS) \
+        $(PTHREAD_LIBS)
 lib_LTLIBRARIES = libimobiledevice.la
 libimobiledevice_la_LIBADD = $(top_builddir)/common/libinternalcommon.la
 libimobiledevice_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIMOBILEDEVICE_SO_VERSION) -no-undefined
-libimobiledevice_la_SOURCES = idevice.c idevice.h \
+libimobiledevice_la_SOURCES = \
-                       service.c service.h\
+        idevice.c idevice.h \
-                       property_list_service.c property_list_service.h\
+        service.c service.h \
-                       device_link_service.c device_link_service.h\
+        property_list_service.c property_list_service.h \
-                       lockdown.c lockdown.h\
+        device_link_service.c device_link_service.h \
-                       afc.c afc.h\
+        lockdown.c lockdown.h \
-                       file_relay.c file_relay.h\
+        afc.c afc.h \
-                       notification_proxy.c notification_proxy.h\
+        file_relay.c file_relay.h \
-                       installation_proxy.c installation_proxy.h\
+        notification_proxy.c notification_proxy.h \
-                       sbservices.c sbservices.h\
+        installation_proxy.c installation_proxy.h \
-                       mobile_image_mounter.c mobile_image_mounter.h\
+        sbservices.c sbservices.h \
-                       screenshotr.c screenshotr.h\
+        mobile_image_mounter.c mobile_image_mounter.h \
-                       mobilesync.c mobilesync.h\
+        screenshotr.c screenshotr.h \
-                       mobilebackup.c mobilebackup.h\
+        mobilesync.c mobilesync.h \
-                       house_arrest.c house_arrest.h\
+        mobilebackup.c mobilebackup.h \
-                       mobilebackup2.c mobilebackup2.h\
+        house_arrest.c house_arrest.h \
-                       misagent.c misagent.h\
+        mobilebackup2.c mobilebackup2.h \
-                       restore.c restore.h\
+        misagent.c misagent.h \
-                       diagnostics_relay.c diagnostics_relay.h\
+        restore.c restore.h \
-                       heartbeat.c heartbeat.h\
+        diagnostics_relay.c diagnostics_relay.h \
-                       debugserver.c debugserver.h\
+        heartbeat.c heartbeat.h \
-                       webinspector.c webinspector.h\
+        debugserver.c debugserver.h \
-                       mobileactivation.c mobileactivation.h\
+        webinspector.c webinspector.h \
-                       preboard.c preboard.h \
+        mobileactivation.c mobileactivation.h \
-                       companion_proxy.c companion_proxy.h \
+        preboard.c preboard.h  \
-                       syslog_relay.c syslog_relay.h
+        companion_proxy.c companion_proxy.h \
+        syslog_relay.c syslog_relay.h
 if WIN32
 libimobiledevice_la_LDFLAGS += -avoid-version -static-libgcc
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 726dc18..7e6487f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,9 +1,42 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
+AM_CPPFLAGS = \
+        -I$(top_srcdir)/include \
-AM_CFLAGS = $(GLOBAL_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgcrypt_CFLAGS) $(openssl_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS)
+        -I$(top_srcdir)
-AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgcrypt_LIBS) $(openssl_LIBS) $(libplist_LIBS)
+AM_CFLAGS = \
-bin_PROGRAMS = idevice_id ideviceinfo idevicename idevicepair idevicesyslog ideviceimagemounter idevicescreenshot ideviceenterrecovery idevicedate idevicebackup idevicebackup2 ideviceprovision idevicedebugserverproxy idevicediagnostics idevicedebug idevicenotificationproxy idevicecrashreport idevicesetlocation
+        $(GLOBAL_CFLAGS) \
+        $(libgnutls_CFLAGS) \
+        $(libtasn1_CFLAGS) \
+        $(libgcrypt_CFLAGS) \
+        $(openssl_CFLAGS) \
+        $(libplist_CFLAGS) \
+        $(LFS_CFLAGS)
+AM_LDFLAGS = \
+        $(libgnutls_LIBS) \
+        $(libtasn1_LIBS) \
+        $(libgcrypt_LIBS) \
+        $(openssl_LIBS) \
+        $(libplist_LIBS)
+bin_PROGRAMS = \
+        idevice_id \
+        ideviceinfo \
+        idevicename \
+        idevicepair \
+        idevicesyslog \
+        ideviceimagemounter \
+        idevicescreenshot \
+        ideviceenterrecovery \
+        idevicedate \
+        idevicebackup \
+        idevicebackup2 \
+        ideviceprovision \
+        idevicedebugserverproxy \
+        idevicediagnostics \
+        idevicedebug \
+        idevicenotificationproxy \
+        idevicecrashreport \
+        idevicesetlocation
 ideviceinfo_SOURCES = ideviceinfo.c
 ideviceinfo_CFLAGS = $(AM_CFLAGS)
author	Martin Szulecki	2020-06-08 18:54:10 +0200
committer	Martin Szulecki	2020-06-08 19:09:18 +0200
commit	f5c963b8c1b8a62c41c081767aec3ab4e1ae5690 (patch)
tree	963aa91195c24778624445764e3c6f2d36bc449f
parent	960fb407eb362bb0e90326a30a984c1af1e5b0dd (diff)
download	libimobiledevice-f5c963b8c1b8a62c41c081767aec3ab4e1ae5690.tar.gz libimobiledevice-f5c963b8c1b8a62c41c081767aec3ab4e1ae5690.tar.bz2

diff --git a/common/Makefile.am b/common/Makefile.am index 054e2a1..4e3facb 100644 --- a/common/Makefile.am +++ b/common/Makefile.am
@@ -1,17 +1,30 @@
1	AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)	1	AM_CPPFLAGS = \
		2	-I$(top_srcdir)/include \
		3	-I$(top_srcdir)
2		4
3	AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libplist_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(openssl_CFLAGS) $(LFS_CFLAGS)	5	AM_CFLAGS = \
4	AM_LDFLAGS = $(libusbmuxd_LIBS) $(libplist_LIBS) ${libpthread_LIBS}	6	$(GLOBAL_CFLAGS) \
		7	$(libusbmuxd_CFLAGS) \
		8	$(libplist_CFLAGS) \
		9	$(libgnutls_CFLAGS) \
		10	$(libtasn1_CFLAGS) \
		11	$(openssl_CFLAGS) \
		12	$(LFS_CFLAGS)
		13
		14	AM_LDFLAGS = \
		15	$(libusbmuxd_LIBS) \
		16	$(libplist_LIBS) \
		17	${libpthread_LIBS}
5		18
6	noinst_LTLIBRARIES = libinternalcommon.la	19	noinst_LTLIBRARIES = libinternalcommon.la
7	libinternalcommon_la_LIBADD =	20	libinternalcommon_la_LIBADD =
8	libinternalcommon_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined	21	libinternalcommon_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
9	libinternalcommon_la_SOURCES = \	22	libinternalcommon_la_SOURCES = \
10	socket.c socket.h \	23	socket.c socket.h \
11	thread.c thread.h \	24	thread.c thread.h \
12	debug.c debug.h \	25	debug.c debug.h \
13	userpref.c userpref.h \	26	userpref.c userpref.h \
14	utils.c utils.h	27	utils.c utils.h
15		28
16	if WIN32	29	if WIN32
17	libinternalcommon_la_LIBADD += -lole32 -lws2_32	30	libinternalcommon_la_LIBADD += -lole32 -lws2_32


diff --git a/cython/Makefile.am b/cython/Makefile.am index 4dbd6fa..7e1b31a 100644 --- a/cython/Makefile.am +++ b/cython/Makefile.am
@@ -1,38 +1,55 @@
1	AM_CPPFLAGS = -I$(top_srcdir)/include	1	AM_CPPFLAGS = \
		2	-I$(top_srcdir)/include
2		3
3	AM_CFLAGS = $(GLOBAL_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(openssl_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS) $(PTHREAD_CFLAGS)	4	AM_CFLAGS = \
4	AM_LIBS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(openssl_LIBS) $(libplist_LIBS) $(PTHREAD_LIBS)	5	$(GLOBAL_CFLAGS) \
		6	$(libgnutls_CFLAGS) \
		7	$(libtasn1_CFLAGS) \
		8	$(openssl_CFLAGS) \
		9	$(libplist_CFLAGS) \
		10	$(LFS_CFLAGS) \
		11	$(PTHREAD_CFLAGS)
		12
		13	AM_LIBS = \
		14	$(libgnutls_LIBS) \
		15	$(libtasn1_LIBS) \
		16	$(openssl_LIBS) \
		17	$(libplist_LIBS) \
		18	$(PTHREAD_LIBS)
5		19
6	if HAVE_CYTHON	20	if HAVE_CYTHON
7		21
8	BUILT_SOURCES = imobiledevice.c	22	BUILT_SOURCES = imobiledevice.c
9	PXDINCLUDES = imobiledevice.pxd $(CYTHON_PLIST_INCLUDE_DIR)/plist.pxd	23	PXDINCLUDES = imobiledevice.pxd $(CYTHON_PLIST_INCLUDE_DIR)/plist.pxd
10	PXIINCLUDES = \	24	PXIINCLUDES = \
11	lockdown.pxi \	25	lockdown.pxi \
12	mobilesync.pxi \	26	mobilesync.pxi \
13	notification_proxy.pxi \	27	notification_proxy.pxi \
14	sbservices.pxi \	28	sbservices.pxi \
15	mobilebackup.pxi \	29	mobilebackup.pxi \
16	mobilebackup2.pxi \	30	mobilebackup2.pxi \
17	afc.pxi \	31	afc.pxi \
18	file_relay.pxi \	32	file_relay.pxi \
19	screenshotr.pxi \	33	screenshotr.pxi \
20	installation_proxy.pxi \	34	installation_proxy.pxi \
21	webinspector.pxi \	35	webinspector.pxi \
22	heartbeat.pxi \	36	heartbeat.pxi \
23	diagnostics_relay.pxi \	37	diagnostics_relay.pxi \
24	misagent.pxi \	38	misagent.pxi \
25	house_arrest.pxi \	39	house_arrest.pxi \
26	restore.pxi \	40	restore.pxi \
27	mobile_image_mounter.pxi \	41	mobile_image_mounter.pxi \
28	debugserver.pxi	42	debugserver.pxi
29		43
30	CLEANFILES = \	44	CLEANFILES = \
31	*.pyc \	45	*.pyc \
32	*.pyo \	46	*.pyo \
33	imobiledevice.c	47	imobiledevice.c
34		48
35	EXTRA_DIST = imobiledevice.pyx imobiledevice.pxd $(PXIINCLUDES)	49	EXTRA_DIST = \
		50	imobiledevice.pyx \
		51	imobiledevice.pxd \
		52	$(PXIINCLUDES)
36		53
37	imobiledevicedir = $(pyexecdir)	54	imobiledevicedir = $(pyexecdir)
38	imobiledevice_LTLIBRARIES = imobiledevice.la	55	imobiledevice_LTLIBRARIES = imobiledevice.la


diff --git a/docs/Makefile.am b/docs/Makefile.am index d355ac0..5ed81fe 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am
@@ -1,4 +1,22 @@
1	man_MANS = idevice_id.1 ideviceinfo.1 idevicesyslog.1 idevicebackup.1 idevicebackup2.1 ideviceimagemounter.1 idevicescreenshot.1 idevicepair.1 ideviceenterrecovery.1 idevicedate.1 ideviceprovision.1 idevicedebugserverproxy.1 idevicediagnostics.1 idevicecrashreport.1 idevicename.1 idevicedebug.1 idevicenotificationproxy.1 idevicesetlocation.1	1	man_MANS = \
		2	idevice_id.1 \
		3	ideviceinfo.1 \
		4	idevicesyslog.1 \
		5	idevicebackup.1 \
		6	idevicebackup2.1 \
		7	ideviceimagemounter.1 \
		8	idevicescreenshot.1 \
		9	idevicepair.1 \
		10	ideviceenterrecovery.1 \
		11	idevicedate.1 \
		12	ideviceprovision.1 \
		13	idevicedebugserverproxy.1 \
		14	idevicediagnostics.1 \
		15	idevicecrashreport.1 \
		16	idevicename.1 \
		17	idevicedebug.1 \
		18	idevicenotificationproxy.1 \
		19	idevicesetlocation.1
2		20
3	EXTRA_DIST = $(man_MANS)	21	EXTRA_DIST = $(man_MANS)
4		22


diff --git a/include/Makefile.am b/include/Makefile.am index e48bb95..e23b2a9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am
@@ -1,27 +1,30 @@
1	EXTRA_DIST = asprintf.h endianness.h	1	EXTRA_DIST = \
		2	asprintf.h \
		3	endianness.h
2		4
3	nobase_include_HEADERS = libimobiledevice/libimobiledevice.h \	5	nobase_include_HEADERS = \
4	libimobiledevice/lockdown.h \	6	libimobiledevice/libimobiledevice.h \
5	libimobiledevice/afc.h \	7	libimobiledevice/lockdown.h \
6	libimobiledevice/file_relay.h \	8	libimobiledevice/afc.h \
7	libimobiledevice/notification_proxy.h \	9	libimobiledevice/file_relay.h \
8	libimobiledevice/installation_proxy.h \	10	libimobiledevice/notification_proxy.h \
9	libimobiledevice/sbservices.h \	11	libimobiledevice/installation_proxy.h \
10	libimobiledevice/mobile_image_mounter.h \	12	libimobiledevice/sbservices.h \
11	libimobiledevice/screenshotr.h \	13	libimobiledevice/mobile_image_mounter.h \
12	libimobiledevice/mobilesync.h \	14	libimobiledevice/screenshotr.h \
13	libimobiledevice/mobilebackup.h \	15	libimobiledevice/mobilesync.h \
14	libimobiledevice/house_arrest.h \	16	libimobiledevice/mobilebackup.h \
15	libimobiledevice/mobilebackup2.h \	17	libimobiledevice/house_arrest.h \
16	libimobiledevice/misagent.h \	18	libimobiledevice/mobilebackup2.h \
17	libimobiledevice/restore.h\	19	libimobiledevice/misagent.h \
18	libimobiledevice/webinspector.h\	20	libimobiledevice/restore.h \
19	libimobiledevice/heartbeat.h\	21	libimobiledevice/webinspector.h \
20	libimobiledevice/diagnostics_relay.h\	22	libimobiledevice/heartbeat.h \
21	libimobiledevice/debugserver.h\	23	libimobiledevice/diagnostics_relay.h \
22	libimobiledevice/syslog_relay.h\	24	libimobiledevice/debugserver.h \
23	libimobiledevice/mobileactivation.h\	25	libimobiledevice/syslog_relay.h \
24	libimobiledevice/preboard.h\	26	libimobiledevice/mobileactivation.h \
25	libimobiledevice/companion_proxy.h\	27	libimobiledevice/preboard.h \
26	libimobiledevice/property_list_service.h\	28	libimobiledevice/companion_proxy.h \
27	libimobiledevice/service.h	29	libimobiledevice/property_list_service.h \
		30	libimobiledevice/service.h


diff --git a/src/Makefile.am b/src/Makefile.am index feabf40..9933277 100644 --- a/src/Makefile.am +++ b/src/Makefile.am
@@ -1,37 +1,56 @@
1	AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)	1	AM_CPPFLAGS = \
		2	-I$(top_srcdir)/include \
		3	-I$(top_srcdir)
2		4
3	AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS) $(openssl_CFLAGS) $(PTHREAD_CFLAGS)	5	AM_CFLAGS = \
4	AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS) $(openssl_LIBS) $(PTHREAD_LIBS)	6	$(GLOBAL_CFLAGS) \
		7	$(libusbmuxd_CFLAGS) \
		8	$(libgnutls_CFLAGS) \
		9	$(libtasn1_CFLAGS) \
		10	$(libplist_CFLAGS) \
		11	$(LFS_CFLAGS) \
		12	$(openssl_CFLAGS) \
		13	$(PTHREAD_CFLAGS)
		14
		15	AM_LDFLAGS = \
		16	$(libgnutls_LIBS) \
		17	$(libtasn1_LIBS) \
		18	$(libplist_LIBS) \
		19	$(libusbmuxd_LIBS) \
		20	$(libgcrypt_LIBS) \
		21	$(openssl_LIBS) \
		22	$(PTHREAD_LIBS)
5		23
6	lib_LTLIBRARIES = libimobiledevice.la	24	lib_LTLIBRARIES = libimobiledevice.la
7	libimobiledevice_la_LIBADD = $(top_builddir)/common/libinternalcommon.la	25	libimobiledevice_la_LIBADD = $(top_builddir)/common/libinternalcommon.la
8	libimobiledevice_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIMOBILEDEVICE_SO_VERSION) -no-undefined	26	libimobiledevice_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIMOBILEDEVICE_SO_VERSION) -no-undefined
9	libimobiledevice_la_SOURCES = idevice.c idevice.h \	27	libimobiledevice_la_SOURCES = \
10	service.c service.h\	28	idevice.c idevice.h \
11	property_list_service.c property_list_service.h\	29	service.c service.h \
12	device_link_service.c device_link_service.h\	30	property_list_service.c property_list_service.h \
13	lockdown.c lockdown.h\	31	device_link_service.c device_link_service.h \
14	afc.c afc.h\	32	lockdown.c lockdown.h \
15	file_relay.c file_relay.h\	33	afc.c afc.h \
16	notification_proxy.c notification_proxy.h\	34	file_relay.c file_relay.h \
17	installation_proxy.c installation_proxy.h\	35	notification_proxy.c notification_proxy.h \
18	sbservices.c sbservices.h\	36	installation_proxy.c installation_proxy.h \
19	mobile_image_mounter.c mobile_image_mounter.h\	37	sbservices.c sbservices.h \
20	screenshotr.c screenshotr.h\	38	mobile_image_mounter.c mobile_image_mounter.h \
21	mobilesync.c mobilesync.h\	39	screenshotr.c screenshotr.h \
22	mobilebackup.c mobilebackup.h\	40	mobilesync.c mobilesync.h \
23	house_arrest.c house_arrest.h\	41	mobilebackup.c mobilebackup.h \
24	mobilebackup2.c mobilebackup2.h\	42	house_arrest.c house_arrest.h \
25	misagent.c misagent.h\	43	mobilebackup2.c mobilebackup2.h \
26	restore.c restore.h\	44	misagent.c misagent.h \
27	diagnostics_relay.c diagnostics_relay.h\	45	restore.c restore.h \
28	heartbeat.c heartbeat.h\	46	diagnostics_relay.c diagnostics_relay.h \
29	debugserver.c debugserver.h\	47	heartbeat.c heartbeat.h \
30	webinspector.c webinspector.h\	48	debugserver.c debugserver.h \
31	mobileactivation.c mobileactivation.h\	49	webinspector.c webinspector.h \
32	preboard.c preboard.h \	50	mobileactivation.c mobileactivation.h \
33	companion_proxy.c companion_proxy.h \	51	preboard.c preboard.h \
34	syslog_relay.c syslog_relay.h	52	companion_proxy.c companion_proxy.h \
		53	syslog_relay.c syslog_relay.h
35		54
36	if WIN32	55	if WIN32
37	libimobiledevice_la_LDFLAGS += -avoid-version -static-libgcc	56	libimobiledevice_la_LDFLAGS += -avoid-version -static-libgcc


diff --git a/tools/Makefile.am b/tools/Makefile.am index 726dc18..7e6487f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am
@@ -1,9 +1,42 @@
1	AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)	1	AM_CPPFLAGS = \
2		2	-I$(top_srcdir)/include \
3	AM_CFLAGS = $(GLOBAL_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgcrypt_CFLAGS) $(openssl_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS)	3	-I$(top_srcdir)
4	AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgcrypt_LIBS) $(openssl_LIBS) $(libplist_LIBS)	4
5		5	AM_CFLAGS = \
6	bin_PROGRAMS = idevice_id ideviceinfo idevicename idevicepair idevicesyslog ideviceimagemounter idevicescreenshot ideviceenterrecovery idevicedate idevicebackup idevicebackup2 ideviceprovision idevicedebugserverproxy idevicediagnostics idevicedebug idevicenotificationproxy idevicecrashreport idevicesetlocation	6	$(GLOBAL_CFLAGS) \
		7	$(libgnutls_CFLAGS) \
		8	$(libtasn1_CFLAGS) \
		9	$(libgcrypt_CFLAGS) \
		10	$(openssl_CFLAGS) \
		11	$(libplist_CFLAGS) \
		12	$(LFS_CFLAGS)
		13
		14	AM_LDFLAGS = \
		15	$(libgnutls_LIBS) \
		16	$(libtasn1_LIBS) \
		17	$(libgcrypt_LIBS) \
		18	$(openssl_LIBS) \
		19	$(libplist_LIBS)
		20
		21	bin_PROGRAMS = \
		22	idevice_id \
		23	ideviceinfo \
		24	idevicename \
		25	idevicepair \
		26	idevicesyslog \
		27	ideviceimagemounter \
		28	idevicescreenshot \
		29	ideviceenterrecovery \
		30	idevicedate \
		31	idevicebackup \
		32	idevicebackup2 \
		33	ideviceprovision \
		34	idevicedebugserverproxy \
		35	idevicediagnostics \
		36	idevicedebug \
		37	idevicenotificationproxy \
		38	idevicecrashreport \
		39	idevicesetlocation
7		40
8	ideviceinfo_SOURCES = ideviceinfo.c	41	ideviceinfo_SOURCES = ideviceinfo.c
9	ideviceinfo_CFLAGS = $(AM_CFLAGS)	42	ideviceinfo_CFLAGS = $(AM_CFLAGS)