1 files changed, 48 insertions, 29 deletions
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/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