Unfold automake variables into multiple lines for maintainability

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_LDFLAGS = $(libusbmuxd_LIBS) $(libplist_LIBS) ${libpthread_LIBS}
+AM_CFLAGS = \
+	$(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 \
-		       thread.c thread.h \
-		       debug.c debug.h \
-		       userpref.c userpref.h \
-		       utils.c utils.h
+	socket.c socket.h \
+	thread.c thread.h \
+	debug.c debug.h \
+	userpref.c userpref.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_LIBS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(openssl_LIBS) $(libplist_LIBS) $(PTHREAD_LIBS)
+AM_CFLAGS = \
+	$(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 =					\
-	lockdown.pxi				\
-	mobilesync.pxi				\
-	notification_proxy.pxi		\
-	sbservices.pxi				\
-	mobilebackup.pxi			\
-	mobilebackup2.pxi			\
-	afc.pxi						\
-	file_relay.pxi				\
-	screenshotr.pxi				\
-	installation_proxy.pxi		\
-	webinspector.pxi			\
-	heartbeat.pxi				\
-	diagnostics_relay.pxi		\
-	misagent.pxi				\
-	house_arrest.pxi			\
-	restore.pxi					\
-	mobile_image_mounter.pxi    \
+PXIINCLUDES = \
+	lockdown.pxi \
+	mobilesync.pxi \
+	notification_proxy.pxi \
+	sbservices.pxi \
+	mobilebackup.pxi \
+	mobilebackup2.pxi \
+	afc.pxi \
+	file_relay.pxi \
+	screenshotr.pxi \
+	installation_proxy.pxi \
+	webinspector.pxi \
+	heartbeat.pxi \
+	diagnostics_relay.pxi \
+	misagent.pxi \
+	house_arrest.pxi \
+	restore.pxi \
+	mobile_image_mounter.pxi \
 	debugserver.pxi
 
-CLEANFILES =		\
-	*.pyc			\
-	*.pyo			\
+CLEANFILES = \
+	*.pyc \
+	*.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 \
-			 libimobiledevice/lockdown.h \
-			 libimobiledevice/afc.h \
-			 libimobiledevice/file_relay.h \
-			 libimobiledevice/notification_proxy.h \
-			 libimobiledevice/installation_proxy.h \
-			 libimobiledevice/sbservices.h \
-			 libimobiledevice/mobile_image_mounter.h \
-			 libimobiledevice/screenshotr.h \
-			 libimobiledevice/mobilesync.h \
-			 libimobiledevice/mobilebackup.h \
-			 libimobiledevice/house_arrest.h \
-			 libimobiledevice/mobilebackup2.h \
-			 libimobiledevice/misagent.h \
-			 libimobiledevice/restore.h\
-			 libimobiledevice/webinspector.h\
-			 libimobiledevice/heartbeat.h\
-			 libimobiledevice/diagnostics_relay.h\
-			 libimobiledevice/debugserver.h\
-			 libimobiledevice/syslog_relay.h\
-			 libimobiledevice/mobileactivation.h\
-			 libimobiledevice/preboard.h\
-			 libimobiledevice/companion_proxy.h\
-			 libimobiledevice/property_list_service.h\
-			 libimobiledevice/service.h
+nobase_include_HEADERS = \
+	libimobiledevice/libimobiledevice.h \
+	libimobiledevice/lockdown.h \
+	libimobiledevice/afc.h \
+	libimobiledevice/file_relay.h \
+	libimobiledevice/notification_proxy.h \
+	libimobiledevice/installation_proxy.h \
+	libimobiledevice/sbservices.h \
+	libimobiledevice/mobile_image_mounter.h \
+	libimobiledevice/screenshotr.h \
+	libimobiledevice/mobilesync.h \
+	libimobiledevice/mobilebackup.h \
+	libimobiledevice/house_arrest.h \
+	libimobiledevice/mobilebackup2.h \
+	libimobiledevice/misagent.h \
+	libimobiledevice/restore.h \
+	libimobiledevice/webinspector.h \
+	libimobiledevice/heartbeat.h \
+	libimobiledevice/diagnostics_relay.h \
+	libimobiledevice/debugserver.h \
+	libimobiledevice/syslog_relay.h \
+	libimobiledevice/mobileactivation.h \
+	libimobiledevice/preboard.h \
+	libimobiledevice/companion_proxy.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_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS) $(openssl_LIBS) $(PTHREAD_LIBS)
+AM_CFLAGS = \
+	$(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 \
-		       service.c service.h\
-		       property_list_service.c property_list_service.h\
-		       device_link_service.c device_link_service.h\
-		       lockdown.c lockdown.h\
-		       afc.c afc.h\
-		       file_relay.c file_relay.h\
-		       notification_proxy.c notification_proxy.h\
-		       installation_proxy.c installation_proxy.h\
-		       sbservices.c sbservices.h\
-		       mobile_image_mounter.c mobile_image_mounter.h\
-		       screenshotr.c screenshotr.h\
-		       mobilesync.c mobilesync.h\
-		       mobilebackup.c mobilebackup.h\
-		       house_arrest.c house_arrest.h\
-		       mobilebackup2.c mobilebackup2.h\
-		       misagent.c misagent.h\
-		       restore.c restore.h\
-		       diagnostics_relay.c diagnostics_relay.h\
-		       heartbeat.c heartbeat.h\
-		       debugserver.c debugserver.h\
-		       webinspector.c webinspector.h\
-		       mobileactivation.c mobileactivation.h\
-		       preboard.c preboard.h \
-		       companion_proxy.c companion_proxy.h \
-		       syslog_relay.c syslog_relay.h
+libimobiledevice_la_SOURCES = \
+	idevice.c idevice.h \
+	service.c service.h \
+	property_list_service.c property_list_service.h \
+	device_link_service.c device_link_service.h \
+	lockdown.c lockdown.h \
+	afc.c afc.h \
+	file_relay.c file_relay.h \
+	notification_proxy.c notification_proxy.h \
+	installation_proxy.c installation_proxy.h \
+	sbservices.c sbservices.h \
+	mobile_image_mounter.c mobile_image_mounter.h \
+	screenshotr.c screenshotr.h \
+	mobilesync.c mobilesync.h \
+	mobilebackup.c mobilebackup.h \
+	house_arrest.c house_arrest.h \
+	mobilebackup2.c mobilebackup2.h \
+	misagent.c misagent.h \
+	restore.c restore.h \
+	diagnostics_relay.c diagnostics_relay.h \
+	heartbeat.c heartbeat.h \
+	debugserver.c debugserver.h \
+	webinspector.c webinspector.h \
+	mobileactivation.c mobileactivation.h \
+	preboard.c preboard.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_CFLAGS = $(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
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)
+
+AM_CFLAGS = \
+	$(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)