package: indentation cleanup
authorJerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Thu, 23 Oct 2014 08:43:37 +0000 (10:43 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 23 Oct 2014 20:13:29 +0000 (22:13 +0200)
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
18 files changed:
fs/cramfs/cramfs.mk
fs/tar/tar.mk
package/automake/automake.mk
package/cramfs/cramfs.mk
package/e2fsprogs/e2fsprogs.mk
package/elfutils/elfutils.mk
package/genromfs/genromfs.mk
package/i2c-tools/i2c-tools.mk
package/libgtk2/libgtk2.mk
package/liblog4c-localtime/liblog4c-localtime.mk
package/libxml-parser-perl/libxml-parser-perl.mk
package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
package/matchbox/matchbox-lib/matchbox-lib.mk
package/mtd/mtd.mk
package/squashfs/squashfs.mk
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
toolchain/helpers.mk

index 9fbb7dd975db02176447616be50961c211f0edf0..747237290f5011bf4b7fc0de7ede205b2016688f 100644 (file)
@@ -11,7 +11,7 @@ CRAMFS_OPTS = -l
 endif
 
 define ROOTFS_CRAMFS_CMD
- $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
      $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
 endef
 
 ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
index f876d03f56da7bad3f447e973d98f223b2d41976..780827e42fc75cf7c34bce8a3e2a3a9eef6f3b37 100644 (file)
@@ -7,7 +7,7 @@
 TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
 
 define ROOTFS_TAR_CMD
- tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
      tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
 endef
 
 $(eval $(call ROOTFS_TARGET,tar))
index 8d7e29146bd1cf9fbf0f74cb909cece0c3c32be5..17bc799ca5887eae5666ac436fb07fc1a76d1abb 100644 (file)
@@ -13,7 +13,7 @@ AUTOMAKE_LICENSE_FILES = COPYING
 HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
 
 define GTK_DOC_M4_INSTALL
- $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
      $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
 endef
 
 # ensure staging aclocal dir exists
index bcea6ef8d01f15e3542ab78d508a81a93f507364..72860b6b7a5d24745008fe5756fdc5f8d63241f0 100644 (file)
@@ -12,21 +12,21 @@ CRAMFS_LICENSE_FILES = COPYING
 CRAMFS_DEPENDENCIES = zlib
 
 define CRAMFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
      $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
 endef
 
 define CRAMFS_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin/mkcramfs
- $(INSTALL) -D -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin/cramfsck
      $(INSTALL) -D -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin/mkcramfs
      $(INSTALL) -D -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin/cramfsck
 endef
 
 define HOST_CRAMFS_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D)
      $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D)
 endef
 
 define HOST_CRAMFS_INSTALL_CMDS
