package: indentation cleanup

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-24 08:54:24 +01:00 · 2014-12-24 08:54:24 +01:00 · 38f09d6873
parent 7163d7f5e7
commit 38f09d6873
26 changed files with 296 additions and 220 deletions
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@ -42,10 +42,13 @@ endif
 # they also contain the gdb sources, but gdb shouldn't be built, so we
 # disable it.
 BINUTILS_DISABLE_GDB_CONF_OPTS = \
-	--disable-sim --disable-gdb
+	--disable-sim \
+	--disable-gdb

 # We need to specify host & target to avoid breaking ARM EABI
-BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
+BINUTILS_CONF_OPTS = \
+	--disable-multilib \
+	--disable-werror \
 	--host=$(GNU_TARGET_NAME) \
 	--target=$(GNU_TARGET_NAME) \
 	--enable-install-libiberty \
@ -64,9 +67,12 @@ endif

 # "host" binutils should actually be "cross"
 # We just keep the convention of "host utility" for now
-HOST_BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
+HOST_BINUTILS_CONF_OPTS = \
+	--disable-multilib \
+	--disable-werror \
 	--target=$(GNU_TARGET_NAME) \
-			--disable-shared --enable-static \
+	--disable-shared \
+	--enable-static \
 	--with-sysroot=$(STAGING_DIR) \
 	--enable-poison-system-directories \
 	$(BINUTILS_DISABLE_GDB_CONF_OPTS) \
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@ -7,7 +7,8 @@
 BLACKBOX_VERSION = 0.70.1
 BLACKBOX_SOURCE = blackbox-$(BLACKBOX_VERSION).tar.bz2
 BLACKBOX_SITE = http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
-BLACKBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+BLACKBOX_CONF_OPTS = \
+	--x-includes=$(STAGING_DIR)/usr/include/X11 \
 	--x-libraries=$(STAGING_DIR)/usr/lib
 BLACKBOX_DEPENDENCIES = xlib_libX11
 BLACKBOX_LICENSE = MIT
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@ -12,7 +12,8 @@ CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
-CUPS_CONF_OPTS = --without-perl \
+CUPS_CONF_OPTS = \
+	--without-perl \
 	--without-java \
 	--without-php \
 	--disable-gnutls \
@ -20,7 +21,8 @@ CUPS_CONF_OPTS = --without-perl \
 	--libdir=/usr/lib
 CUPS_CONFIG_SCRIPTS = cups-config

-CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
+CUPS_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_ZLIB),zlib) \
 	$(if $(BR2_PACKAGE_LIBPNG),libpng) \
 	$(if $(BR2_PACKAGE_JPEG),jpeg) \
 	$(if $(BR2_PACKAGE_TIFF),tiff)
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@ -22,7 +22,8 @@ endef
 DBUS_DEPENDENCIES = host-pkgconf expat

 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
-DBUS_CONF_OPTS = --with-dbus-user=dbus \
+DBUS_CONF_OPTS = \
+	--with-dbus-user=dbus \
 	--disable-tests \
 	--disable-asserts \
 	--enable-abstract-sockets \
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@ -6,7 +6,8 @@

 ED_VERSION = 1.9
 ED_SITE = $(BR2_GNU_MIRROR)/ed
-ED_CONF_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ED_CONF_OPTS = \
+	CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)"
 ED_LICENSE = GPLv3+
 ED_LICENSE_FILES = COPYING
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@ -11,7 +11,8 @@ FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf
 FONTCONFIG_LICENSE = fontconfig license
 FONTCONFIG_LICENSE_FILES = COPYING

-FONTCONFIG_CONF_OPTS = --with-arch=$(GNU_TARGET_NAME) \
+FONTCONFIG_CONF_OPTS = \
+	--with-arch=$(GNU_TARGET_NAME) \
 	--with-cache-dir=/var/cache/fontconfig \
 	--disable-docs

--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@ -11,7 +11,8 @@ GNUPLOT_LICENSE_FILES = Copyright

 GNUPLOT_AUTORECONF = YES

