gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package: indentation cleanup 

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Jerzy Grzegorek 2014-10-24 07:57:37 +02:00 committed by Peter Korsgaard
parent d9d25fdb30
commit 774ff0d13f
14 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/linux.mk
View File

@ -72,7 +72,7 @@ endif
ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
ifneq ($(words $(KERNEL_DTS_NAME)),1)
$(error Kernel with appended device tree needs exactly one DTS source.\
$(error Kernel with appended device tree needs exactly one DTS source. \
Check BR2_LINUX_KERNEL_INTREE_DTS_NAME or BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.)
endif
endif

6
package/matchbox/matchbox-desktop/matchbox-desktop.mk
View File

@ -21,10 +21,10 @@ MATCHBOX_DESKTOP_AUTORECONF = YES
################################################################################
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification
MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification
MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification
MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification
else
MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification
MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification
endif
################################################################################

6
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
View File

@ -23,10 +23,10 @@ MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FI
################################################################################
ifeq ($(BR2_PACKAGE_CAIRO),y)
MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo
MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo
MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
else
MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
endif
################################################################################

26
package/matchbox/matchbox-lib/matchbox-lib.mk
View File

@ -24,36 +24,36 @@ MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm
MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm
endif
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
MATCHBOX_LIB_CONF_OPTS += --enable-jpeg
MATCHBOX_LIB_DEPENDENCIES += jpeg
MATCHBOX_LIB_CONF_OPTS += --enable-jpeg
MATCHBOX_LIB_DEPENDENCIES += jpeg
else
MATCHBOX_LIB_CONF_OPTS += --disable-jpeg
MATCHBOX_LIB_CONF_OPTS += --disable-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
MATCHBOX_LIB_CONF_OPTS += --enable-png
MATCHBOX_LIB_DEPENDENCIES += libpng
MATCHBOX_LIB_CONF_OPTS += --enable-png
MATCHBOX_LIB_DEPENDENCIES += libpng
else
MATCHBOX_LIB_CONF_OPTS += --disable-png
MATCHBOX_LIB_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy)
MATCHBOX_LIB_CONF_OPTS += --enable-pango
MATCHBOX_LIB_DEPENDENCIES += pango
MATCHBOX_LIB_CONF_OPTS += --enable-pango
MATCHBOX_LIB_DEPENDENCIES += pango
else
MATCHBOX_LIB_CONF_OPTS += --disable-pango
MATCHBOX_LIB_CONF_OPTS += --disable-pango
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
MATCHBOX_LIB_CONF_OPTS += --enable-xft
MATCHBOX_LIB_DEPENDENCIES += xlib_libXft
MATCHBOX_LIB_CONF_OPTS += --enable-xft
MATCHBOX_LIB_DEPENDENCIES += xlib_libXft
else
MATCHBOX_LIB_CONF_OPTS += --disable-xft
MATCHBOX_LIB_CONF_OPTS += --disable-xft
endif
################################################################################

6
package/matchbox/matchbox-panel/matchbox-panel.mk
View File

@ -16,10 +16,10 @@ MATCHBOX_PANEL_CONF_OPTS = --enable-expat
################################################################################
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
else
MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
endif
################################################################################

18
package/matchbox/matchbox-wm/matchbox-wm.mk
View File

@ -20,24 +20,24 @@ MATCHBOX_WM_CONF_ENV = expat=yes
ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
MATCHBOX_WM_CONF_OPTS += --enable-composite
MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite
MATCHBOX_WM_DEPENDENCIES += xlib_libXpm
MATCHBOX_WM_CONF_OPTS += --enable-composite
MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite
MATCHBOX_WM_DEPENDENCIES += xlib_libXpm
endif
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
#MATCHBOX_WM_OPTS += --enable-standalone-xft
MATCHBOX_WM_DEPENDENCIES += xlib_libXft
#MATCHBOX_WM_OPTS += --enable-standalone-xft
MATCHBOX_WM_DEPENDENCIES += xlib_libXft
else
#MATCHBOX_WM_OPTS += --disable-standalone-xft
#MATCHBOX_WM_OPTS += --disable-standalone-xft
endif
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
MATCHBOX_WM_CONF_OPTS += --enable-startup-notification
MATCHBOX_WM_DEPENDENCIES += startup-notification
MATCHBOX_WM_CONF_OPTS += --enable-startup-notification
MATCHBOX_WM_DEPENDENCIES += startup-notification
else
MATCHBOX_WM_CONF_OPTS += --disable-startup-notification
MATCHBOX_WM_CONF_OPTS += --disable-startup-notification
endif
################################################################################

4
support/dependencies/check-host-tar.mk
View File

@ -1,8 +1,8 @@
TAR ?= tar
ifeq (,$(call suitable-host-package,tar,$(TAR)))
DEPENDENCIES_HOST_PREREQ += host-tar
TAR = $(HOST_DIR)/usr/bin/tar
DEPENDENCIES_HOST_PREREQ += host-tar
TAR = $(HOST_DIR)/usr/bin/tar
endif
# Since TAR is at least 1.17, it will certainly support --strip-components

4
support/dependencies/check-host-xzcat.mk
View File

@ -2,6 +2,6 @@
# If it is not present, build our own host-xzcat
ifeq (,$(call suitable-host-package,xzcat,$(XZCAT)))
DEPENDENCIES_HOST_PREREQ += host-xz
XZCAT = $(HOST_DIR)/usr/bin/xzcat
DEPENDENCIES_HOST_PREREQ += host-xz
XZCAT = $(HOST_DIR)/usr/bin/xzcat
endif