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:
parent
d9d25fdb30
commit
774ff0d13f
@ -72,8 +72,8 @@ 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.\
|
||||
Check BR2_LINUX_KERNEL_INTREE_DTS_NAME or BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.)
|
||||
$(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
|
||||
|
||||
|
@ -18,13 +18,13 @@ CELT051_DEPENDENCIES = libogg
|
||||
# if target is the same kind as host (ie. same arch, same bitness,
|
||||
# same endianness, so that /usr/lib contains libraries linkable by
|
||||
# our cross-compiler)
|
||||
CELT051_CONF_OPTS = \
|
||||
--enable-fixed-point \
|
||||
--disable-fixed-point-debug \
|
||||
--disable-experimental-postfilter \
|
||||
--disable-static-modes \
|
||||
--disable-assertions \
|
||||
--disable-oggtest \
|
||||
--with-ogg=$(STAGING_DIR)/usr \
|
||||
CELT051_CONF_OPTS = \
|
||||
--enable-fixed-point \
|
||||
--disable-fixed-point-debug \
|
||||
--disable-experimental-postfilter \
|
||||
--disable-static-modes \
|
||||
--disable-assertions \
|
||||
--disable-oggtest \
|
||||
--with-ogg=$(STAGING_DIR)/usr \
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
@ -15,8 +15,8 @@ ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
|
||||
|
||||
#Needed for build system to find pk11func.h and libnss3.so
|
||||
ECRYPTFS_UTILS_CONF_ENV = \
|
||||
NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \
|
||||
NSS_LIBS="-lnss3"
|
||||
NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \
|
||||
NSS_LIBS="-lnss3"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl
|
||||
|
@ -21,11 +21,11 @@ define GENROMFS_INSTALL_TARGET_CMDS
|
||||
endef
|
||||
|
||||
define HOST_GENROMFS_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define HOST_GENROMFS_INSTALL_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
@ -12,15 +12,15 @@ LIBAIO_LICENSE = LGPLv2.1+
|
||||
LIBAIO_LICENSE_FILES = COPYING
|
||||
|
||||
define LIBAIO_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define LIBAIO_INSTALL_STAGING_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
|
||||
$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
|
||||
endef
|
||||
|
||||
define LIBAIO_INSTALL_TARGET_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
|
||||
$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
@ -24,7 +24,7 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
|
||||
LIBCEC_CONF_OPTS = --enable-rpi \
|
||||
--with-rpi-include-path=$(STAGING_DIR)/usr/include
|
||||
--with-rpi-include-path=$(STAGING_DIR)/usr/include
|
||||
LIBCEC_DEPENDENCIES += rpi-userland
|
||||
LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif"
|
||||
else
|
||||
|
@ -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
|
||||
|
||||
################################################################################
|
||||
|
@ -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
|
||||
|
||||
################################################################################
|
||||
|
@ -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
|
||||
|
||||
################################################################################
|
||||
|
@ -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
|
||||
|
||||
################################################################################
|
||||
|
@ -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
|
||||
|
||||
################################################################################
|
||||
|
@ -21,11 +21,11 @@ SPICE_DEPENDENCIES = \
|
||||
|
||||
# We disable everything for now, because the dependency tree can become
|
||||
# quite deep if we try to enable some features, and I have not tested that.
|
||||
SPICE_CONF_OPTS = \
|
||||
--disable-opengl \
|
||||
--disable-smartcard \
|
||||
--disable-automated-tests \
|
||||
--without-sasl \
|
||||
SPICE_CONF_OPTS = \
|
||||
--disable-opengl \
|
||||
--disable-smartcard \
|
||||
--disable-automated-tests \
|
||||
--without-sasl \
|
||||
|
||||
SPICE_DEPENDENCIES += host-pkgconf
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user