-GNUPLOT_CONF_OPTS = --without-x \
+GNUPLOT_CONF_OPTS = \
+	--without-x \
 	--disable-raise-console \
 	--disable-mouse \
 	--without-tutorial \
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@ -13,7 +13,9 @@ ICU_LICENSE_FILES = license.html
 ICU_DEPENDENCIES = host-icu
 ICU_INSTALL_STAGING = YES
 ICU_CONFIG_SCRIPTS = icu-config
-ICU_CONF_OPTS = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
+ICU_CONF_OPTS = \
+	--with-cross-build=$(HOST_ICU_DIR)/source \
+	--disable-samples \
 	--disable-tests
 HOST_ICU_CONF_OPTS = \
 	--disable-samples \
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@ -27,7 +27,8 @@ else
 IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=32
 endif

-IMAGEMAGICK_CONF_OPTS = --program-transform-name='s,,,' \
+IMAGEMAGICK_CONF_OPTS = \
+	--program-transform-name='s,,,' \
 	--disable-openmp \
 	--without-perl \
 	--without-wmf \
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@ -10,8 +10,13 @@ LIBAO_DEPENDENCIES = host-pkgconf
 LIBAO_INSTALL_STAGING = YES
 LIBAO_LICENSE = GPLv2+
 LIBAO_LICENSE_FILES = COPYING
-LIBAO_CONF_OPTS = --disable-esd --disable-wmm --disable-arts \
-			--disable-nas --disable-pulse --disable-broken-oss
+LIBAO_CONF_OPTS = \
+	--disable-esd \
+	--disable-wmm \
+	--disable-arts \
+	--disable-nas \
+	--disable-pulse \
+	--disable-broken-oss

 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 LIBAO_DEPENDENCIES += alsa-lib
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@ -8,7 +8,8 @@ LIBARGTABLE2_VERSION = 13
 LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
 LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13
 LIBARGTABLE2_INSTALL_STAGING = YES
-LIBARGTABLE2_CONF_OPTS = --disable-example \
+LIBARGTABLE2_CONF_OPTS = \
+	--disable-example \
 	--disable-kernel-module \
 	--enable-lib \
 	--enable-util
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@ -10,8 +10,11 @@ LIBXSLT_INSTALL_STAGING = YES
 LIBXSLT_LICENSE = MIT
 LIBXSLT_LICENSE_FILES = COPYING

-LIBXSLT_CONF_OPTS = --with-gnu-ld --without-debug \
-		--without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
+LIBXSLT_CONF_OPTS = \
+	--with-gnu-ld \
+	--without-debug \
+	--without-python \
+	--with-libxml-prefix=$(STAGING_DIR)/usr/
 LIBXSLT_CONFIG_SCRIPTS = xslt-config
 LIBXSLT_DEPENDENCIES = libxml2

--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@ -12,10 +12,13 @@ METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSI
 METACITY_LICENSE = GPLv2+
 METACITY_LICENSE_FILES = COPYING

-METACITY_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+METACITY_CONF_OPTS = \
+	--x-includes=$(STAGING_DIR)/usr/include/X11 \
 	--x-libraries=$(STAGING_DIR)/usr/lib \
-		--disable-glibtest --disable-gconf \
-		--disable-sm --disable-startup-notification
+	--disable-glibtest \
+	--disable-gconf \
+	--disable-sm \
+	--disable-startup-notification

 METACITY_DEPENDENCIES = libgtk2 \
 	xlib_libX11 \
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@ -11,13 +11,21 @@ NETSNMP_LICENSE = Various BSD-like
 NETSNMP_LICENSE_FILES = COPYING
 NETSNMP_INSTALL_STAGING = YES
 NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