- $(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs
- $(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
      $(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs
      $(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
 endef
 
 $(eval $(generic-package))
index 32605013ea9a45ceba5cad475128cf73906087d8..3961a94f91ec43927a0f4749e6c93abddf66c635 100644 (file)
@@ -35,7 +35,7 @@ E2FSPROGS_MAKE_OPTS = \
        LDCONFIG=true
 
 define HOST_E2FSPROGS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
      $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
 endef
 # we don't have a host-util-linux
 HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
index 37db27a633c23f58692f3fc38c2bfed8b1e534eb..163db964e739a02907b097fab26ca16f4d05df87 100644 (file)
@@ -38,34 +38,34 @@ ELFUTILS_CONF_ENV += \
        LDFLAGS="$(ELFUTILS_LDFLAGS)"
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
- ELFUTILS_DEPENDENCIES += argp-standalone
+ELFUTILS_DEPENDENCIES += argp-standalone
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
- ELFUTILS_DEPENDENCIES += zlib
- ELFUTILS_CONF_OPTS += --with-zlib
+ELFUTILS_DEPENDENCIES += zlib
+ELFUTILS_CONF_OPTS += --with-zlib
 else
- ELFUTILS_CONF_OPTS += --without-zlib
+ELFUTILS_CONF_OPTS += --without-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
- ELFUTILS_DEPENDENCIES += bzip2
- ELFUTILS_CONF_OPTS += --with-bzlib
+ELFUTILS_DEPENDENCIES += bzip2
+ELFUTILS_CONF_OPTS += --with-bzlib
 else
- ELFUTILS_CONF_OPTS += --without-bzlib
+ELFUTILS_CONF_OPTS += --without-bzlib
 endif
 
 ifeq ($(BR2_PACKAGE_XZ),y)
- ELFUTILS_DEPENDENCIES += xz
- ELFUTILS_CONF_OPTS += --with-lzma
+ELFUTILS_DEPENDENCIES += xz
+ELFUTILS_CONF_OPTS += --with-lzma
 else
- ELFUTILS_CONF_OPTS += --without-lzma
+ELFUTILS_CONF_OPTS += --without-lzma
 endif
 
 ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
- ELFUTILS_CONF_OPTS += --enable-progs
+ELFUTILS_CONF_OPTS += --enable-progs
 else
- ELFUTILS_CONF_OPTS += --disable-progs
+ELFUTILS_CONF_OPTS += --disable-progs
 endif
 
 $(eval $(autotools-package))
index 2d50a5245cbba9943e8ecdef1f39bbf8080474f2..4b64f392ac472c22343818d3fb86414354e77b9e 100644 (file)
@@ -10,14 +10,14 @@ GENROMFS_LICENSE = GPLv2+
 GENROMFS_LICENSE_FILES = COPYING
 
 define GENROMFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-    CC="$(TARGET_CC)" \
-    CFLAGS="$(TARGET_CFLAGS)" \
-    LDFLAGS="$(TARGET_LDFLAGS)"
      $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+               CC="$(TARGET_CC)" \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)"
 endef
 
 define GENROMFS_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install
      $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install
 endef
 
 define HOST_GENROMFS_BUILD_CMDS
index 286c868392d48f8a35b366b22805f242b72aa568..0115e2233b25a52fc6e719ac862e034294c9b3cf 100644 (file)
@@ -11,7 +11,7 @@ I2C_TOOLS_LICENSE = GPLv2+, GPLv2 (py-smbus)
 I2C_TOOLS_LICENSE_FILES = COPYING
 
 define I2C_TOOLS_BUILD_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
      $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
 endef
 
 define I2C_TOOLS_INSTALL_TARGET_CMDS
index 7bd7b4e3804e25900776ce5cf68a976316f19472..6a78a98200ad238473dd77455a9e177151ca65c8 100644 (file)
@@ -165,11 +165,11 @@ HOST_LIBGTK2_CONF_OPTS = \
                --disable-cups
 
 define HOST_LIBGTK2_BUILD_CMDS
- $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
      $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
 endef
 
 define HOST_LIBGTK2_INSTALL_CMDS
- cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
      cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
 endef
 
 $(eval $(autotools-package))
index fd0f8f8bc3f51eb8f4d9f09a34271c33399a4368..4af9ee5aae931a230bd36afc20824b38f34302a1 100644 (file)
@@ -19,4 +19,4 @@ endef
 
 LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
 
- $(eval $(autotools-package))
+$(eval $(autotools-package))
index a07f0a0803e47e591a40d00a8091aa5cb36c077c..5c2ac546b48a4dce890ddf4df635b80988864872 100644 (file)
@@ -12,23 +12,23 @@ LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+
 LIBXML_PARSER_PERL_RUN_PERL = `which perl`
 
 define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
- (cd $(@D) ; \
-   $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
-        PREFIX=$(HOST_DIR)/usr \
-        EXPATLIBPATH=$(HOST_DIR)/usr/lib \
-        EXPATINCPATH=$(HOST_DIR)/usr/include \
-        INSTALLDIRS=site \
-        INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
-        INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
- )
      (cd $(@D) ; \
+               $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
+                       PREFIX=$(HOST_DIR)/usr \
+                       EXPATLIBPATH=$(HOST_DIR)/usr/lib \
+                       EXPATINCPATH=$(HOST_DIR)/usr/include \
+                       INSTALLDIRS=site \
+                       INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
+                       INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
      )
 endef
 
 define HOST_LIBXML_PARSER_PERL_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
      $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
      $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
 $(eval $(host-generic-package))
index a7ad7907a1762e3d43a96e6bb3d5c0c858e3fa6c..f687ca02e086684f9bfb047b3e877b0a2c54cf52 100644 (file)
@@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
 MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
 
 define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
- $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
- $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
      $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
      $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
 endef
 
 MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
index 87e49e3a82732880dcbfcf70b464795f3f6fee10..44943b35ade5fb93c92e2596aa3211514f9406ec 100644 (file)
@@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa
 MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
 
 define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
- cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
      cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
 endef
 
 MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
index 8b1eacd606dbde6c5da35dd16ee5319653cf2bcb..183b3603ad2b714eb3a4b678395ad9c1c8048ab4 100644 (file)
@@ -15,7 +15,7 @@ MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs
 MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
 
 define MATCHBOX_LIB_POST_INSTALL_FIXES
- $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
      $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
 endef
 
 MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
index 1d92f819f791c78de940941064fd4f8bea5d31c7..3397ebcf269d8f120b925dc43262b5c95b690ed0 100644 (file)
@@ -95,9 +95,9 @@ define MTD_INSTALL_STAGING_CMDS
 endef
 
 define MTD_INSTALL_TARGET_CMDS
- for f in $(MTD_TARGETS_y) ; do \
-  $(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
- done
      for f in $(MTD_TARGETS_y) ; do \
+               $(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
      done
 endef
 
 $(eval $(generic-package))
index 58dcb6222424228544b97db54d5700ae823c55f5..8ca9e2e5130993c59de1c88b2814c87d884138c3 100644 (file)
@@ -60,31 +60,31 @@ HOST_SQUASHFS_MAKE_ARGS = \
        LZMA_XZ_SUPPORT=1
 
 define SQUASHFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE)    \
-   CC="$(TARGET_CC)"           \
-   EXTRA_CFLAGS="$(TARGET_CFLAGS)"   \
-   EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
-   $(SQUASHFS_MAKE_ARGS) \
-   -C $(@D)/squashfs-tools/
      $(TARGET_MAKE_ENV) $(MAKE)    \
+               CC="$(TARGET_CC)"           \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)"   \
+               EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+               $(SQUASHFS_MAKE_ARGS) \
+               -C $(@D)/squashfs-tools/
 endef
 
 define SQUASHFS_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
-   -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
      $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
+               -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
 endef
 
 define HOST_SQUASHFS_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) \
-   CC="$(HOSTCC)" \
-   EXTRA_CFLAGS="$(HOST_CFLAGS)"   \
-   EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
-   $(HOST_SQUASHFS_MAKE_ARGS) \
-   -C $(@D)/squashfs-tools/
      $(HOST_MAKE_ENV) $(MAKE) \
+               CC="$(HOSTCC)" \
+               EXTRA_CFLAGS="$(HOST_CFLAGS)"   \
+               EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
+               $(HOST_SQUASHFS_MAKE_ARGS) \
+               -C $(@D)/squashfs-tools/
 endef
 
 define HOST_SQUASHFS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
-   -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
      $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
+               -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
 endef
 
 $(eval $(generic-package))
index 9ea2e1d85982378bee3cf4c905b254f5730b2e9c..f118ef2071a460c206c029f2432398bacced4a4a 100644 (file)
@@ -72,7 +72,7 @@ ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
 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
      ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
 endef
 XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
 
index 8eb71efc19ebf0938da20e1dce84da7a42c70e6e..3121da411e78d19e623164539cd158334d9e6182 100644 (file)
@@ -48,7 +48,7 @@ copy_toolchain_lib_root = \
        ARCH_LIB_DIR="$(strip $3)" ; \
        LIB="$(strip $4)"; \
        DESTDIR="$(strip $5)" ; \
- \
+\
        for dir in \
                $${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX) \
                $${ARCH_SYSROOT_DIR}/usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} \
@@ -80,7 +80,7 @@ copy_toolchain_lib_root = \
                        LIBPATH="`readlink -f $${LIBPATH}`"; \
                done; \
        done; \
- \
+\
        echo -n
 
 #