-NETSNMP_CONF_OPTS = --with-persistent-directory=/var/lib/snmp \
-		--with-defaults --enable-mini-agent --without-rpm \
-		--with-logfile=none --without-kmem-usage $(DISABLE_IPV6) \
-		--enable-as-needed --without-perl-modules \
-		--disable-embedded-perl --disable-perl-cc-checks \
-		--disable-scripts --with-default-snmp-version="1" \
-		--enable-silent-libtool --enable-mfd-rewrites \
+NETSNMP_CONF_OPTS = \
+	--with-persistent-directory=/var/lib/snmp \
+	--with-defaults \
+	--enable-mini-agent \
+	--without-rpm \
+	--with-logfile=none \
+	--without-kmem-usage $(DISABLE_IPV6) \
+	--enable-as-needed \
+	--without-perl-modules \
+	--disable-embedded-perl \
+	--disable-perl-cc-checks \
+	--disable-scripts \
+	--with-default-snmp-version="1" \
+	--enable-silent-libtool \
+	--enable-mfd-rewrites \
 	--with-sys-contact="root@localhost" \
 	--with-sys-location="Unknown" \
 	--with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@ -13,7 +13,8 @@ NTP_AUTORECONF = YES
 NTP_LICENSE = ntp license
 NTP_LICENSE_FILES = COPYRIGHT
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
-NTP_CONF_OPTS = --with-shared \
+NTP_CONF_OPTS = \
+	--with-shared \
 	--program-transform-name=s,,, \
 	--disable-tickadj \
 	--with-yielding-select=yes \
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@ -9,8 +9,14 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain
 OPENSSH_LICENSE_FILES = LICENCE
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
-OPENSSH_CONF_OPTS = --sysconfdir=/etc/ssh --disable-lastlog --disable-utmp \
-		--disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip
+OPENSSH_CONF_OPTS = \
+	--sysconfdir=/etc/ssh \
+	--disable-lastlog \
+	--disable-utmp \
+	--disable-utmpx \
+	--disable-wtmp \
+	--disable-wtmpx \
+	--disable-strip

 define OPENSSH_USERS
 	sshd -1 sshd -1 * - - - SSH drop priv user
--- a/package/php/php.mk
+++ b/package/php/php.mk
@ -13,7 +13,8 @@ PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
 PHP_DEPENDENCIES = host-pkgconf
 PHP_LICENSE = PHP
 PHP_LICENSE_FILES = LICENSE
-PHP_CONF_OPTS = --mandir=/usr/share/man \
+PHP_CONF_OPTS = \
+	--mandir=/usr/share/man \
 	--infodir=/usr/share/info \
 	--disable-all \
 	--without-pear \
@ -50,7 +51,8 @@ PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
 PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)

 ### Extensions
-PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
+PHP_CONF_OPTS += \
+	$(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
 	$(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
 	$(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
 	$(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@ -10,10 +10,12 @@ PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source
 PROFTPD_LICENSE = GPLv2+
 PROFTPD_LICENSE_FILES = COPYING

-PROFTPD_CONF_ENV = ac_cv_func_setpgrp_void=yes \
+PROFTPD_CONF_ENV = \
+	ac_cv_func_setpgrp_void=yes \
 	ac_cv_func_setgrent_void=yes

-PROFTPD_CONF_OPTS = --localstatedir=/var/run \
+PROFTPD_CONF_OPTS = \
+	--localstatedir=/var/run \
 	--disable-static \
 	--disable-curses \
 	--disable-ncurses \
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@ -12,10 +12,16 @@ RRDTOOL_LICENSE_FILES = COPYING COPYRIGHT
 RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
 RRDTOOL_AUTORECONF = YES
 RRDTOOL_INSTALL_STAGING = YES
-RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
+RRDTOOL_CONF_ENV = \
+	rd_cv_ieee_works=yes \
+	rd_cv_null_realloc=nope \
 	ac_cv_func_mmap_fixed_mapped=yes
-RRDTOOL_CONF_OPTS = --disable-perl --disable-python --disable-ruby \
-			--disable-tcl --program-transform-name='' \
+RRDTOOL_CONF_OPTS = \
+	--disable-perl \
+	--disable-python \
+	--disable-ruby \
+	--disable-tcl \
+	--program-transform-name='' \
 	$(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread)
 RRDTOOL_MAKE = $(MAKE1)

--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@ -11,7 +11,8 @@ SDL_IMAGE_INSTALL_STAGING = YES
 SDL_IMAGE_LICENSE = zlib
 SDL_IMAGE_LICENSE_FILES = COPYING

-SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr \
+SDL_IMAGE_CONF_OPTS = \
+	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
 	--disable-sdltest \
 	--disable-static \
@ -35,7 +36,8 @@ SDL_IMAGE_DEPENDENCIES = sdl \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)

-HOST_SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(HOST_DIR)/usr \
+HOST_SDL_IMAGE_CONF_OPTS = \
+	--with-sdl-prefix=$(HOST_DIR)/usr \
 	--with-sdl-exec-prefix=$(HOST_DIR)/usr \
 	--disable-sdltest \
 	--disable-static \
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@ -12,7 +12,8 @@ SDL_TTF_LICENSE_FILES = COPYING

 SDL_TTF_INSTALL_STAGING = YES
 SDL_TTF_DEPENDENCIES = sdl freetype
-SDL_TTF_CONF_OPTS = --without-x \
+SDL_TTF_CONF_OPTS = \
+	--without-x \
 	--with-freetype-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-prefix=$(STAGING_DIR)/usr

--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@ -9,7 +9,8 @@ SED_SITE = $(BR2_GNU_MIRROR)/sed
 SED_LICENSE = GPLv3
 SED_LICENSE_FILES = COPYING

-SED_CONF_OPTS = --bindir=/usr/bin \
+SED_CONF_OPTS = \
+	--bindir=/usr/bin \
 	--libdir=/lib \
 	--libexecdir=/usr/lib \
 	--sysconfdir=/etc \
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@ -14,12 +14,19 @@ SQUID_LICENSE_FILES = COPYING
 SQUID_AUTORECONF = YES
 SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
-SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
-			ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
-			ac_cv_func_strnstr=no ac_cv_have_squid=yes
-SQUID_CONF_OPTS =	--enable-async-io=8 --enable-linux-netfilter \
+SQUID_CONF_ENV = \
+	ac_cv_epoll_works=yes \
+	ac_cv_func_setresuid=yes \
+	ac_cv_func_va_copy=yes \
+	ac_cv_func___va_copy=yes \
+	ac_cv_func_strnstr=no \
+	ac_cv_have_squid=yes
+SQUID_CONF_OPTS = \
+	--enable-async-io=8 \
+	--enable-linux-netfilter \
 	--enable-removal-policies="lru,heap" \
-			--with-filedescriptors=1024 --disable-ident-lookups \
+	--with-filedescriptors=1024 \
+	--disable-ident-lookups \
 	--with-krb5-config=no \
 	--enable-auth-basic="fake getpwnam" \
 	--enable-auth-digest="file" \
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@ -8,9 +8,13 @@ TCPDUMP_VERSION = 4.6.2
 TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_LICENSE = BSD-3c
 TCPDUMP_LICENSE_FILES = LICENSE
-TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no \
+TCPDUMP_CONF_ENV = \
+	ac_cv_linux_vers=2 \
+	td_cv_buggygetaddrinfo=no \
 	PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
-TCPDUMP_CONF_OPTS = --without-crypto --with-system-libpcap \
+TCPDUMP_CONF_OPTS = \
+	--without-crypto \
+	--with-system-libpcap \
 	$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 TCPDUMP_DEPENDENCIES = zlib libpcap
 # Patching aclocal.m4
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@ -25,7 +25,8 @@ VDE2_AUTORECONF = YES
 #
 # Note: disabled features can be added with corresponding dependencies
 #       in future commits.
-VDE2_CONF_OPTS = --disable-experimental  \
+VDE2_CONF_OPTS = \
+	--disable-experimental  \
 	--disable-cryptcab      \
 	--disable-pcap          \
 	--disable-python        \
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@ -54,8 +54,11 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	mcookie 			\
 	host-pkgconf

-XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
-		--disable-xnest --disable-xephyr --disable-dmx \
+XSERVER_XORG_SERVER_CONF_OPTS = \
+	--disable-config-hal \
+	--disable-xnest \
+	--disable-xephyr \
+	--disable-dmx \
 	--with-builder-addr=buildroot@buildroot.org \
 	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
 	--with-fontrootdir=/usr/share/fonts/X11/ \
@ -69,8 +72,12 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
 endif

 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive --enable-xfbdev \
-		--disable-glx --disable-dri --disable-xsdl
+XSERVER_XORG_SERVER_CONF_OPTS += \
+	--enable-kdrive \
+	--enable-xfbdev \
+	--disable-glx \
+	--disable-dri \
+	--disable-xsdl
 define XSERVER_CREATE_X_SYMLINK
 	ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
 endef