diff options
130 files changed, 582 insertions, 582 deletions
@@ -28,10 +28,10 @@ CONFIG = package/config DATE:=$(shell date -u +%Y%m%d) noconfig_targets := menuconfig config oldconfig randconfig \ - defconfig allyesconfig allnoconfig release tags \ + defconfig allyesconfig allnoconfig release tags \ source-check help -# $(shell find . -name *_defconfig |sed 's/.*\///') +# $(shell find . -name *_defconfig |sed 's/.*\///') # Pull in the user's configuration file ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) @@ -85,12 +85,12 @@ endif ifndef HOSTLN HOSTLN:=ln endif -HOSTAR :=$(shell $(CONFIG_SHELL) -c "which $(HOSTAR)" || type -p $(HOSTAR) || echo ar) -HOSTAS :=$(shell $(CONFIG_SHELL) -c "which $(HOSTAS)" || type -p $(HOSTAS) || echo as) -HOSTCC :=$(shell $(CONFIG_SHELL) -c "which $(HOSTCC)" || type -p $(HOSTCC) || echo gcc) +HOSTAR :=$(shell $(CONFIG_SHELL) -c "which $(HOSTAR)" || type -p $(HOSTAR) || echo ar) +HOSTAS :=$(shell $(CONFIG_SHELL) -c "which $(HOSTAS)" || type -p $(HOSTAS) || echo as) +HOSTCC :=$(shell $(CONFIG_SHELL) -c "which $(HOSTCC)" || type -p $(HOSTCC) || echo gcc) HOSTCXX:=$(shell $(CONFIG_SHELL) -c "which $(HOSTCXX)" || type -p $(HOSTCXX) || echo g++) -HOSTLD :=$(shell $(CONFIG_SHELL) -c "which $(HOSTLD)" || type -p $(HOSTLD) || echo ld) -HOSTLN :=$(shell $(CONFIG_SHELL) -c "which $(HOSTLN)" || type -p $(HOSTLN) || echo ln) +HOSTLD :=$(shell $(CONFIG_SHELL) -c "which $(HOSTLD)" || type -p $(HOSTLD) || echo ld) +HOSTLN :=$(shell $(CONFIG_SHELL) -c "which $(HOSTLN)" || type -p $(HOSTLN) || echo ln) ifndef CFLAGS_FOR_BUILD CFLAGS_FOR_BUILD:=-g -O2 endif @@ -178,7 +178,7 @@ include package/Makefile.in # ############################################################# -all: world +all: world # In this section, we need .config include .config.cmd @@ -275,7 +275,7 @@ erase-fakeroots: source: $(TARGETS_SOURCE) $(HOST_SOURCE) -_source-check: +_source-check: $(MAKE) SPIDER=--spider source ############################################################# @@ -293,13 +293,13 @@ distclean: ifeq ($(DL_DIR),$(BASE_DIR)/dl) rm -rf $(DL_DIR) endif - rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) \ + rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) \ $(LINUX_KERNEL) $(IMAGE) $(BASE_DIR)/include \ .config.cmd $(MAKE) -C $(CONFIG) clean sourceball: - rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) + rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) set -e; \ cd ..; \ rm -f buildroot.tar.bz2; \ @@ -376,7 +376,7 @@ defconfig: $(CONFIG)/conf KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/conf -d $(CONFIG_CONFIG_IN) -# check if download URLs are outdated +# check if download URLs are outdated source-check: allyesconfig $(MAKE) _source-check diff --git a/package/Makefile.in b/package/Makefile.in index a2fccb8d2..c1a650d7b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -4,7 +4,7 @@ endif ifndef HOSTMAKE HOSTMAKE=$(MAKE) endif -HOSTMAKE :=$(shell $(CONFIG_SHELL) -c "which $(HOSTMAKE)" || type -p $(HOSTMAKE) || echo make) +HOSTMAKE :=$(shell $(CONFIG_SHELL) -c "which $(HOSTMAKE)" || type -p $(HOSTMAKE) || echo make) MAKE1:=$(HOSTMAKE) MAKE="$(firstword $(HOSTMAKE)) -j1" MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL) @@ -92,7 +92,7 @@ ifeq ($(BR2_STRIP_strip),y) STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note STRIP_DISCARD_ALL:=--discard-all STRIP_STRIP_UNNEEDED:=--strip-unneeded -STRIP_STRIP_ALL:=--strip-all +STRIP_STRIP_ALL:=--strip-all REMOVE_SECTION_COMMENT:=--remove-section=.comment REMOVE_SECTION_NOTE:=--remove-section=.note endif diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 5f103671e..2e952ca93 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -50,8 +50,8 @@ $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY): $(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_B $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY) mkdir -p $(TARGET_DIR)/usr/share/alsa mkdir -p $(TARGET_DIR)/usr/lib/alsa-lib - cp -dpf $(STAGING_DIR)/lib/libasound.so* $(TARGET_DIR)/usr/lib/ - cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/ + cp -dpf $(STAGING_DIR)/lib/libasound.so* $(TARGET_DIR)/usr/lib/ + cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/ cp -rdpf $(STAGING_DIR)/usr/lib/alsa-lib/* $(TARGET_DIR)/usr/lib/alsa-lib/ -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libasound.so* -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/alsa-lib/*.so diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 305daa788..d692a8872 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -41,20 +41,20 @@ $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/.configured ALSA_UTILS_TARGETS_ := ALSA_UTILS_TARGETS_y := -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER) += usr/bin/alsamixer -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIDI) += usr/bin/amidi -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIXER) += usr/bin/amixer -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAY) += usr/bin/aplay -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ARECORD) += usr/bin/arecord -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_IECSET) += usr/bin/iecset -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ACONNECT) += usr/bin/aconnect -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAYMIDI) += usr/bin/aplaymidi -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI) += usr/bin/arecordmidi -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQDUMP) += usr/bin/aseqdump -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQNET) += usr/bin/aseqnet -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST) += usr/bin/speaker-test +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER) += usr/bin/alsamixer +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIDI) += usr/bin/amidi +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIXER) += usr/bin/amixer +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAY) += usr/bin/aplay +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ARECORD) += usr/bin/arecord +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_IECSET) += usr/bin/iecset +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ACONNECT) += usr/bin/aconnect +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAYMIDI) += usr/bin/aplaymidi +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI) += usr/bin/arecordmidi +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQDUMP) += usr/bin/aseqdump +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQNET) += usr/bin/aseqnet +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST) += usr/bin/speaker-test $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(ALSA_UTILS_DIR) install diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 07b86f6a9..10f9803fd 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -29,7 +29,7 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE) touch $@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked - # bash_cv_have_mbstate_t=yes + # bash_cv_have_mbstate_t=yes (cd $(BASH_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 6a3af1491..6847c4e93 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -64,7 +64,7 @@ $(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB) $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB) rm -rf $(TARGET_DIR)/lib/libdb* - cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/ + cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/ rm -f $(TARGET_DIR)/lib/libdb.so $(TARGET_DIR)/lib/libdb.la $(TARGET_DIR)/lib/libdb.a (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(DB_SHARLIB) libdb.so) -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdb*so* diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 5038af897..4eb729f0d 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -25,7 +25,7 @@ bind-source: $(DL_DIR)/$(BIND_SOURCE) $(BIND_DIR2)/.unpacked: $(DL_DIR)/$(BIND_SOURCE) $(BIND_CAT) $(DL_DIR)/$(BIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(BIND_DIR2) package/bind/ bind\*.patch - touch $(BIND_DIR2)/.unpacked + touch $(BIND_DIR2)/.unpacked $(BIND_DIR2)/Makefile: $(BIND_DIR2)/.unpacked (cd $(BIND_DIR2); rm -rf config.cache; \ diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 2be8d5c95..d9f002859 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -47,26 +47,26 @@ endif $(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE) cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ - $(BUSYBOX_DIR)/.config + $(BUSYBOX_DIR)/.config ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y) $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \ - $(BUSYBOX_DIR)/Rules.mak + $(BUSYBOX_DIR)/Rules.mak endif ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y) $(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ - $(BUSYBOX_DIR)/.config + $(BUSYBOX_DIR)/.config endif ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y) $(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ - $(BUSYBOX_DIR)/.config + $(BUSYBOX_DIR)/.config $(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ - $(BUSYBOX_DIR)/.config + $(BUSYBOX_DIR)/.config endif ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y) $(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ - $(BUSYBOX_DIR)/.config + $(BUSYBOX_DIR)/.config $(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ - $(BUSYBOX_DIR)/.config + $(BUSYBOX_DIR)/.config endif ifeq ($(BR2_LARGEFILE),y) $(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config diff --git a/package/config/Makefile b/package/config/Makefile index f25b704e6..beed4584a 100644 --- a/package/config/Makefile +++ b/package/config/Makefile @@ -11,10 +11,10 @@ include Makefile.kconfig $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > .depend 2>/dev/null || : __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m)) -host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m))) +host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m))) host-cmulti := $(foreach m,$(__hostprogs),\ $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m)))) -host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs))) +host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs))) $(host-csingle): %: %.c $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $(HOST_LOADLIBES) $< -o $@ diff --git a/package/customize/customize.mk b/package/customize/customize.mk index 3774f4bb1..2a105a70b 100644 --- a/package/customize/customize.mk +++ b/package/customize/customize.mk @@ -10,8 +10,8 @@ $(BUILD_DIR)/.customize: (cd $(CUST_DIR); \ /bin/ls -d * > $(PROJECT_BUILD_DIR)/series || \ touch $(PROJECT_BUILD_DIR)/series ) - for f in `cat $(PROJECT_BUILD_DIR)/series`; do \ - cp -af $(CUST_DIR)/$$f $(TARGET_DIR)/$$f; \ + for f in `cat $(PROJECT_BUILD_DIR)/series`; do \ + cp -af $(CUST_DIR)/$$f $(TARGET_DIR)/$$f; \ done rm -f $(PROJECT_BUILD_DIR)/series touch $@ diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 7718a67b6..65a3b31fb 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -46,7 +46,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked /usr/bin/pkg-config --disable-doxygen-docs \ --enable-asserts=yes \ ) - touch $(DBUS_GLIB_DIR)/.configured + touch $(DBUS_GLIB_DIR)/.configured $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY): $(DBUS_GLIB_DIR)/.configured $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/lib/libexpat.so" -C $(DBUS_GLIB_DIR) all diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index b6aafc269..d9b057287 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -71,7 +71,7 @@ $(DMALLOC_DIR)/$(DMALLOC_BINARY): $(DMALLOC_DIR)/.configured $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY) # both DESTDIR and PREFIX are ignored.. - $(MAKE) includedir="$(STAGING_DIR)/usr/include" \ + $(MAKE) includedir="$(STAGING_DIR)/usr/include" \ bindir="$(STAGING_DIR)/usr/bin" \ libdir="$(STAGING_DIR)/usr/lib" \ shlibdir="$(STAGING_DIR)/usr/lib" \ diff --git a/package/expat/expat.mk b/package/expat/expat.mk index f5ad3120c..434010640 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -70,7 +70,7 @@ expat-clean: rm -f $(EXPAT_DIR)/.configured rm -f $(STAGING_DIR)/usr/lib/libexpat.* \ $(TARGET_DIR)/usr/lib/libexpat.* - #rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf + #rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf -$(MAKE) -C $(EXPAT_DIR) clean expat-dirclean: diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index e8937ae6e..fd0061573 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -48,10 +48,10 @@ $(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured touch $(FREETYPE_DIR)/.compiled $(STAGING_DIR)/usr/include/freetype: - ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype + ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype $(STAGING_DIR)/include/freetype: - ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype + ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype $(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 8558098c6..1df2ee0ca 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -139,7 +139,7 @@ gettext-dirclean: gettext-target: $(GETTEXT_DIR)/$(GETTEXT_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GETTEXT_DIR) install chmod +x $(TARGET_DIR)/usr/lib/libintl.so* # identify as needing to be stripped - rm -rf $(TARGET_DIR)/usr/info \ + rm -rf $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \ $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/include/libintl.h @@ -153,7 +153,7 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) $(TARGET_DIR)/usr/lib/libintl.a: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) cp -dpf $(STAGING_DIR)/usr/lib/libgettext*.a $(TARGET_DIR)/usr/lib/ - cp -dpf $(STAGING_DIR)/usr/lib/libintl*.a $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/lib/libintl*.a $(TARGET_DIR)/usr/lib/ touch -c $@ libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY) diff --git a/package/gnuconfig/Makefile b/package/gnuconfig/Makefile index f99ebce83..ca366a98b 100644 --- a/package/gnuconfig/Makefile +++ b/package/gnuconfig/Makefile @@ -4,7 +4,7 @@ all: @echo "Type 'make upload' to upload to the GNU FTP server." upload: - gpg --detach-sign config.guess + gpg --detach-sign config.guess gpg --detach-sign config.sub echo "directory: config" | gpg --clearsign > config.guess.directive.asc cp config.guess.directive.asc config.sub.directive.asc diff --git a/package/gnuconfig/gnuconfig.mk b/package/gnuconfig/gnuconfig.mk index e6cd2dedb..dec950c9c 100644 --- a/package/gnuconfig/gnuconfig.mk +++ b/package/gnuconfig/gnuconfig.mk @@ -1,3 +1,3 @@ # See README.buildroot -CONFIG_UPDATE = cp -f package/gnuconfig/config.sub package/gnuconfig/config.guess +CONFIG_UPDATE = cp -f package/gnuconfig/config.sub package/gnuconfig/config.guess diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk index 464e81711..1f4a8a3b5 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -135,7 +135,7 @@ $(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY): $(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/$(GTK2_ENGINES_BINARY): $(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY) mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \ + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/ mkdir -p $(TARGET_DIR)/usr/usr/share/themes cp -a $(STAGING_DIR)/usr/share/themes/Clearlooks \ diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 537b60a41..9a6e1dc9b 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -57,7 +57,7 @@ $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config --disable-acpi-acpid \ --disable-acpi-proc \ ) - touch $(HAL_DIR)/.configured + touch $(HAL_DIR)/.configured $(HAL_DIR)/hald/hald: $(HAL_DIR)/.configured $(MAKE) STAGING_DIR="$(STAGING_DIR)" DESTDIR="$(TARGET_DIR)" DBUS_GLIB_LIBS="$(DBUS_GLIB_LIBS)" -C $(HAL_DIR) diff --git a/package/hostap/hostap.mk b/package/hostap/hostap.mk index 7a2acf2e8..64259a766 100644 --- a/package/hostap/hostap.mk +++ b/package/hostap/hostap.mk @@ -20,7 +20,7 @@ $(HOSTAP_DIR)/.unpacked: $(DL_DIR)/$(HOSTAP_SOURCE) $(HOSTAP_DIR)/.configured: $(HOSTAP_DIR)/.unpacked #$(SED) "s,/.*#define PRISM2_DOWNLOAD_SUPPORT.*/,#define PRISM2_DOWNLOAD_SUPPORT,g" \ - # $(HOSTAP_DIR)/driver/modules/hostap_config.h + # $(HOSTAP_DIR)/driver/modules/hostap_config.h touch $(HOSTAP_DIR)/.configured $(HOSTAP_DIR)/utils/hostap_crypt_conf: $(HOSTAP_DIR)/.configured diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index ecf496324..562b39b97 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -20,7 +20,7 @@ $(IPERF_DIR)/.unpacked: $(DL_DIR)/$(IPERF_SOURCE) touch $(IPERF_DIR)/.unpacked $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked - (cd $(IPERF_DIR); rm -rf config.cache; \ + (cd $(IPERF_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index 1b5ab3509..30a726ef1 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -19,43 +19,43 @@ IPSEC_TOOLS_TARGET_BINARY_RACOONCTL:=usr/sbin/racoonctl IPSEC_TOOLS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ipsec-tools/ ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT)), y) -IPSEC_TOOLS_CONFIG_FLAGS+= --enable-adminport +IPSEC_TOOLS_CONFIG_FLAGS+= --enable-adminport else -IPSEC_TOOLS_CONFIG_FLAGS+= --disable-adminport +IPSEC_TOOLS_CONFIG_FLAGS+= --disable-adminport endif ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_NATT)), y) -IPSEC_TOOLS_CONFIG_FLAGS+= --enable-natt +IPSEC_TOOLS_CONFIG_FLAGS+= --enable-natt else -IPSEC_TOOLS_CONFIG_FLAGS+= --disable-natt +IPSEC_TOOLS_CONFIG_FLAGS+= --disable-natt endif ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_FRAG)), y) -IPSEC_TOOLS_CONFIG_FLAGS+= --enable-frag +IPSEC_TOOLS_CONFIG_FLAGS+= --enable-frag else -IPSEC_TOOLS_CONFIG_FLAGS+= --disable-frag +IPSEC_TOOLS_CONFIG_FLAGS+= --disable-frag endif ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_STATS)), y) -IPSEC_TOOLS_CONFIG_FLAGS+= --enable-stats +IPSEC_TOOLS_CONFIG_FLAGS+= --enable-stats else -IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats +IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats endif ifeq ($(BR2_INET_IPV6),y) ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_IPV6)), y) -IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6 +IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6 else -IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) +IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) endif else # ignore user's choice if it doesn't -IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) +IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) endif ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_READLINE)), y) -IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline +IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline endif $(DL_DIR)/$(IPSEC_TOOLS_SOURCE): @@ -82,7 +82,7 @@ $(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched --disable-gssapi \ --with-kernel-headers=$(STAGING_DIR)/usr/include \ $(IPSEC_TOOLS_CONFIG_FLAGS) \ - ); + ) # simpler than patching that cruft.. (echo '#undef bzero'; \ echo '#define bzero(a, b) memset((a), 0, (b))'; \ @@ -98,13 +98,13 @@ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL): \ $(IPSEC_TOOLS_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(IPSEC_TOOLS_DIR) - + $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL): \ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \ - $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL) + $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL) $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) install $(STRIP) $(STRIP_STRIP_UNNEEDED) $(REMOVE_SECTION_COMMENT) \ $(REMOVE_SECTION_NOTE) \ @@ -159,4 +159,4 @@ ipsec-tools-dirclean: ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS)), y) TARGETS+=ipsec-tools -endif +endif diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 68ddc1a7e..4210e5c72 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -10,14 +10,14 @@ IPTABLES_CAT:=$(BZCAT) IPTABLES_BUILD_DIR:=$(BUILD_DIR)/iptables-$(IPTABLES_VERSION) $(DL_DIR)/$(IPTABLES_SOURCE): - $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) + $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) $(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE) $(IPTABLES_CAT) $(DL_DIR)/$(IPTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $@ $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked - # Allow patches. Needed for openwrt for instance. + # Allow patches. Needed for openwrt for instance. toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ iptables\*.patch # $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \ @@ -25,7 +25,7 @@ $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked touch $@ $(IPTABLES_BUILD_DIR)/iptables: $(IPTABLES_BUILD_DIR)/.configured - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ KERNEL_DIR=$(LINUX_HEADERS_DIR) PREFIX=/usr \ COPT_FLAGS="$(TARGET_CFLAGS)" diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index c1af4c2d5..a22bf7241 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -15,7 +15,7 @@ KEXEC_TARGET_BINARY:=sbin/kexec KEXEC_CONFIG_OPTS:= KEXEC_DEPS_y:= -KEXEC_DEPS_$(KEXEC_PACKAGE_KEXEC) += zlib +KEXEC_DEPS_$(KEXEC_PACKAGE_KEXEC) += zlib ifeq ($(strip $(BR2_PACKAGE_KEXEC_ZLIB)),y) KEXEC_CONFIG_OPTS += --with-zlib @@ -34,9 +34,9 @@ kexec-source: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH) $(KEXEC_DIR)/.unpacked: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH) $(KEXEC_CAT) $(DL_DIR)/$(KEXEC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(KEXEC_PATCH),) - (cd $(KEXEC_DIR) && $(KEXEC_CAT) $(DL_DIR)/$(KEXEC_PATCH) | patch -p1; \ - for f in `cat debian/patches/00list`; do \ - cat debian/patches/$$f | patch -p2; \ + (cd $(KEXEC_DIR) && $(KEXEC_CAT) $(DL_DIR)/$(KEXEC_PATCH) | patch -p1; \ + for f in `cat debian/patches/00list`; do \ + cat debian/patches/$$f | patch -p2; \ done) endif toolchain/patch-kernel.sh $(KEXEC_DIR) package/kexec/ kexec\*.patch diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 689d7d028..97cc5e182 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -60,7 +60,7 @@ libcgicc-clean: libcgicc-dirclean: rm -rf $(LIBCGICC_DIR) - + ############################################################# # # Toplevel Makefile options diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index 89cab5fc6..676a3c987 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -5,10 +5,10 @@ ############################################################# # Copyright 2003-2005 Lennart Poettering <mzqnrzba@0pointer.de> # -# This library is free software; you can redistribute it -# and/or modify it under the terms of the GNU Lesser General -# Public License as published by the Free Software Foundation; -# either version 2.1 of the License, or (at your option) any +# This library is free software; you can redistribute it +# and/or modify it under the terms of the GNU Lesser General +# Public License as published by the Free Software Foundation +# either version 2.1 of the License, or (at your option) any # later version. LIBDAEMON_VERSION:=0.10 @@ -70,7 +70,7 @@ $(STAGING_DIR)/lib/libdaemon.a: $(LIBDAEMON_DIR)/.compiled touch -c $(STAGING_DIR)/lib/libdaemon.a #$(TARGET_DIR)/usr/lib/libdaemon.a: $(STAGING_DIR)/lib/libdaemon.a -# -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdaemon.a +# -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdaemon.a libdaemon: uclibc pkgconfig $(STAGING_DIR)/lib/libdaemon.a @@ -82,7 +82,7 @@ libdaemon-clean: libdaemon-patch-prep: libdaemon-dirclean libdaemon-unpacked cp -af $(LIBDAEMON_DIR) $(LIBDAEMON_DIR)-0rig -libdaemon-patch: +libdaemon-patch: (cd $(BUILD_DIR); \ diff -urN $(LIBDAEMON_NAME)-0rig $(LIBDAEMON_NAME) > ../../$(LIBDAEMON_NAME)-$(DATE).patch || echo) diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index fd7e6d4a5..397c9acbf 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -50,10 +50,10 @@ $(STAGING_DIR)/lib/libdrm.so: $(LIBDRM_DIR)/.compiled $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBDRM_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libdrm.la #$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \ - # -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - # -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/include\',g" \ - # -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \ - # $(STAGING_DIR)/usr/bin/libdrm-config + # -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ + # -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/include\',g" \ + # -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \ + # $(STAGING_DIR)/usr/bin/libdrm-config touch -c $(STAGING_DIR)/lib/libdrm.so $(TARGET_DIR)/lib/libdrm.so: $(STAGING_DIR)/lib/libdrm.so diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index dc3b088a9..22e387eae 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -51,9 +51,9 @@ $(STAGING_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY): $(LIBGPG_ERROR_DIR)/$(LIBGPG_ERRO $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY): $(STAGING_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY) - cp -dpf $<* $(TARGET_DIR)/$(LIBGPG_ERROR_DESTDIR) + cp -dpf $<* $(TARGET_DIR)/$(LIBGPG_ERROR_DESTDIR) -libgpg-error: uclibc $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY) +libgpg-error: uclibc $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY) libgpg-error-source: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 5ac6a142b..18cbd5c60 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -135,16 +135,16 @@ $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0* $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk*-2.0.so.0* mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \ + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/ mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/printbackends/*.so \ + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/printbackends/*.so \ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends/ mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/immodules/*.so \ + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/immodules/*.so \ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules/ mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders - cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/loaders/*.so \ + cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/loaders/*.so \ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders/ mkdir -p $(TARGET_DIR)/etc/gtk-2.0 cp package/libgtk2/gdk-pixbuf.loaders $(TARGET_DIR)/etc/gtk-2.0 diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk index f68cf7f8e..056e04628 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -44,7 +44,7 @@ $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN): $(LIBID3TAG_DIR)/src/.libs/$(LIBID3TAG_B $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libid3tag.la $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN): $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) - cp -dpf $(STAGING_DIR)/usr/lib/libid3tag.so* $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/lib/libid3tag.so* $(TARGET_DIR)/usr/lib/ -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libid3tag.so* libid3tag: uclibc libmad $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index b7d453550..ec9a64f46 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -1,6 +1,6 @@ ############################################################# # -# libsysfs +# libsysfs # ############################################################# # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org> diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index bcbd48406..571dd77dd 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -63,7 +63,7 @@ $(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured $(MAKE) -C $(LIGHTTPD_DIR) - + $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install @rm -rf $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/man diff --git a/package/links/links.mk b/package/links/links.mk index 5e492b35d..67c51cf39 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -47,11 +47,11 @@ $(LINKS_DIR)/links: $(LINKS_DIR)/.configured $(TARGET_DIR)/usr/bin/links: $(LINKS_DIR)/links install -c $(LINKS_DIR)/links $(TARGET_DIR)/usr/bin/links -links-clean: +links-clean: $(MAKE) -C $(LINKS_DIR) clean -links-dirclean: - rm -rf $(LINKS_DIR) +links-dirclean: + rm -rf $(LINKS_DIR) links: uclibc $(TARGET_DIR)/usr/bin/links diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk index 1fe073f6f..50b4a8eb4 100644 --- a/package/lockfile-progs/lockfile-progs.mk +++ b/package/lockfile-progs/lockfile-progs.mk @@ -20,7 +20,7 @@ $(LOCKFILE_PROGS_DIR)/.unpacked: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE) touch $(LOCKFILE_PROGS_DIR)/.unpacked $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked - $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" \ -C $(LOCKFILE_PROGS_DIR) cp -a $(LOCKFILE_PROGS_DIR)/bin/lockfile* $(TARGET_DIR)/usr/bin $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 002a62918..fe5148662 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -38,11 +38,11 @@ $(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured ifeq ($(UCLIBC_HAS_WCHAR),) - $(SED) 's,^#define[ ]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h - $(SED) 's,^#define[ ]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h + $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h + $(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h endif ifeq ($(UCLIBC_HAS_LOCALE),) - $(SED) 's,^#define[ ]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h + $(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h endif $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 2dc4d68eb..95ac67202 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -13,8 +13,8 @@ LTP_TESTSUITE_DIR:=$(LTP_TESTSUITE_ROOT)/ltp-full-$(LTP_TESTSUITE_VERSION) # # Enable patches based upon different toolchain configuration options. # -LTP_PATCHES:=ltp-testsuite-generate-needs-bash.patch \ - ltp-testsuite-sh-is-not-C-code.patch \ +LTP_PATCHES:=ltp-testsuite-generate-needs-bash.patch \ + ltp-testsuite-sh-is-not-C-code.patch \ ltp-testsuite.patch ifeq ($(BR2_PTHREADS_NATIVE),y) diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index 6d11e8719..38d8664a5 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -49,11 +49,11 @@ $(TOOL_BUILD_DIR)/bin/tracevisualizer: $(LTT_DIR1)/$(LTT_BINARY) host-ltt-tracevisualizer: $(TOOL_BUILD_DIR)/bin/tracevisualizer -host-ltt-clean: +host-ltt-clean: $(MAKE) -C $(LTT_DIR1) clean -host-ltt-dirclean: - rm -rf $(LTT_DIR1) +host-ltt-dirclean: + rm -rf $(LTT_DIR1) ############################################################# @@ -101,12 +101,12 @@ $(TARGET_DIR)/usr/bin/tracedaemon: $(LTT_DIR2)/$(LTT_TARGET_BINARY) ltt-tracedaemon: uclibc $(TARGET_DIR)/usr/bin/tracedaemon -ltt-clean: +ltt-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LTT_DIR2) uninstall -$(MAKE) -C $(LTT_DIR2) clean -ltt-dirclean: - rm -rf $(LTT_DIR2) +ltt-dirclean: + rm -rf $(LTT_DIR2) ltt: host-ltt-tracevisualizer ltt-tracedaemon diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 6618f1a17..d51d697ff 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -3,7 +3,7 @@ # lzo # # Note: this builds only a static library, it does not provide -# anything to be installed into the target system. +# anything to be installed into the target system. # ############################################################# LZO_VERSION:=1.08 diff --git a/package/mdnsresponder/mdnsresponder.mk b/package/mdnsresponder/mdnsresponder.mk index d2a7e3591..25d45ddd2 100644 --- a/package/mdnsresponder/mdnsresponder.mk +++ b/package/mdnsresponder/mdnsresponder.mk @@ -45,7 +45,7 @@ $(TARGET_DIR)/usr/sbin/mdnsd: $(STAGING_DIR)/usr/lib/libdns_sd.so $(INSTALL) -m 644 -D $(MDNSRESPONDER_DIR)/mDNSPosix/build/prod/libdns_sd.so $(TARGET_DIR)/usr/lib/ ln -sf $(TARGET_DIR)/usr/lib/libdns_sd.so $(TARGET_DIR)/usr/lib/libdns_sd.so.1 # etc - $(INSTALL) -m 0644 -D package/mdnsresponder/mDNSResponderPosix.conf $(TARGET_DIR)/etc/ + $(INSTALL) -m 0644 -D package/mdnsresponder/mDNSResponderPosix.conf $(TARGET_DIR)/etc/ # init $(INSTALL) -m 0755 -D package/mdnsresponder/rc.mdnsresponder $(TARGET_DIR)/etc/init.d/S80mdnsresponder diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk index c6b4c9baf..c64071190 100644 --- a/package/microcom/microcom.mk +++ b/package/microcom/microcom.mk @@ -59,14 +59,14 @@ endif $(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom install -c $(MICROCOM_DIR)/microcom $(TARGET_DIR)/usr/bin/microcom -microcom-clean: +microcom-clean: rm -f $(MICROCOM_DIR)/*.o $(MICROCOM_DIR)/microcom \ $(TARGET_DIR)/usr/bin/microcom -microcom-dirclean: - rm -rf $(MICROCOM_DIR) +microcom-dirclean: + rm -rf $(MICROCOM_DIR) -microcom: uclibc $(TARGET_DIR)/usr/bin/microcom +microcom: uclibc $(TARGET_DIR)/usr/bin/microcom ############################################################# # diff --git a/package/mtd/20050122/mtd.mk b/package/mtd/20050122/mtd.mk index bd9893976..a7b358dff 100644 --- a/package/mtd/20050122/mtd.mk +++ b/package/mtd/20050122/mtd.mk @@ -91,31 +91,31 @@ endif MTD_TARGETS_n := MTD_TARGETS_y := -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS3DUMP) += jffs3dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite -MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp +MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 +MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs +MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump +MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS3DUMP) += jffs3dump +MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool +MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check +MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format +MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump +MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite +MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug +MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk +MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/util/, $(MTD_TARGETS_y)) $(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ CFLAGS+="-I$(MTD_DIR)/include" \ CFLAGS+="-I$(LINUX_HEADERS_DIR)/include" \ LDFLAGS="$(TARGET_LDFLAGS)" \ diff --git a/package/mtd/20061007/mtd.mk b/package/mtd/20061007/mtd.mk index 694b632de..f2d60cede 100644 --- a/package/mtd/20061007/mtd.mk +++ b/package/mtd/20061007/mtd.mk @@ -59,26 +59,26 @@ $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) MTD_TARGETS_n := MTD_TARGETS_y := -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump -#MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS3DUMP) += jffs3dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite -MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp +MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 +MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs +MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump +#MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS3DUMP) += jffs3dump +MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool +MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check +MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format +MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump +MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite +MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug +MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk +MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y)) diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 55b8e619f..10fbdcbff 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -45,7 +45,7 @@ $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_ $(SED) "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITTELNET_DIR) install #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc netkittelnet: uclibc netkitbase $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index ebae402b5..449f72201 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -103,14 +103,14 @@ netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE) -netsnmp-clean: +netsnmp-clean: $(MAKE) PREFIX=$(TARGET_DIR) INSTALL_PREFIX=$(TARGET_DIR) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETSNMP_DIR) uninstall $(MAKE) -C $(NETSNMP_DIR) clean rm -rf $(TARGET_DIR)/etc/snmp/{snmpd{,trapd},mib2c*}.conf \ $(TARGET_DIR)/etc/default/snmpd \ $(TARGET_DIR)/usr/include/net-snmp -netsnmp-dirclean: +netsnmp-dirclean: rm -rf $(NETSNMP_DIR) ############################################################# diff --git a/package/newt/newt.mk b/package/newt/newt.mk index 55eb4aa0b..cf04b32f4 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -47,7 +47,7 @@ $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source touch $(NEWT_DIR)/.configured $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION): $(NEWT_DIR)/.configured - $(MAKE) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC=$(TARGET_CC) -C $(NEWT_DIR) + $(MAKE) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC=$(TARGET_CC) -C $(NEWT_DIR) touch -c $@ $(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 68c3238cd..3b924ae8e 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -51,13 +51,13 @@ $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY): $(NFS_UTILS_DIR)/.configured RPCGEN=/usr/bin/rpcgen -C $(NFS_UTILS_DIR) touch -c $@ -NFS_UTILS_TARGETS_ := -NFS_UTILS_TARGETS_y := usr/sbin/exportfs usr/sbin/rpc.mountd \ +NFS_UTILS_TARGETS_ := +NFS_UTILS_TARGETS_y := usr/sbin/exportfs usr/sbin/rpc.mountd \ usr/sbin/rpc.nfsd usr/sbin/rpc.statd -NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug -NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd -NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad +NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug +NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd +NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY) # Use fakeroot to pretend to do 'make install' as root diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 532a97156..3e7574f40 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -74,7 +74,7 @@ ntp-clean: rm -f $(TARGET_DIR)/usr/sbin/ntpd $(TARGET_DIR)/usr/bin/sntp \ $(TARGET_DIR)/etc/init.d/S49ntp \ $(TARGET_DIR)/$(NTP_TARGET_BINARY) - -$(MAKE) -C $(NTP_DIR) clean + -$(MAKE) -C $(NTP_DIR) clean ntp-dirclean: rm -rf $(NTP_DIR) diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index c374e74ec..310d1cdb1 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -40,12 +40,12 @@ $(OPENNTPD_DIR)/$(OPENNTPD_BINARY): $(OPENNTPD_DIR)/.configured #(cd $(OPENNTPD_DIR); \ # $(YACC) parse.y; \ # $(TARGET_CC) $(TARGET_CFLAGS) $(CFLAGS_COMBINE) \ - # $(CFLAGS_WHOLE_PROGRAM) -I$(OPENNTPD_DIR) \ - # -D__dead="__attribute((__noreturn__))" -DHAVE_INTXX_T=1 \ - # -include defines.h \ - # -o $@ \ - # ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c y.tab.c config.c \ - # server.c client.c sensors.c util.c; \ + # $(CFLAGS_WHOLE_PROGRAM) -I$(OPENNTPD_DIR) \ + # -D__dead="__attribute((__noreturn__))" -DHAVE_INTXX_T=1 \ + # -include defines.h \ + # -o $@ \ + # ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c y.tab.c config.c \ + # server.c client.c sensors.c util.c; \ #) $(STRIP) $@ diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index cecedaa7d..2757c009e 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -70,11 +70,11 @@ openssh: openssl zlib $(TARGET_DIR)/usr/bin/ssh openssh-source: $(DL_DIR)/$(OPENSSH_SOURCE) -openssh-clean: +openssh-clean: $(MAKE) -C $(OPENSSH_DIR) clean $(MAKE) CC=$(TARGET_CC) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) uninstall -openssh-dirclean: +openssh-dirclean: rm -rf $(OPENSSH_DIR) ############################################################# # diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 08d0b934a..eabaf2ad3 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -76,12 +76,12 @@ $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7: $(STAGING_DIR)/usr/lib/libcrypto.a mkdir -p $(TARGET_DIR)/usr/lib cp -fa $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/ cp -fa $(STAGING_DIR)/usr/lib/libssl.so* $(TARGET_DIR)/usr/lib/ - #cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/ + #cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/ -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libssl.so.0.9.7 -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 $(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/usr/lib/libcrypto.a - mkdir -p $(TARGET_DIR)/usr/include + mkdir -p $(TARGET_DIR)/usr/include cp -a $(STAGING_DIR)/usr/include/openssl $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/usr/lib/libssl.a $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/usr/lib/libcrypto.a $(TARGET_DIR)/usr/lib/ @@ -93,14 +93,14 @@ openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7 openssl-source: $(DL_DIR)/$(OPENSSL_SOURCE) -openssl-clean: +openssl-clean: $(MAKE) -C $(OPENSSL_DIR) clean - rm -f $(STAGING_DIR)/usr/bin/openssl $(TARGET_DIR)/usr/bin/openssl + rm -f $(STAGING_DIR)/usr/bin/openssl $(TARGET_DIR)/usr/bin/openssl rm -f $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/libcrypto.so* rm -f $(STAGING_DIR)/usr/lib/libssl.so* $(TARGET_DIR)/usr/lib/libssl.so* rm -rf $(STAGING_DIR)/usr/include/openssl $(TARGET_DIR)/usr/include/openssl -openssl-dirclean: +openssl-dirclean: rm -rf $(OPENSSL_DIR) ############################################################# # diff --git a/package/portage/portage.mk b/package/portage/portage.mk index b21ed5ca9..a75553f24 100644 --- a/package/portage/portage.mk +++ b/package/portage/portage.mk @@ -62,7 +62,7 @@ $(PORTAGE_DIR)/.unpacked: $(DL_DIR)/$(PORTAGE_SOURCE) touch $@ $(PORTAGE_DIR)/.patched: $(PORTAGE_DIR)/.unpacked $(DL_DIR)/$(PORTAGE_PATCH) - (cd $(PORTAGE_DIR); $(PORTAGE_CAT) $(DL_DIR)/$(PORTAGE_PATCH) | patch -p0) + (cd $(PORTAGE_DIR); $(PORTAGE_CAT) $(DL_DIR)/$(PORTAGE_PATCH) | patch -p0) touch $@ $(SANDBOX_DIR)/.unpacked: $(DL_DIR)/$(SANDBOX_SOURCE) @@ -89,8 +89,8 @@ $(TARGET_DIR)/$(PORTAGE_TARGET_BINARY): $(PORTAGE_DIR)/.compiled patch $(TARGET_DIR)/etc/make.conf.$(PORTAGE_ARCH) $(PORTAGE_DIR)/cnf/make.conf.$(PORTAGE_ARCH).diff; \ $(doins) etc-update.conf dispatch-conf.conf $(TARGET_DIR)/etc; \ ) -# $(newins) make.globals.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.globals; \ -# $(newins) make.conf.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.conf; \ +# $(newins) make.globals.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.globals; \ +# $(newins) make.conf.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.conf; \ $(dodir) $(PORTAGE_TARGET_DIR)/pym $(doins) $(PORTAGE_DIR)/pym/*.py $(PORTAGE_TARGET_DIR)/pym/ @@ -134,7 +134,7 @@ portage-clean: rm -f $(TARGET_DIR)/usr/bin/$${bin}; \ done sandbox-clean: - + portage-dirclean: rm -rf $(PORTAGE_DIR) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index fb6ff0ecc..c72f640c5 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -62,8 +62,8 @@ $(TARGET_DIR)/$(PPPD_TARGET_BINARY): $(PPPD_DIR)/$(PPPD_BINARY) pppd: uclibc $(TARGET_DIR)/$(PPPD_TARGET_BINARY) pppd-clean: - rm -f $(TARGET_DIR)/usr/sbin/pppd - rm -f $(TARGET_DIR)/usr/sbin/chat + rm -f $(TARGET_DIR)/usr/sbin/pppd + rm -f $(TARGET_DIR)/usr/sbin/chat rm -rf $(TARGET_DIR)/etc/ppp $(MAKE) DESTDIR=$(TARGET_DIR)/usr CC=$(TARGET_CC) -C $(PPPD_DIR) uninstall -$(MAKE) -C $(PPPD_DIR) clean diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 5a7f2cf7f..530691c0c 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -51,12 +51,12 @@ $(PROFTPD_DIR)/.configured: $(PROFTPD_DIR)/.unpacked touch $@ $(PROFTPD_DIR)/$(PROFTPD_BINARY): $(PROFTPD_DIR)/.configured - $(MAKE) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" \ + $(MAKE) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" \ -C $(PROFTPD_DIR)/lib/libcap _makenames $(MAKE) -C $(PROFTPD_DIR) $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(PROFTPD_DIR)/$(PROFTPD_BINARY) - cp -dpf $(PROFTPD_DIR)/$(PROFTPD_BINARY) \ + cp -dpf $(PROFTPD_DIR)/$(PROFTPD_BINARY) \ $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY) @if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \ $(INSTALL) -m 0644 -D $(PROFTPD_DIR)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ diff --git a/package/qte/qte.mk b/package/qte/qte.mk index 8ed6267e9..10a3757c4 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -61,14 +61,14 @@ QTE_QTOPIA_IFILE:=$(QTE_QTOPIA_DIR)/opt/Qtopia/bin/qpe # ############################################################# # I choose to make the link in libqte so that the linking later is trivial -- a user may choose to use -luuid, or not, and it'll just work. -# ...since libqte* needs -luuid anyhow... +# ...since libqte* needs -luuid anyhow... QTE_QTE_CONFIGURE:=-no-xft -L$(E2FSPROGS_DIR)/lib -luuid QTE_QVFB_CONFIGURE:=-no-xft QTE_QTOPIA_CONFIGURE:= QTE_QT3_CONFIGURE:= ifeq ($(BR2_PTHREADS_NATIVE),y) -QTE_QTE_CONFIGURE:=$(QTE_QTE_CONFIGURE) -thread +QTE_QTE_CONFIGURE:=$(QTE_QTE_CONFIGURE) -thread QTE_QVFB_CONFIGURE:=$(QTE_QVFB_CONFIGURE) -thread QTE_QTOPIA_CONFIGURE:=$(QTE_QTOPIA_CONFIGURE) -thread QTE_QT3_CONFIGURE:=$(QTE_QT3_CONFIGURE) -thread @@ -87,7 +87,7 @@ endif # as of 2005-08-17's snapshot, uClibc's pthread does NOT support pthread_yield, which is needed # for ffmpeg's qtopia-phone-2.1.1/src/3rdparty/plugins/codecs/libffmpeg/mediapacketbuffer.h:230 -# (also called at line 232). ...so we have to disable ffmpeg +# (also called at line 232). ...so we have to disable ffmpeg QTE_QTOPIA_CONFIGURE:=$(QTE_QTOPIA_CONFIGURE) -without-libffmpeg QTE_QTOPIA_CONFIGURE:=$(QTE_QTOPIA_CONFIGURE) -L $(E2FSPROGS_DIR)/lib -I $(E2FSPROGS_DIR)/lib -luuid @@ -131,7 +131,7 @@ $(QTE_QTOPIA_DIR)/.unpacked: $(DL_DIR)/$(QTE_QTOPIA_SOURCE) touch $@ -# currently, this assumes that Qtopis is always involved. The dependency fails and the cp is wrong if Qtopis is not selected. +# currently, this assumes that Qtopis is always involved. The dependency fails and the cp is wrong if Qtopis is not selected. # I'll fix that later. $(QTE_QTE_DIR)/.configured: $(QTE_QTE_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) $(QTE_QTOPIA_DIR)/.unpacked cp $(QTE_QTOPIA_DIR)/src/qt/qconfig-qpe.h $(QTE_QTE_DIR)/src/tools/ @@ -163,9 +163,9 @@ $(QTE_QVFB_DIR)/.configured: $(QTE_QVFB_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacke touch $@ # --edition {other} -# This has some kooky logic. Qtopia requires a Qt <= 3.3.0 to build, yet we like to use s Qt-2.3.x for size constraints on an embedded device -# This target depends on both $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) **and** $(QTE_QT3_DIR)/.configured. if BR2_QTE_C_QTE_VERSION == BR2_QTE_C_QT3_VERSION, -# then it really depends on $(QTE_QTE_DIR)/.configured, which $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) needs, so it's redundant. If QTE is 3.3.0 or later, +# This has some kooky logic. Qtopia requires a Qt <= 3.3.0 to build, yet we like to use s Qt-2.3.x for size constraints on an embedded device +# This target depends on both $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) **and** $(QTE_QT3_DIR)/.configured. if BR2_QTE_C_QTE_VERSION == BR2_QTE_C_QT3_VERSION, +# then it really depends on $(QTE_QTE_DIR)/.configured, which $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) needs, so it's redundant. If QTE is 3.3.0 or later, # then BR2_QTE_C_QTE_VERSION != BR2_QTE_C_QT3_VERSION, then we need to unpack the other Qt/E, so this dependency is not redundant. $(QTE_QTOPIA_DIR)/.configured: $(QTE_QTOPIA_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) $(QTE_QT3_DIR)/.configured @@ -214,11 +214,11 @@ $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY): $(QTE_QVFB_DIR)/.make $(QTE_QTE_DIR)/.unpacke install -m 0755 $(QTE_QVFB_DIR)/tools/qvfb/$(@F) $@ $(QTE_QTE_DIR)/src-mt.mk: $(QTE_QTE_DIR)/.configured - # I don't like the src-mk that gets built, so blow it away. Too many includes to override yet + # I don't like the src-mk that gets built, so blow it away. Too many includes to override yet echo "SHELL=/bin/sh" > $@ echo "" >> $@ echo "src-mt:" >> $@ - echo " cd src; "'$$(MAKE)'" 'QT_THREAD_SUFFIX=-mt' 'QT_LFLAGS_MT="'$$$$(SYSCONF_LFLAGS_THREAD)'" "'$$$$(SYSCONF_LIBS_THREAD)'"' 'QT_CXX_MT="'$$$$(SYSCONF_CXXFLAGS_THREAD)'" -DQT_THREAD_SUPPORT' 'QT_C_MT="'$$$$(SYSCONF_CFLAGS_THREAD)'" -DQT_THREAD_SUPPORT'" >> $@ + echo " cd src; "'$$(MAKE)'" 'QT_THREAD_SUFFIX=-mt' 'QT_LFLAGS_MT="'$$$$(SYSCONF_LFLAGS_THREAD)'" "'$$$$(SYSCONF_LIBS_THREAD)'"' 'QT_CXX_MT="'$$$$(SYSCONF_CXXFLAGS_THREAD)'" -DQT_THREAD_SUPPORT' 'QT_C_MT="'$$$$(SYSCONF_CFLAGS_THREAD)'" -DQT_THREAD_SUPPORT'" >> $@ $(QTE_QTE_LIB): $(QTE_QTE_DIR)/src-mt.mk export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \ diff --git a/package/readline/readline.mk b/package/readline/readline.mk index d5718fc87..366e4e76f 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -54,7 +54,7 @@ $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured touch -c $@ $(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured - $(MAKE) -C $(READLINE_DIR) install + $(MAKE) -C $(READLINE_DIR) install touch -c $@ # Install to Staging area diff --git a/package/samba/samba.mk b/package/samba/samba.mk index c86085d33..18b84147f 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -54,35 +54,35 @@ $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured SAMBA_TARGETS_ := SAMBA_TARGETS_y := -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs \ +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs \ usr/sbin/umount.cifs -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBLOOKUP) += usr/bin/nmblookup -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NTLM_AUTH) += usr/bin/ntlm_auth -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PDBEDIT) += usr/bin/pdbedit -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PROFILES) += usr/bin/profiles -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_RPCCLIENT) += usr/bin/rpcclient -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCACLS) += usr/bin/smbcacls -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCLIENT) += usr/bin/smbclient -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCONTROL) += usr/bin/smbcontrol -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCQUOTAS) += usr/bin/smbcquotas -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBGET) += usr/bin/smbget -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBPASSWD) += usr/bin/smbpasswd -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSPOOL) += usr/bin/smbspool -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSTATUS) += usr/bin/smbstatus -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBTREE) += usr/bin/smbtree -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SWAT) += usr/sbin/swat -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TDB) += usr/bin/tdbbackup \ - usr/bin/tdbdump \ +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBLOOKUP) += usr/bin/nmblookup +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NTLM_AUTH) += usr/bin/ntlm_auth +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PDBEDIT) += usr/bin/pdbedit +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PROFILES) += usr/bin/profiles +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_RPCCLIENT) += usr/bin/rpcclient +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCACLS) += usr/bin/smbcacls +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCLIENT) += usr/bin/smbclient +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCONTROL) += usr/bin/smbcontrol +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCQUOTAS) += usr/bin/smbcquotas +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBGET) += usr/bin/smbget +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBPASSWD) += usr/bin/smbpasswd +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSPOOL) += usr/bin/smbspool +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSTATUS) += usr/bin/smbstatus +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBTREE) += usr/bin/smbtree +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SWAT) += usr/sbin/swat +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TDB) += usr/bin/tdbbackup \ + usr/bin/tdbdump \ usr/bin/tdbtool -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TESTPARM) += usr/bin/testparm -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD) += usr/sbin/winbindd -SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TESTPARM) += usr/bin/testparm +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD) += usr/sbin/winbindd +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ prefix="${TARGET_DIR}/usr" \ BASEDIR="${TARGET_DIR}/usr" \ SBINDIR="${TARGET_DIR}/usr/sbin" \ diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 414bdaebd..b279d0d46 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -53,10 +53,10 @@ $(STAGING_DIR)/include/directfb: ln -s ../usr/include/directfb $(STAGING_DIR)/include/directfb $(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(STAGING_DIR)/include/directfb - $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ INCLUDE="-I./include -I$(STAGING_DIR)/usr/include/directfb" \ LDFLAGS=-L$(STAGING_DIR)/usr \ - DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) + DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) touch $@ $(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk index d6dd26c0f..6cf05b4ec 100644 --- a/package/sfdisk/sfdisk.mk +++ b/package/sfdisk/sfdisk.mk @@ -16,7 +16,7 @@ $(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE) $(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch touch $@ - + $(SFDISK_DIR)/sfdisk: $(SFDISK_DIR)/.patched $(MAKE) \ diff --git a/package/socat/socat.mk b/package/socat/socat.mk index c66c9435b..3478b515d 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -49,7 +49,7 @@ $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked $(DISABLE_NLS); \ $(SED) 's/#define HAVE_TERMIOS_ISPEED 1/#undef HAVE_TERMIOS_ISPEED/g' config.h; \ ) - + $(SOCAT_WORKDIR)/socat: $(SOCAT_WORKDIR)/Makefile rm -f $@ $(MAKE) -C $(SOCAT_WORKDIR) diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 866a823b6..1e9109dac 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -64,14 +64,14 @@ ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace endif -strace: uclibc $(TARGET_DIR)/usr/bin/strace +strace: uclibc $(TARGET_DIR)/usr/bin/strace -strace-clean: +strace-clean: rm -f $(TARGET_DIR)/usr/bin/strace $(MAKE) -C $(STRACE_DIR) clean -strace-dirclean: - rm -rf $(STRACE_DIR) +strace-dirclean: + rm -rf $(STRACE_DIR) ############################################################# diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 8375a3d90..02d15f2a2 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -62,13 +62,13 @@ ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel endif -stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel +stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel -stunnel-clean: +stunnel-clean: $(MAKE) -C $(STUNNEL_DIR) clean -stunnel-dirclean: - rm -rf $(STUNNEL_DIR) +stunnel-dirclean: + rm -rf $(STUNNEL_DIR) ############################################################# diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 8304e164b..d76f6b2ef 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -58,7 +58,7 @@ tar-target_binary: $(GNUTAR_DIR)/$(GNUTAR_BINARY) -ot $(GNUTAR_DIR)/$(GNUTAR_BINARY) ]; then \ set -x; \ rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ - cp -a $(GNUTAR_DIR)/$(GNUTAR_BINARY) $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi + cp -a $(GNUTAR_DIR)/$(GNUTAR_BINARY) $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi tar: uclibc tar-target_binary diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 575092169..52f7a7c21 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -56,7 +56,7 @@ $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY): $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) -ot $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) ]; then \ set -x; \ rm -f $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); \ - cp -a $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); fi + cp -a $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); fi @if [ ! -f $(TARGET_DIR)/etc/init.d/S80tftpd-hpa ]; then \ $(INSTALL) -m 0755 package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d; \ fi diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index 0fd183a23..f037c7255 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -24,11 +24,11 @@ tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE) $(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE) $(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch - touch $(TINYHTTPD_DIR)/.unpacked + touch $(TINYHTTPD_DIR)/.unpacked $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" $(MAKE) -C $(TINYHTTPD_DIR) - + $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY): $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(INSTALL) -m 0755 $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY) diff --git a/package/tinyx-old/tinyx.mk b/package/tinyx-old/tinyx.mk index 06ea37772..dcbf5a9f7 100644 --- a/package/tinyx-old/tinyx.mk +++ b/package/tinyx-old/tinyx.mk @@ -31,8 +31,8 @@ ifeq ($(strip $(BR2_PACKAGE_TINYX_OLD)),y) TINYX_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap #xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \ -# xrdb/xrdb xrandr/xrandr \ -# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes +# xrdb/xrdb xrandr/xrandr \ +# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes # TINYX_LIBS:=ICE X11 Xext Xpm diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index b9fe711c5..2457330b5 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -31,8 +31,8 @@ ifeq ($(strip $(BR2_PACKAGE_TINYX_OLD)),y) TINYX_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap #xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \ -# xrdb/xrdb xrandr/xrandr \ -# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes +# xrdb/xrdb xrandr/xrandr \ +# xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes # TINYX_LIBS:=ICE X11 Xext Xpm diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index c62abfdc1..20beb8d9a 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -5,7 +5,7 @@ TN5250_SOURCE:=tn5250-$(TN5250_VERSION).tar.gz TN5250_CAT:=$(ZCAT) $(DL_DIR)/$(TN5250_SOURCE): - $(WGET) -P $(DL_DIR) $(TN5250_SITE)/$(TN5250_SOURCE) + $(WGET) -P $(DL_DIR) $(TN5250_SITE)/$(TN5250_SOURCE) $(TN5250_DIR)/.dist: $(DL_DIR)/$(TN5250_SOURCE) $(TN5250_CAT) $(DL_DIR)/$(TN5250_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - @@ -46,11 +46,11 @@ tn5250: uclibc slang $(TARGET_DIR)/usr/bin/tn5250 tn5250-source: $(DL_DIR)/$(TN5250_SOURCE) -tn5250-clean: +tn5250-clean: $(MAKE) -C $(TN5250_DIR) clean -tn5250-dirclean: - rm -rf $(TN5250_DIR) +tn5250-dirclean: + rm -rf $(TN5250_DIR) diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 84890f211..60928bad3 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -46,10 +46,10 @@ $(TSLIB_DIR)/.configured: $(TSLIB_DIR)/.patched --enable-input \ ) $(SED) 's:rpl\_malloc:malloc:g' $(TSLIB_DIR)/config.h - touch $(TSLIB_DIR)/.configured + touch $(TSLIB_DIR)/.configured $(TSLIB_DIR)/.compiled: $(TSLIB_DIR)/.configured - $(MAKE) -C $(TSLIB_DIR) + $(MAKE) -C $(TSLIB_DIR) touch $(TSLIB_DIR)/.compiled $(STAGING_DIR)/usr/lib/libts.so: $(TSLIB_DIR)/.compiled @@ -85,7 +85,7 @@ tslib: uclibc $(TARGET_DIR)/usr/lib/libts.so tslib-build: uclibc $(TSLIB_DIR)/.configured rm -f $(TSLIB_DIR)/.compiled - $(MAKE) -C $(TSLIB_DIR) + $(MAKE) -C $(TSLIB_DIR) touch $(TSLIB_DIR)/.compiled tslib-clean: diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk index e24566052..79bc1582a 100644 --- a/package/ttcp/ttcp.mk +++ b/package/ttcp/ttcp.mk @@ -10,7 +10,7 @@ TTCP_SOURCE=ttcp$(TTCP_VERSION).c TTCP_BUILD_DIR=$(BUILD_DIR)/ttcp$(TTCP_VERSION) $(DL_DIR)/$(TTCP_SOURCE): - $(WGET) -P $(DL_DIR) $(TTCP_SOURCE_URL)/$(TTCP_SOURCE) + $(WGET) -P $(DL_DIR) $(TTCP_SOURCE_URL)/$(TTCP_SOURCE) $(TTCP_BUILD_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE) -mkdir $(TTCP_BUILD_DIR) @@ -21,17 +21,17 @@ $(TTCP_BUILD_DIR)/.configured: $(TTCP_BUILD_DIR)/.unpacked touch $(TTCP_BUILD_DIR)/.configured $(TTCP_BUILD_DIR)/ttcp: $(TTCP_BUILD_DIR)/.configured - $(TARGET_CC) -O2 -o $(TTCP_BUILD_DIR)/ttcp $(TTCP_BUILD_DIR)/$(TTCP_SOURCE) + $(TARGET_CC) -O2 -o $(TTCP_BUILD_DIR)/ttcp $(TTCP_BUILD_DIR)/$(TTCP_SOURCE) $(TARGET_DIR)/usr/bin/ttcp: $(TTCP_BUILD_DIR)/ttcp cp -af $(TTCP_BUILD_DIR)/ttcp $(TARGET_DIR)/usr/bin/ -ttcp: $(TARGET_DIR)/usr/bin/ttcp +ttcp: $(TARGET_DIR)/usr/bin/ttcp ttcp-source: $(DL_DIR)/$(TTCP_SOURCE) ttcp-clean: - rm -f $(TTCP_BUILD_DIR)/*.o $(TTCP_BUILD_DIR)/ttcp + rm -f $(TTCP_BUILD_DIR)/*.o $(TTCP_BUILD_DIR)/ttcp ttcp-dirclean: rm -rf $(TTCP_BUILD_DIR) diff --git a/package/udhcp/udhcp.mk b/package/udhcp/udhcp.mk index ff9b28248..0f0b06373 100644 --- a/package/udhcp/udhcp.mk +++ b/package/udhcp/udhcp.mk @@ -36,11 +36,11 @@ $(UDHCP_DIR)/.unpacked: $(DL_DIR)/$(UDHCP_SOURCE) toolchain/patch-kernel.sh $(UDHCP_DIR) package/udhcp/ udhcp\*.patch touch $(UDHCP_DIR)/.unpacked -#$(UDHCP_DIR)/.unpacked: -# (cd $(BUILD_DIR); \ -# CVS_PASSFILE=$(CVS_PASSFILE) \ -# cvs -z3 -d:pserver:anonymous@busybox.net:/var/cvs co udhcp ) -# touch $(UDHCP_DIR)/.unpacked +#$(UDHCP_DIR)/.unpacked: +# (cd $(BUILD_DIR); \ +# CVS_PASSFILE=$(CVS_PASSFILE) \ +# cvs -z3 -d:pserver:anonymous@busybox.net:/var/cvs co udhcp ) +# touch $(UDHCP_DIR)/.unpacked $(UDHCP_DIR)/udhcpc: $(UDHCP_DIR)/.unpacked $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(UDHCP_DIR) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 519513531..caacf55e2 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -73,7 +73,7 @@ endif util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE) util-linux-clean: - #There is no working 'uninstall' target. Just skip it... + #There is no working 'uninstall' target. Just skip it... #$(MAKE) DESTDIR=$(TARGET_DIR) -C $(UTIL-LINUX_DIR) uninstall -$(MAKE) -C $(UTIL-LINUX_DIR) clean diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index f6d30461e..d9dbd195c 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -29,15 +29,15 @@ $(VSFTPD_DIR)/.unpacked: $(DL_DIR)/$(VSFTPD_SOURCE) $(VSFTPD_DIR)/.configured: $(VSFTPD_DIR)/.unpacked ifeq ($(BR2_PACKAGE_OPENSSL),y) - $(SED) 's,#undef[ ]*VSF_BUILD_SSL.*,#define VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h + $(SED) 's,#undef[[:space:]]*VSF_BUILD_SSL.*,#define VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h else - $(SED) 's,#define[ ]*VSF_BUILD_SSL.*,#undef VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h + $(SED) 's,#define[[:space:]]*VSF_BUILD_SSL.*,#undef VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h endif ifneq ($(findstring uclibc,$(BR2_GNU_TARGET_SUFFIX)),) - $(SED) 's,#define[ ]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC__,g' $(VSFTPD_DIR)/builddefs.h + $(SED) 's,#define[[:space:]]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC__,g' $(VSFTPD_DIR)/builddefs.h $(SED) 's,.*__UCLIBC_HAS_LFS__.*,,g' $(VSFTPD_DIR)/builddefs.h ifeq ($(BR2_LARGEFILE),y) - $(SED) 's,#define[ ]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC_HAS_LFS__,g' $(VSFTPD_DIR)/builddefs.h + $(SED) 's,#define[[:space:]]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC_HAS_LFS__,g' $(VSFTPD_DIR)/builddefs.h endif else # not uclibc $(SED) 's,.*__UCLIBC_.*,,g' $(VSFTPD_DIR)/builddefs.h diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index 4c836f54f..9484968be 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -29,11 +29,11 @@ $(WIPE_DIR)/.unpacked: $(DL_DIR)/$(WIPE_SOURCE) $(DL_DIR)/$(WIPE_PATCH) touch $(WIPE_DIR)/.unpacked $(WIPE_DIR)/.configured: $(WIPE_DIR)/.unpacked - touch $@ + touch $@ $(WIPE_DIR)/$(WIPE_BINARY): $(WIPE_DIR)/.configured rm -f $(WIPE_DIR)/$(WIPE_BINARY) - $(MAKE) CC=$(TARGET_CC) -C $(WIPE_DIR) generic + $(MAKE) CC=$(TARGET_CC) -C $(WIPE_DIR) generic $(TARGET_DIR)/$(WIPE_TARGET_BINARY): $(WIPE_DIR)/$(WIPE_BINARY) cp -a $(WIPE_DIR)/$(WIPE_BINARY) $(TARGET_DIR)/$(WIPE_TARGET_BINARY) diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk index 476b9ed75..35dfea60f 100644 --- a/package/x11r7/mesa3d/mesa3d.mk +++ b/package/x11r7/mesa3d/mesa3d.mk @@ -59,15 +59,15 @@ $(MESA3D_DIR)/.installed: $(MESA3D_DIR)/.built rm -Rf $(TARGET_DIR)/usr/include/GL touch $@ -mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm -mesa3d-source: $(DL_DIR)/$(MESA3D_SOURCE) +mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm +mesa3d-source: $(DL_DIR)/$(MESA3D_SOURCE) mesa3d-configure: $(MESA3D_DIR)/.configured -mesa3d-build: $(MESA3D_DIR)/.built -mesa3d: mesa3d-depends $(MESA3D_DIR)/.installed +mesa3d-build: $(MESA3D_DIR)/.built +mesa3d: mesa3d-depends $(MESA3D_DIR)/.installed mesa3d-clean: $(MAKE) prefix=$(STAGING_DIR)/usr -C $(MESA3D_DIR) uninstall - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(MESA3D_DIR) uninstall + $(MAKE) prefix=$(TARGET_DIR)/usr -C $(MESA3D_DIR) uninstall -$(MAKE) -C $(MESA3D_DIR) clean mesa3d-dirclean: diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk index 479675f59..82d700460 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk @@ -8,6 +8,6 @@ XAPP_XDPYINFO_VERSION = 1.0.1 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDPYINFO_AUTORECONF = YES -XAPP_XDPYINFO_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86misc xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86miscproto xproto_xf86vidmodeproto +XAPP_XDPYINFO_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86misc xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86miscproto xproto_xf86vidmodeproto $(eval $(call AUTOTARGETS,xapp_xdpyinfo)) diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk index 5e06bc410..ee5866e56 100644 --- a/package/x11r7/xapp_xman/xapp_xman.mk +++ b/package/x11r7/xapp_xman/xapp_xman.mk @@ -29,7 +29,7 @@ $(XAPP_XMAN_DIR)/.configured: $(XAPP_XMAN_DIR)/.patched CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ STAGING_DIR=$(STAGING_DIR) \ - \ + \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -40,24 +40,24 @@ $(XAPP_XMAN_DIR)/.configured: $(XAPP_XMAN_DIR)/.patched --disable-static \ --disable-IPv6 \ $(DISABLE_NLS) \ - \ + \ ) touch $@ $(XAPP_XMAN_DIR)/.built: $(XAPP_XMAN_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC) -C $(XAPP_XMAN_DIR) + $(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC) -C $(XAPP_XMAN_DIR) touch $@ $(XAPP_XMAN_DIR)/.installed: $(XAPP_XMAN_DIR)/.built - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XAPP_XMAN_DIR) install-exec - $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XAPP_XMAN_DIR) install + $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XAPP_XMAN_DIR) install-exec + $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XAPP_XMAN_DIR) install toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr" find $(TARGET_DIR)/usr -name '*.la' -print -delete touch $@ xapp_xman-clean: - $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XAPP_XMAN_DIR) uninstall - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XAPP_XMAN_DIR) uninstall + $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XAPP_XMAN_DIR) uninstall + $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XAPP_XMAN_DIR) uninstall -$(MAKE) -C $(XAPP_XMAN_DIR) clean -rm $(XAPP_XMAN_DIR)/.installed -rm $(XAPP_XMAN_DIR)/.built @@ -65,11 +65,11 @@ xapp_xman-clean: xapp_xman-dirclean: rm -rf $(XAPP_XMAN_DIR) -xapp_xman-depends: xlib_libXprintUtil xlib_libXprintUtil -xapp_xman-source: $(XAPP_XMAN_DIR)/.extracted -xapp_xman-patch: $(XAPP_XMAN_DIR)/.patched +xapp_xman-depends: xlib_libXprintUtil xlib_libXprintUtil +xapp_xman-source: $(XAPP_XMAN_DIR)/.extracted +xapp_xman-patch: $(XAPP_XMAN_DIR)/.patched xapp_xman-configure: $(XAPP_XMAN_DIR)/.configured -xapp_xman-build: $(XAPP_XMAN_DIR)/.built +xapp_xman-build: $(XAPP_XMAN_DIR)/.built xapp_xman: xapp_xman-depends $(XAPP_XMAN_DIR)/.installed diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index 3ae4410e4..f9140ca91 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -29,7 +29,7 @@ $(XDATA_XCURSOR_THEMES_DIR)/.configured: $(XDATA_XCURSOR_THEMES_DIR)/.patched CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ STAGING_DIR=$(STAGING_DIR) \ - \ + \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -40,24 +40,24 @@ $(XDATA_XCURSOR_THEMES_DIR)/.configured: $(XDATA_XCURSOR_THEMES_DIR)/.patched --disable-static \ --disable-IPv6 \ $(DISABLE_NLS) \ - \ + \ ) touch $@ $(XDATA_XCURSOR_THEMES_DIR)/.built: $(XDATA_XCURSOR_THEMES_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC) -C $(XDATA_XCURSOR_THEMES_DIR) + $(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC) -C $(XDATA_XCURSOR_THEMES_DIR) touch $@ $(XDATA_XCURSOR_THEMES_DIR)/.installed: $(XDATA_XCURSOR_THEMES_DIR)/.built - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) install-exec - $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) install + $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) install-exec + $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) install toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr" find $(TARGET_DIR)/usr -name '*.la' -print -delete touch $@ xdata_xcursor-themes-clean: - $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall - $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall + $(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall + $(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall -$(MAKE) -C $(XDATA_XCURSOR_THEMES_DIR) clean -rm $(XDATA_XCURSOR_THEMES_DIR)/.installed -rm $(XDATA_XCURSOR_THEMES_DIR)/.built @@ -65,11 +65,11 @@ xdata_xcursor-themes-clean: xdata_xcursor-themes-dirclean: rm -rf $(XDATA_XCURSOR_THEMES_DIR) -xdata_xcursor-themes-depends: -xdata_xcursor-themes-source: $(XDATA_XCURSOR_THEMES_DIR)/.extracted -xdata_xcursor-themes-patch: $(XDATA_XCURSOR_THEMES_DIR)/.patched +xdata_xcursor-themes-depends: +xdata_xcursor-themes-source: $(XDATA_XCURSOR_THEMES_DIR)/.extracted +xdata_xcursor-themes-patch: $(XDATA_XCURSOR_THEMES_DIR)/.patched xdata_xcursor-themes-configure: $(XDATA_XCURSOR_THEMES_DIR)/.configured -xdata_xcursor-themes-build: $(XDATA_XCURSOR_THEMES_DIR)/.built +xdata_xcursor-themes-build: $(XDATA_XCURSOR_THEMES_DIR)/.built xdata_xcursor-themes: xdata_xcursor-themes-depends $(XDATA_XCURSOR_THEMES_DIR)/.installed diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk index 808f992c1..85a9afe11 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.mk +++ b/package/x11r7/xfont_encodings/xfont_encodings.mk @@ -8,6 +8,6 @@ XFONT_ENCODINGS_VERSION = 1.0.2 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_ENCODINGS_AUTORECONF = YES -XFONT_ENCODINGS_MAKE_OPT = +XFONT_ENCODINGS_MAKE_OPT = $(eval $(call AUTOTARGETS,xfont_encodings)) diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk index 1bfd39556..ad8bb7c35 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.mk +++ b/package/x11r7/xlib_libICE/xlib_libICE.mk @@ -10,6 +10,6 @@ XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBICE_AUTORECONF = YES XLIB_LIBICE_INSTALL_STAGING = YES XLIB_LIBICE_DEPENDANCIES = xlib_xtrans xproto_xproto -XLIB_LIBICE_CONF_OPT = --enable-shared --disable-static +XLIB_LIBICE_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libICE)) diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk index 2bbf2dcfd..c3790c3e2 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.mk +++ b/package/x11r7/xlib_libSM/xlib_libSM.mk @@ -10,6 +10,6 @@ XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBSM_AUTORECONF = YES XLIB_LIBSM_INSTALL_STAGING = YES XLIB_LIBSM_DEPENDANCIES = xlib_libICE xlib_xtrans xproto_xproto -XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static +XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libSM)) diff --git a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk index 1ed7a62f0..388105673 100644 --- a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk +++ b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk @@ -10,6 +10,6 @@ XLIB_LIBXTRAP_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXTRAP_AUTORECONF = YES XLIB_LIBXTRAP_INSTALL_STAGING = YES XLIB_LIBXTRAP_DEPENDANCIES = xlib_libX11 xlib_libXt xlib_libXext xproto_trapproto -XLIB_LIBXTRAP_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXTRAP_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXTrap)) diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk index fd62c5e57..5a214b32a 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.mk +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk @@ -10,6 +10,6 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_AUTORECONF = YES XLIB_LIBXAU_INSTALL_STAGING = YES XLIB_LIBXAU_DEPENDANCIES = xproto_xproto xproto_xproto xutil_util-macros -XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXau)) diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk index 6eacaa761..b85ac2f7b 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -10,6 +10,6 @@ XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAW_AUTORECONF = YES XLIB_LIBXAW_INSTALL_STAGING = YES XLIB_LIBXAW_DEPENDANCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp -XLIB_LIBXAW_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXAW_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXaw)) diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk index 0c0748635..f5704ca15 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk @@ -10,6 +10,6 @@ XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCOMPOSITE_AUTORECONF = YES XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES XLIB_LIBXCOMPOSITE_DEPENDANCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto -XLIB_LIBXCOMPOSITE_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXCOMPOSITE_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXcomposite)) diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk index 681aa6853..c38556c29 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk @@ -10,6 +10,6 @@ XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCURSOR_AUTORECONF = YES XLIB_LIBXCURSOR_INSTALL_STAGING = YES XLIB_LIBXCURSOR_DEPENDANCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto -XLIB_LIBXCURSOR_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXCURSOR_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXcursor)) diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk index 8f6b61a36..7d65a86d1 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk @@ -10,6 +10,6 @@ XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXDAMAGE_AUTORECONF = YES XLIB_LIBXDAMAGE_INSTALL_STAGING = YES XLIB_LIBXDAMAGE_DEPENDANCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto -XLIB_LIBXDAMAGE_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXDAMAGE_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXdamage)) diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk index ba191e5dc..c374dd5cb 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk @@ -10,6 +10,6 @@ XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXDMCP_AUTORECONF = YES XLIB_LIBXDMCP_INSTALL_STAGING = YES XLIB_LIBXDMCP_DEPENDANCIES = xutil_util-macros xproto_xproto -XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXdmcp)) diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index b7694063c..aec404452 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -10,6 +10,6 @@ XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFIXES_AUTORECONF = YES XLIB_LIBXFIXES_INSTALL_STAGING = YES XLIB_LIBXFIXES_DEPENDANCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto -XLIB_LIBXFIXES_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXFIXES_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXfixes)) diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk index eef50e863..48cdbd396 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk @@ -10,6 +10,6 @@ XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONT_AUTORECONF = YES XLIB_LIBXFONT_INSTALL_STAGING = YES XLIB_LIBXFONT_DEPENDANCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings -XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXfont)) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 77afd4a72..1d9290a7e 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -10,6 +10,6 @@ XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFT_AUTORECONF = YES XLIB_LIBXFT_INSTALL_STAGING = YES XLIB_LIBXFT_DEPENDANCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto -XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXft)) diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk index 18c4b2d34..e17832eed 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk @@ -10,6 +10,6 @@ XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXMU_AUTORECONF = YES XLIB_LIBXMU_INSTALL_STAGING = YES XLIB_LIBXMU_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto -XLIB_LIBXMU_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXMU_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXmu)) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index aa00a6697..7a7bec781 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -10,6 +10,6 @@ XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPM_AUTORECONF = YES XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto -XLIB_LIBXPM_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXPM_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXpm)) diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk index 3c69c190e..2ac8562f1 100644 --- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk +++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk @@ -10,6 +10,6 @@ XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPRINTAPPUTIL_AUTORECONF = YES XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES XLIB_LIBXPRINTAPPUTIL_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil -XLIB_LIBXPRINTAPPUTIL_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXPRINTAPPUTIL_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXprintAppUtil)) diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk index 5eed49754..19fdeaf9b 100644 --- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk +++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk @@ -10,6 +10,6 @@ XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPRINTUTIL_AUTORECONF = YES XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES XLIB_LIBXPRINTUTIL_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto -XLIB_LIBXPRINTUTIL_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXPRINTUTIL_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXprintUtil)) diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk index d27b5321d..cac9e23fe 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk @@ -10,6 +10,6 @@ XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXTST_AUTORECONF = YES XLIB_LIBXTST_INSTALL_STAGING = YES XLIB_LIBXTST_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_recordproto -XLIB_LIBXTST_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXTST_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libXtst)) diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk index 6e8e1e544..06ce711f3 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk @@ -10,6 +10,6 @@ XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFONTENC_AUTORECONF = YES XLIB_LIBFONTENC_INSTALL_STAGING = YES XLIB_LIBFONTENC_DEPENDANCIES = xproto_xproto -XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static +XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libfontenc)) diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk index 2f505c4c5..de1ca6d26 100644 --- a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk +++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk @@ -10,6 +10,6 @@ XLIB_LIBLBXUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBLBXUTIL_AUTORECONF = YES XLIB_LIBLBXUTIL_INSTALL_STAGING = YES XLIB_LIBLBXUTIL_DEPENDANCIES = xproto_xextproto -XLIB_LIBLBXUTIL_CONF_OPT = --enable-shared --disable-static +XLIB_LIBLBXUTIL_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_liblbxutil)) diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk index fe195477c..37f98b025 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk @@ -10,6 +10,6 @@ XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXKBFILE_AUTORECONF = YES XLIB_LIBXKBFILE_INSTALL_STAGING = YES XLIB_LIBXKBFILE_DEPENDANCIES = xlib_libX11 xproto_kbproto -XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libxkbfile)) diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk index 25643647f..c0224cc88 100644 --- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk +++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk @@ -10,6 +10,6 @@ XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXKBUI_AUTORECONF = YES XLIB_LIBXKBUI_INSTALL_STAGING = YES XLIB_LIBXKBUI_DEPENDANCIES = xlib_libxkbfile xlib_libXt xproto_kbproto -XLIB_LIBXKBUI_CONF_OPT = --enable-shared --disable-static +XLIB_LIBXKBUI_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_libxkbui)) diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk index 7d4c3e388..897adf710 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk @@ -9,6 +9,6 @@ XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_XTRANS_AUTORECONF = YES XLIB_XTRANS_INSTALL_STAGING = YES -XLIB_XTRANS_CONF_OPT = --enable-shared --disable-static +XLIB_XTRANS_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,xlib_xtrans)) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 942456a68..ae8183dd0 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,7 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_AUTORECONF = YES XSERVER_XORG_SERVER_INSTALL_STAGING = YES -XSERVER_XORG_SERVER_DEPENDANCIES = xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto +XSERVER_XORG_SERVER_DEPENDANCIES = xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --enable-dri --disable-xdmcp --disable-screensaver $(eval $(call AUTOTARGETS,xserver_xorg-server)) diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index baf05109e..41c963538 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -17,7 +17,7 @@ xerces-source: $(DL_DIR)/$(XERCES_SOURCE) $(XERCES_DIR)/.unpacked: $(DL_DIR)/$(XERCES_SOURCE) $(XERCES_CAT) $(DL_DIR)/$(XERCES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - -# toolchain/patch-kernel.sh $(XERCES_DIR) package/xerces/ \*.patch* +# toolchain/patch-kernel.sh $(XERCES_DIR) package/xerces/ \*.patch* touch $(XERCES_DIR)/.unpacked $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked @@ -34,7 +34,7 @@ $(XERCES_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/.configured $(MAKE) XERCESCROOT=$(XERCES_DIR) -C $(XERCES_DIR)/src/xercesc $(STAGING_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/$(XERCES_BINARY) - $(MAKE) XERCESCROOT=$(XERCES_DIR) PREFIX=$(STAGING_DIR) \ + $(MAKE) XERCESCROOT=$(XERCES_DIR) PREFIX=$(STAGING_DIR) \ -C $(XERCES_DIR)/src/xercesc install $(TARGET_DIR)/usr/$(XERCES_BINARY): $(STAGING_DIR)/$(XERCES_BINARY) diff --git a/project/project.mk b/project/project.mk index b33f90181..847cde99e 100644 --- a/project/project.mk +++ b/project/project.mk @@ -1,14 +1,14 @@ -.PHONY: target-host-info +.PHONY: target-host-info target-host-info: $(TARGET_DIR)/etc/issue $(TARGET_DIR)/etc/hostname -$(TARGET_DIR)/etc/issue: .config +$(TARGET_DIR)/etc/issue: .config mkdir -p $(TARGET_DIR)/etc - echo "" > $(TARGET_DIR)/etc/issue - echo "" >> $(TARGET_DIR)/etc/issue - echo "$(BANNER)" >> $(TARGET_DIR)/etc/issue + echo "" > $(TARGET_DIR)/etc/issue + echo "" >> $(TARGET_DIR)/etc/issue + echo "$(BANNER)" >> $(TARGET_DIR)/etc/issue -$(TARGET_DIR)/etc/hostname: .config +$(TARGET_DIR)/etc/hostname: .config mkdir -p $(TARGET_DIR)/etc echo "$(TARGET_HOSTNAME)" > $(TARGET_DIR)/etc/hostname diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk index 180d43f72..5f55bf5a9 100644 --- a/target/cloop/cloop.mk +++ b/target/cloop/cloop.mk @@ -18,7 +18,7 @@ CLOOP_SITE=http://developer.linuxtag.net/knoppix/sources CLOOP_TARGET:=$(IMAGE).cloop ### Note: not used yet! ck ### $(DL_DIR)/$(CLOOP_PATCH1): -### $(WGET) -P $(DL_DIR) $(CLOOP_PATCH1_URL)/$(CLOOP_PATCH1) +### $(WGET) -P $(DL_DIR) $(CLOOP_PATCH1_URL)/$(CLOOP_PATCH1) $(DL_DIR)/$(CLOOP_SOURCE): $(WGET) -P $(DL_DIR) $(CLOOP_SITE)/$(CLOOP_SOURCE) @@ -26,8 +26,8 @@ $(DL_DIR)/$(CLOOP_SOURCE): $(CLOOP_DIR)/.unpacked: $(DL_DIR)/$(CLOOP_SOURCE) ### $(DL_DIR)/$(CLOOP_PATCH1) $(ZCAT) $(DL_DIR)/$(CLOOP_SOURCE) | tar -C $(BUILD_DIR) -xvf - touch $@ -### $(ZCAT) $(DL_DIR)/$(CLOOP_PATCH1) | patch -p1 -d $(CLOOP_DIR) -### toolchain/patch-kernel.sh $(CLOOP_DIR) target/cloop/ cloop\*.patch +### $(ZCAT) $(DL_DIR)/$(CLOOP_PATCH1) | patch -p1 -d $(CLOOP_DIR) +### toolchain/patch-kernel.sh $(CLOOP_DIR) target/cloop/ cloop\*.patch $(CLOOP_DIR)/create_compressed_fs: $(CLOOP_DIR)/.unpacked $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_ERROR_SILENT" -C $(CLOOP_DIR) \ @@ -63,7 +63,7 @@ cloop-module: $(CLOOP_DIR)/cloop.o # mkisofs 2.01a34-unofficial-iconv from http://users.utu.fi/jahhein/mkisofs/ # optional: # symlinks: scan/change symbolic links - v1.2 - by Mark Lord -# from ftp://ftp.ibiblio.org/pub/Linux/utils/file/ +# from ftp://ftp.ibiblio.org/pub/Linux/utils/file/ # ############################################################# @@ -119,7 +119,7 @@ clooproot-dirclean: # other_fs: /mnt/compressed/var/tmp -> /tmp # # ls -lrsS root_fs_*.* -# 1296 -rw-r--r-- 1 claus users 1325478 Mar 13 16:52 root_fs_powerpc.cloop -# 1448 -rw-r--r-- 1 claus users 1482752 Mar 13 16:52 root_fs_powerpc.cramfs -# 1840 -rw-r--r-- 1 claus users 1883408 Mar 13 13:14 root_fs_powerpc.jffs2 +# 1296 -rw-r--r-- 1 claus users 1325478 Mar 13 16:52 root_fs_powerpc.cloop +# 1448 -rw-r--r-- 1 claus users 1482752 Mar 13 16:52 root_fs_powerpc.cramfs +# 1840 -rw-r--r-- 1 claus users 1883408 Mar 13 13:14 root_fs_powerpc.jffs2 ############################################################# diff --git a/target/device/AMD/DBAu1500/linux26.mk b/target/device/AMD/DBAu1500/linux26.mk index 7a457c7b0..7ef013f00 100644 --- a/target/device/AMD/DBAu1500/linux26.mk +++ b/target/device/AMD/DBAu1500/linux26.mk @@ -63,7 +63,7 @@ $(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked #toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) touch $(LINUX26_DIR)/.patched -$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) +$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) -cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig touch $(LINUX26_DIR)/.configured @@ -73,7 +73,7 @@ linux26-menuconfig: $(LINUX26_DIR)/.patched $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured -$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured +$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare touch $(LINUX26_DIR)/.depend_done diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index 35fa7c343..716e147b8 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -5,7 +5,7 @@ ############################################################# DATAFLASHBOOT_VERSION:=1.05 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)/Source DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2 diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index e920be933..728c51c9e 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -3,9 +3,9 @@ ifeq ($(strip $(BR2_TARGET_ATMEL)),y) ATMEL_PATH:=target/device/Atmel -BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) +BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) #")) -BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) +BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) #")) ATMEL_TARGET:=$(ATMEL_PATH)/root @@ -13,24 +13,24 @@ TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton TARGET_DEVICE_TABLE:=$(ATMEL_TARGET)/device_table.txt TARGET_SKELETON_LINKS:=$(ATMEL_TARGET)/skel.tar.gz -TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) +TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) # These are set by Config.in -DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) #")) ifeq ($(DOWNLOAD_LINUX26_VERSION),) DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) #")) ifeq ($(LINUX26_VERSION),) LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) +LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) #")) -LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) +LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) #")) # These are set by "new" Config.in diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index ee1212244..5faef4175 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -7,31 +7,31 @@ AT91BOOTSTRAP_VERSION:=2.3 AT91BOOTSTRAP_PATCH_LEVEL:=2 AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_PATCH_LEVEL) AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)/Source AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2 AT91BOOTSTRAP_DIR:=$(PROJECT_BUILD_DIR)/$(AT91BOOTSTRAP_NAME) -AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) +AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) #")) AT91BOOTSTRAP_ZCAT:=bzcat -AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) +AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) #")) AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY) -AT91BOOTSTRAP_JUMP_ADDR:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR))) -AT91BOOTSTRAP_IMG_SIZE:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE))) +AT91BOOTSTRAP_JUMP_ADDR:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR))) +AT91BOOTSTRAP_IMG_SIZE:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE))) AT91_CUSTOM_FLAGS:= ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),) -AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR) +AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR) endif ifneq ($(AT91BOOTSTRAP_IMG_SIZE),) -AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) +AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) endif $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): @@ -47,16 +47,16 @@ atbu: $(AT91BOOTSTRAP_DIR)/.unpacked $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config $(MAKE) \ - MEMORY=$(AT91BOOTSTRAP_MEMORY) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - -C $(AT91BOOTSTRAP_DIR) \ + MEMORY=$(AT91BOOTSTRAP_MEMORY) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + -C $(AT91BOOTSTRAP_DIR) \ $(BOARD_NAME)_defconfig touch $(AT91BOOTSTRAP_DIR)/.configured $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured $(MAKE) \ - MEMORY=$(AT91BOOTSTRAP_MEMORY) \ - CROSS_COMPILE=$(TARGET_CROSS) \ + MEMORY=$(AT91BOOTSTRAP_MEMORY) \ + CROSS_COMPILE=$(TARGET_CROSS) \ AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \ -C $(AT91BOOTSTRAP_DIR) @@ -65,13 +65,13 @@ $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET) cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) cp $(AT91BOOTSTRAP_TARGET) /tftpboot/$(AT91BOOTSTRAP_BINARY) -.PHONY: at91bootstrap at91bootstrap-source +.PHONY: at91bootstrap at91bootstrap-source at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) -.PHONY: at91bootstrap-clean at91bootstrap-dirclean +.PHONY: at91bootstrap-clean at91bootstrap-dirclean at91bootstrap-clean: make -C $(AT91BOOTSTRAP_DIR) clean diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index 35b9f2166..5bd1ce278 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -1,14 +1,14 @@ ############################################################# # # u-boot mkimage to build to target u-boot filesystems and -# -# u-boot.bin - the boot loader for the target - which needs soft float, so -# we won't make it. +# +# u-boot.bin - the boot loader for the target - which needs soft float, so +# we won't make it. # # ############################################################# UBOOT_VERSION:=1.2.0-atmel -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) UBOOT_DIR:=$(BUILD_DIR)/u-boot-$(UBOOT_VERSION) UBOOT_BUILD_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(UBOOT_VERSION) @@ -30,15 +30,15 @@ UBOOT_PATCHES:=$(PROJECT_BUILD_DIR)/u-boot-patches UBOOT_ATMEL_BMP:=$(UBOOT_PATCHES)/atmel.bmp UBOOT_SCR=$(BINARIES_DIR)/autoscript -TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR))) +TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR))) #")) -TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP))) +TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP))) #")) -TARGET_UBOOT_GATEWAY:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY))) +TARGET_UBOOT_GATEWAY:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY))) #")) -TARGET_UBOOT_NETMASK:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_NETMASK))) +TARGET_UBOOT_NETMASK:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_NETMASK))) #")) -TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR))) +TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR))) #")) UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h @@ -61,9 +61,9 @@ $(UBOOT_PATCHES)/.unpacked: $(DL_DIR)/$(UBOOT_PATCH_SOURCE) $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATCHES)/.unpacked toolchain/patch-kernel.sh $(UBOOT_DIR) $(UBOOT_PATCHES) *.patch touch $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE) -# cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/. -# cp $(UBOOT_PATCHES)/cmd_defenv.c $(UBOOT_DIR)/common/. -# cp $(UBOOT_ATMEL_BMP) $(UBOOT_DIR)/tools/logos/. +# cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/. +# cp $(UBOOT_PATCHES)/cmd_defenv.c $(UBOOT_DIR)/common/. +# cp $(UBOOT_ATMEL_BMP) $(UBOOT_DIR)/tools/logos/. $(UBOOT_BUILD_DIR)/.configured: $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE) ifneq ($(strip $(UBOOT_CONFIG_FILE)),) @@ -76,7 +76,7 @@ endif $(UBOOT_CONFIG) $(SED) 's/ $$(SREC) $$(BIN)//' $(UBOOT_DIR)/examples/Makefile touch $(UBOOT_BUILD_DIR)/.configured -# $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR) +# $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR) $(MKIMAGE_BINLOC): $(UBOOT_BUILD_DIR)/.configured $(MAKE) \ @@ -167,17 +167,17 @@ endif $(UBOOT_SCR).$(PROJECT): $(UBOOT_SCR) $(MKIMAGE) $(MKIMAGE) -A arm \ - -O linux \ - -T script \ - -C none \ - -a 0 \ - -e 0 \ + -O linux \ + -T script \ + -C none \ + -a 0 \ + -e 0 \ -n "autoscr config" \ - -d $(UBOOT_SCR) \ + -d $(UBOOT_SCR) \ $(UBOOT_SCR).$(PROJECT) cp $(UBOOT_SCR).$(PROJECT) /tftpboot -$(MKIMAGE): $(MKIMAGE_BINLOC) +$(MKIMAGE): $(MKIMAGE_BINLOC) cp -f $(MKIMAGE_BINLOC) $(MKIMAGE) uboot: $(MKIMAGE) uboot-bin $(UBOOT_SCR).$(PROJECT) @@ -191,7 +191,7 @@ uboot-clean: rm -fr $(UBOOT_DIR) rm -f $(UBOOT_SCR) rm -f $(UBOOT_SCR).$(PROJECT) -# -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean +# -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean uboot-dirclean: uboot-clean rm -rf $(UBOOT_DIR) diff --git a/target/device/Sharp/LNode80/linux.mk b/target/device/Sharp/LNode80/linux.mk index 3fd52193e..4dcef714b 100644 --- a/target/device/Sharp/LNode80/linux.mk +++ b/target/device/Sharp/LNode80/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -79,14 +79,14 @@ $(LINUX_KCONFIG): sleep 5; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/device/Soekris/net4521/linux.mk b/target/device/Soekris/net4521/linux.mk index bda61788b..8e0b3be97 100644 --- a/target/device/Soekris/net4521/linux.mk +++ b/target/device/Soekris/net4521/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -80,14 +80,14 @@ $(LINUX_KCONFIG): sleep 5; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/device/Soekris/soekris_gpio/Makefile b/target/device/Soekris/soekris_gpio/Makefile index d96c9b707..ac31bbfee 100644 --- a/target/device/Soekris/soekris_gpio/Makefile +++ b/target/device/Soekris/soekris_gpio/Makefile @@ -5,32 +5,32 @@ include $(LINUX_KCONFIG) -CFLAGS =-O2 -DMODULE -D__KERNEL__ -I$(LINUX_SOURCE_DIR)/include -Wall +CFLAGS =-O2 -DMODULE -D__KERNEL__ -I$(LINUX_SOURCE_DIR)/include -Wall TARGET := gpio ifdef CONFIG_SMP CFLAGS +=-D__SMP__-DSMP endif -all: gpio.o writelcd.o +all: gpio.o writelcd.o gpio.o: common.o 4501driver.o 4801driver.o - $(LD) -r 4501driver.o 4801driver.o common.o -o gpio.o + $(LD) -r 4501driver.o 4801driver.o common.o -o gpio.o -4501gpio.o: common.o 4501driver.o - $(LD) -r 4501driver.o common.o -o 4501gpio.o +4501gpio.o: common.o 4501driver.o + $(LD) -r 4501driver.o common.o -o 4501gpio.o -4501driver.o: 4501driver.c 4501driver.h +4501driver.o: 4501driver.c 4501driver.h $(CC) $(CFLAGS) -c 4501driver.c -o 4501driver.o -4801gpio.o: common.o 4801driver.o - $(LD) -r 4801driver.o common.o -o 4801gpio.o +4801gpio.o: common.o 4801driver.o + $(LD) -r 4801driver.o common.o -o 4801gpio.o -4801driver.o: 4801driver.c 4801driver.h +4801driver.o: 4801driver.c 4801driver.h $(CC) $(CFLAGS) -c 4801driver.c -o 4801driver.o -writelcd.o: common_writelcd.o 4801driver.o 4501driver.o - $(LD) -r 4801driver.o 4501driver.o common_writelcd.o -o writelcd.o +writelcd.o: common_writelcd.o 4801driver.o 4501driver.o + $(LD) -r 4801driver.o 4501driver.o common_writelcd.o -o writelcd.o common.o: common.c common.h $(CC) $(CFLAGS) -c common.c -o common.o diff --git a/target/device/Via/epia-mii/linux.mk b/target/device/Via/epia-mii/linux.mk index 0fdd7c004..9b5ea4600 100644 --- a/target/device/Via/epia-mii/linux.mk +++ b/target/device/Via/epia-mii/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -71,13 +71,13 @@ $(LINUX_KCONFIG): $(MAKE) menuconfig; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk index 8e74a308a..3a277f8e0 100644 --- a/target/device/jp/q5/linux.mk +++ b/target/device/jp/q5/linux.mk @@ -2,21 +2,21 @@ # # Linux kernel targets # -# Note: If you have any patches to apply, create the directory +# Note: If you have any patches to apply, create the directory # sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. +# them in the order you wish to apply them... i.e. # -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... +# sources/kernel-patches/001-my-special-stuff.bz2 +# sources/kernel-patches/003-gcc-Os.bz2 +# sources/kernel-patches/004_no-warnings.bz2 +# sources/kernel-patches/030-lowlatency-mini.bz2 +# sources/kernel-patches/031-lowlatency-fixes-5.bz2 +# sources/kernel-patches/099-shutup.bz2 +# etc... # # these patches will all be applied by the patch-kernel.sh # script (which will also abort the build if it finds rejects) -# -Erik +# -Erik # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -80,7 +80,7 @@ $(LINUX_KCONFIG): sleep 5; \ fi -$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) +$(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured: $(LINUX_DIR)/.unpacked $(LINUX_KCONFIG) $(SED) "s,^ARCH.*,ARCH=$(LINUX_KARCH),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config @@ -90,7 +90,7 @@ endif $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(MAKE) PATH=$(TARGET_PATH) -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 099108161..fd0016df8 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -58,7 +58,7 @@ ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),) EXT2_OPTS += -m $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)) endif -EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT)) +EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT)) #") EXT2_ROOTFS_COMPRESSOR:= diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk index 8dd75b5a5..5476b23cb 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -1,7 +1,7 @@ ############################################################# # # Make a initramfs_list file to be used by gen_init_cpio -# gen_init_cpio is part of the 2.6 linux kernels to build an +# gen_init_cpio is part of the 2.6 linux kernels to build an # initial ramdisk filesystem based on cpio # ############################################################# @@ -31,7 +31,7 @@ endif # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - # Use fakeroot so gen_initramfs_list.sh believes the previous fakery + # Use fakeroot so gen_initramfs_list.sh believes the previous fakery echo "$(CONFIG_SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $(INITRAMFS_TARGET)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 4d468dcab..9cdf486fa 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -22,7 +22,7 @@ $(MKISOFS_DIR)/.unpacked: $(DL_DIR)/$(MKISOFS_SOURCE) $(MKISOFS_DIR)/.configured: $(MKISOFS_DIR)/.unpacked (cd $(MKISOFS_DIR); rm -rf config.cache; \ ) - touch $(MKISOFS_DIR)/.configured + touch $(MKISOFS_DIR)/.configured $(MKISOFS_TARGET): $(MKISOFS_DIR)/.configured $(MAKE) -C $(MKISOFS_DIR) diff --git a/target/linux-experimental/Makefile.in b/target/linux-experimental/Makefile.in index 6f37aa74c..ab9a6135d 100644 --- a/target/linux-experimental/Makefile.in +++ b/target/linux-experimental/Makefile.in @@ -9,13 +9,13 @@ ifneq ($(filter $(TARGETS),linux26),) ifeq ($(LINUX_HEADERS_VERSION),) # Version of Linux to download and then apply patches to # XXX: andersee, i do not understand why we need this (BF) -DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) # ")) -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) # ")) -LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) +LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) # ")) -LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) +LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) # " )) MKIMAGE:=$(BUILD_DIR)/mkimage @@ -26,13 +26,13 @@ endif LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION) -else # --------------------------------------------------- +else # --------------------------------------------------- # Define DOWNLOAD_LINUX26_VERSION unless defined ifeq ($(strip $(BR2_DOWNLOAD_LINUX26_VERSION)),) DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION) else -DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) # ")) endif @@ -41,15 +41,15 @@ endif ifeq ($(strip $(BR2_LINUX26_VERSION)),) LINUX26_VERSION=$(LINUX_HEADERS_VERSION) else -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) # ")) endif -endif # --------------------------------------------------- +endif # --------------------------------------------------- # Handle case when we want to build using an "rc" patch # Example: to build 2.6.21-rc1 you need to: -# * Download linux-2.6.20 +# * Download linux-2.6.20 # * Apply patch-2.6.21-rc1 LINUX26_SOURCE:=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2 @@ -57,7 +57,7 @@ LINUX26_SITE=http://ftp.kernel.org/pub/linux/kernel/v2.6 LINUX26_BZCAT:=$(BZCAT) # Linux kernel binary -LINUX26_FORMAT:=$(strip $(subst ",, $(BR2_LINUX26_FORMAT))) +LINUX26_FORMAT:=$(strip $(subst ",, $(BR2_LINUX26_FORMAT))) # " )) # Linux kernel configuration file @@ -102,11 +102,11 @@ LINUX_DIR=$(LINUX26_DIR) LINUX_KERNEL=$(LINUX26_KERNEL) # kernel patches -ifeq ($(strip $(subst ",, $(LINUX26_PATCH_DIR))),) +ifeq ($(strip $(subst ",, $(LINUX26_PATCH_DIR))),) # "))) LINUX26_PATCH_DIR:=$(BR2_BOARD_PATH)/kernel-patches/ endif -PATCH_DIR=$(strip $(subst ",, $(LINUX26_PATCH_DIR))) +PATCH_DIR=$(strip $(subst ",, $(LINUX26_PATCH_DIR))) # " )) LINUX26_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ARCH=$(KERNEL_ARCH) \ @@ -120,24 +120,24 @@ $(LINUX26_KCONFIG): echo "and install it as $(LINUX26_KCONFIG)"; \ echo ""; \ sleep 5; \ - fi; + fi # Check if we have a release candidate. -# This makes life complex -# To build linux-2.6.21-rc2 you need to: -# * Download linux.2.6.20.tar.bz2 -# * Download patch-2.6.21-rc2.bz2 -# I:E you have to download the *previous* major version - -ifneq ($(LINUX26_RC_PATCH),) +# This makes life complex +# To build linux-2.6.21-rc2 you need to: +# * Download linux.2.6.20.tar.bz2 +# * Download patch-2.6.21-rc2.bz2 +# I:E you have to download the *previous* major version + +ifneq ($(LINUX26_RC_PATCH),) # We have a "release candidate" LINUX26_RC_PATCH_SOURCE:=$(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH) # Create rule to download the patch $(LINUX26_RC_PATCH_SOURCE): mkdir -p $(PROJECT_BUILD_DIR)/linux-patch/ - $(WGET) -P $(PROJECT_BUILD_DIR)/linux-patch $(LINUX26_SITE)/$(LINUX26_RC_PATCH) -# $(LINUX26_BZCAT) $(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH).bz2 + $(WGET) -P $(PROJECT_BUILD_DIR)/linux-patch $(LINUX26_SITE)/$(LINUX26_RC_PATCH) +# $(LINUX26_BZCAT) $(PROJECT_BUILD_DIR)/linux-patch/$(LINUX26_RC_PATCH).bz2 else # We have a vanilla style linux kernel LINUX26_RC_PATCH_SOURCE:= @@ -155,7 +155,7 @@ ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION)) # Rename the dir from the downloaded version to the AFTER patch version mv -f $(LINUX26_BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR) endif -ifneq ($(LINUX26_RC_PATCH),) +ifneq ($(LINUX26_RC_PATCH),) -(cd $(LINUX26_DIR); $(LINUX26_BZCAT) $(LINUX26_RC_PATCH_SOURCE) | patch -p1) endif -(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX26_DIR) linux) @@ -168,7 +168,7 @@ $(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) touch $@ -$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) +$(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) -ls -l $(LINUX26_DIR)/.patched -ls -l $(LINUX26_KCONFIG) -ls -l $(LINUX26_DIR)/.configured @@ -194,7 +194,7 @@ endif $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig include/linux/version.h touch $@ -$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured +$(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare touch $@ @@ -211,8 +211,8 @@ $(LINUX26_DIR)/vmlinux: $(LINUX26_DIR)/.depend_done $(STAGING_DIR)/include/linux #----------------------------------------------------------------------------------- -# Rule can be enabled by setting -# LINUX26_TARGET:= $(TARGET_DIR)/boot/$(LINUX26_BINLOC) +# Rule can be enabled by setting +# LINUX26_TARGET:= $(TARGET_DIR)/boot/$(LINUX26_BINLOC) # $(TARGET_DIR)/boot/$(LINUX26_FORMAT): $(LINUX26_DIR)/$(LINUX26_FORMAT) [ -d $(TARGET_DIR)/boot/ ] || mkdir $(TARGET_DIR)/boot @@ -220,33 +220,33 @@ $(TARGET_DIR)/boot/$(LINUX26_FORMAT): $(LINUX26_DIR)/$(LINUX26_FORMAT) touch -c $@ #----------------------------------------------------------------------------------- -# Rule can be enabled by setting -# LINUX26_TARGET:= $(BINARIES_DIR)/$(LINUX26_KERNEL) -# LINUX26_FORMAT:= vmlinux +# Rule can be enabled by setting +# LINUX26_TARGET:= $(BINARIES_DIR)/$(LINUX26_KERNEL) +# LINUX26_FORMAT:= vmlinux -$(BINARIES_DIR)/$(LINUX26_KERNEL): $(LINUX26_DIR)/uImage +$(BINARIES_DIR)/$(LINUX26_KERNEL): $(LINUX26_DIR)/uImage cp -dpf $(LINUX26_DIR)/uImage $(BINARIES_DIR)/$(LINUX26_KERNEL) cp -dpf $(LINUX26_DIR)/uImage /tftpboot/$(LINUX26_KERNEL) - mkdir -p $(TARGET_DIR)/boot/ + mkdir -p $(TARGET_DIR)/boot/ cp -dpf $(LINUX26_DIR)/.config $(TARGET_DIR)/boot/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config - cp -dpf .config $(TARGET_DIR)/boot/$(BOARD_NAME)-buildroot.config - cp -dpf $(BUSYBOX_DIR)/.config $(TARGET_DIR)/boot/busybox.config + cp -dpf .config $(TARGET_DIR)/boot/$(BOARD_NAME)-buildroot.config + cp -dpf $(BUSYBOX_DIR)/.config $(TARGET_DIR)/boot/busybox.config $(PROJECT_BUILD_DIR)/linux.bin: $(LINUX26_DIR)/vmlinux ${KERNEL_CROSS}objcopy -O binary -S $(LINUX26_DIR)/vmlinux $(PROJECT_BUILD_DIR)/linux.bin -$(LINUX26_DIR)/uImage: $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage - cp -dpf $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage $(LINUX26_DIR)/uImage - +$(LINUX26_DIR)/uImage: $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage + cp -dpf $(LINUX26_DIR)/arch/$(ARCH)/boot/uImage $(LINUX26_DIR)/uImage + -$(PROJECT_BUILD_DIR)/xxxx: $(PROJECT_BUILD_DIR)/linux.bin $(MKIMAGE) +$(PROJECT_BUILD_DIR)/xxxx: $(PROJECT_BUILD_DIR)/linux.bin $(MKIMAGE) gzip -v9 -c $(PROJECT_BUILD_DIR)/linux.bin > $(PROJECT_BUILD_DIR)/linux.bin.gz - $(MKIMAGE) -A $(ARCH) \ - -O linux \ - -C gzip \ - -a 0x20008000 \ - -e 0x20008000 \ - -d $(PROJECT_BUILD_DIR)/linux.bin.gz \ + $(MKIMAGE) -A $(ARCH) \ + -O linux \ + -C gzip \ + -a 0x20008000 \ + -e 0x20008000 \ + -d $(PROJECT_BUILD_DIR)/linux.bin.gz \ $(LINUX26_DIR)/uImage rm -f $(PROJECT_BUILD_DIR)/linux.bin.gz #----------------------------------------------------------------------------------- @@ -296,23 +296,23 @@ linux26-dirclean: rm -rf $(LINUX26_DIR) linux-update: - cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG) + cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG) linux-test: - @echo "LINUX_HEADERS_VERSION" $(LINUX_HEADERS_VERSION) - @echo "BR2_PACKAGE_LINUX" $(BR2_PACKAGE_LINUX) - @echo "BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION" $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) - @echo "BR2_CUSTOM_LINUX26_VERSION" $(BR2_CUSTOM_LINUX26_VERSION) - @echo "BR2_CUSTOM_LINUX26_RC_PATCH" $(BR2_CUSTOM_LINUX26_RC_PATCH) - @echo "BR2_LINUX_BSP_PATCH" $(BR2_LINUX_BSP_PATCH) - @echo "BR2_DOWNLOAD_LINUX26_VERSION" $(BR2_DOWNLOAD_LINUX26_VERSION) - @echo "BR2_LINUX26_VERSION" $(BR2_LINUX26_VERSION) - @echo "LINUX26_VERSION" $(LINUX26_VERSION) - @echo "BR2_LINUX26_RC_PATCH" $(BR2_LINUX26_RC_PATCH) - @echo "BR2_PACKAGE_LINUX26_KCONFIG" $(BR2_PACKAGE_LINUX_KCONFIG) - @echo "LINUX26_KCONFIG" $(LINUX26_KCONFIG) - @echo "BR2_LINUX_BIN_CUSTOM" $(BR2_LINUX_BIN_CUSTOM) - @echo "BR2_PACKAGE_LINUX_FORMAT" $(BR2_PACKAGE_LINUX_FORMAT) - @echo "BR2_LINUX_IN_ROOTFS" $(BR2_LINUX_IN_ROOTFS) - @echo "BR2_LINUX_2_6_22_1" $(BR2_LINUX_2_6_22_1) + @echo "LINUX_HEADERS_VERSION" $(LINUX_HEADERS_VERSION) + @echo "BR2_PACKAGE_LINUX" $(BR2_PACKAGE_LINUX) + @echo "BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION" $(BR2_CUSTOM_DOWNLOAD_LINUX26_VERSION) + @echo "BR2_CUSTOM_LINUX26_VERSION" $(BR2_CUSTOM_LINUX26_VERSION) + @echo "BR2_CUSTOM_LINUX26_RC_PATCH" $(BR2_CUSTOM_LINUX26_RC_PATCH) + @echo "BR2_LINUX_BSP_PATCH" $(BR2_LINUX_BSP_PATCH) + @echo "BR2_DOWNLOAD_LINUX26_VERSION" $(BR2_DOWNLOAD_LINUX26_VERSION) + @echo "BR2_LINUX26_VERSION" $(BR2_LINUX26_VERSION) + @echo "LINUX26_VERSION" $(LINUX26_VERSION) + @echo "BR2_LINUX26_RC_PATCH" $(BR2_LINUX26_RC_PATCH) + @echo "BR2_PACKAGE_LINUX26_KCONFIG" $(BR2_PACKAGE_LINUX_KCONFIG) + @echo "LINUX26_KCONFIG" $(LINUX26_KCONFIG) + @echo "BR2_LINUX_BIN_CUSTOM" $(BR2_LINUX_BIN_CUSTOM) + @echo "BR2_PACKAGE_LINUX_FORMAT" $(BR2_PACKAGE_LINUX_FORMAT) + @echo "BR2_LINUX_IN_ROOTFS" $(BR2_LINUX_IN_ROOTFS) + @echo "BR2_LINUX_2_6_22_1" $(BR2_LINUX_2_6_22_1) diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in index 302852136..e83bfd53c 100644 --- a/target/linux/Makefile.in +++ b/target/linux/Makefile.in @@ -83,7 +83,7 @@ $(LINUX26_KCONFIG): echo "and install it as $(LINUX26_KCONFIG)"; \ echo ""; \ sleep 5; \ - fi; + fi ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION))) $(DL_DIR)/$(LINUX26_SOURCE): diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 7d7fa7acb..f62b0c2ba 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -122,7 +122,7 @@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured # Unfortunatey, it isn't configureable. $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld: $(BINUTILS_DIR1)/binutils/objdump $(MAKE) -C $(BINUTILS_DIR1) $(BR2_SYSROOT_STAGING_DESTDIR) install - # tooldir=/usr build_tooldir=/usr install + # tooldir=/usr build_tooldir=/usr install #rm -f $(STAGING_DIR)/usr/bin/{ar,as,ld,nm,objdump,ranlib,strip} binutils: uclibc-configured $(BINUTILS_HOST_PREREQ) $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld @@ -173,7 +173,7 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump tooldir=/usr build_tooldir=/usr \ -C $(BINUTILS_DIR2) install #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -$(STRIP) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 -$(STRIP) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk index 56723d777..93831138d 100644 --- a/toolchain/ccache/ccache.mk +++ b/toolchain/ccache/ccache.mk @@ -66,7 +66,7 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin-ccache/ [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \ - mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin-ccache/ + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin-ccache/ (cd $(STAGING_DIR)/usr/bin; \ ln -fs ccache $(GNU_TARGET_NAME)-c++; \ ln -fs ccache $(GNU_TARGET_NAME)-g++;\ @@ -80,10 +80,10 @@ endif ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY) ccache-clean: - rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc - rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc - rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc - rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc + rm -rf $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc + rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ]; then \ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \ (cd $(STAGING_DIR)/usr/bin; \ @@ -97,9 +97,9 @@ ccache-clean: fi if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ]; then \ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \ - mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \ + mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \ fi - rm -rf $(STAGING_DIR)/usr/bin-ccache/* + rm -rf $(STAGING_DIR)/usr/bin-ccache/* (cd $(STAGING_DIR)/usr/bin; \ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\ diff --git a/toolchain/elf2flt/elf2flt/Makefile.in b/toolchain/elf2flt/elf2flt/Makefile.in index 2d225d47c..acead9f6f 100644 --- a/toolchain/elf2flt/elf2flt/Makefile.in +++ b/toolchain/elf2flt/elf2flt/Makefile.in @@ -23,7 +23,7 @@ OBJEXT = @OBJEXT@ HOST = @host_alias@ ifneq (,$(findstring mingw32,$(HOST))) - LIBS := $(LIBS) -lws2_32 + LIBS := $(LIBS) -lws2_32 endif # force link order under cygwin to avoid getopts / libiberty clash @@ -36,7 +36,7 @@ CCFLAGS = $(CFLAGS) $(DEFS) $(INCLUDES) LDFILE= elf2flt.ld ifeq ($(strip $(CPU)),e1) SRC_LDFILE= $(CPU)-elf2flt.ld -else +else SRC_LDFILE= elf2flt.ld endif diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk index df1c5c5e7..a8303296f 100644 --- a/toolchain/external-toolchain/ext-tool.mk +++ b/toolchain/external-toolchain/ext-tool.mk @@ -5,43 +5,43 @@ # $2: destination # $2: strip (y|n) default is to strip # -copy_toolchain_lib_root = \ - LIB="$(strip $1)"; \ - DST="$(strip $2)"; \ - STRIP="$(strip $3)"; \ - \ - LIB_DIR=`$(TARGET_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ - \ - if test -z "$${LIB_DIR}"; then \ - echo "copy_toolchain_lib_root: lib=$${LIB} not found"; \ - exit -1; \ - fi; \ - \ - LIB="$(strip $1)"; \ - for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ - LIB=`basename $${FILE}`; \ - while test \! -z "$${LIB}"; do \ - echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ - rm -fr $(TARGET_DIR)$${DST}/$${LIB}; \ - mkdir -p $(TARGET_DIR)$${DST}; \ - if test -h $${LIB_DIR}/$${LIB}; then \ - cp -d $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/; \ - elif test -f $${LIB_DIR}/$${LIB}; then \ - cp $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/$${LIB}; \ - case "$${STRIP}" in \ - (0 | n | no) \ -;; \ - (*) \ - $(TARGET_CROSS)strip "$(TARGET_DIR)$${DST}/$${LIB}"; \ -;; \ - esac; \ - else \ - exit -1; \ - fi; \ - LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ - done; \ - done; \ - \ +copy_toolchain_lib_root = \ + LIB="$(strip $1)"; \ + DST="$(strip $2)"; \ + STRIP="$(strip $3)"; \ + \ + LIB_DIR=`$(TARGET_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ + \ + if test -z "$${LIB_DIR}"; then \ + echo "copy_toolchain_lib_root: lib=$${LIB} not found"; \ + exit -1; \ + fi; \ + \ + LIB="$(strip $1)"; \ + for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ + LIB=`basename $${FILE}`; \ + while test \! -z "$${LIB}"; do \ + echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ + rm -fr $(TARGET_DIR)$${DST}/$${LIB}; \ + mkdir -p $(TARGET_DIR)$${DST}; \ + if test -h $${LIB_DIR}/$${LIB}; then \ + cp -d $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/; \ + elif test -f $${LIB_DIR}/$${LIB}; then \ + cp $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/$${LIB}; \ + case "$${STRIP}" in \ + (0 | n | no) \ +;; \ + (*) \ + $(TARGET_CROSS)strip "$(TARGET_DIR)$${DST}/$${LIB}"; \ +;; \ + esac; \ + else \ + exit -1; \ + fi; \ + LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ + done; \ + done; \ + \ echo -n uclibc: dependencies $(TARGET_DIR)/lib/$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))) diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in index b087eb22c..2ff11624e 100644 --- a/toolchain/gcc/Makefile.in +++ b/toolchain/gcc/Makefile.in @@ -1,6 +1,6 @@ # gcc has a bunch of options that need to be shared with # both gcc-uclibc-2.95.mk and gcc-uclibc-3.x.mk, and are -# use by other packages... So include them in this file +# use by other packages... So include them in this file # and arrange to include it soon after invoking make from # the top level. diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index b365dbc60..92995f845 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -145,9 +145,9 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch # Note: The soft float situation has improved considerably with gcc 3.4.x. # We can dispense with the custom spec files, as well as libfloat for the arm case. - # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x + # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x # which needs to be integrated so we can kill of libfloat for good, except for - # anyone (?) who might still be using gcc 2.95. mjn3 + # anyone (?) who might still be using gcc 2.95. mjn3 ifeq ($(BR2_SOFT_FLOAT),y) ifeq ("$(strip $(ARCH))","arm") toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional @@ -210,21 +210,21 @@ gcc_initial-dirclean: ############################################################# # -# second pass compiler build. Build the compiler targeting +# second pass compiler build. Build the compiler targeting # the newly built shared uClibc library. # ############################################################# # # Sigh... I had to rework things because using --with-gxx-include-dir -# causes issues with include dir search order for g++. This seems to +# causes issues with include dir search order for g++. This seems to # have something to do with "path translations" and possibly doesn't -# affect gcc-target. However, I haven't tested gcc-target yet so no -# guarantees. mjn3 +# affect gcc-target. However, I haven't tested gcc-target yet so no +# guarantees. mjn3 comma:=, GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) mkdir -p $(GCC_BUILD_DIR2) - # Important! Required for limits.h to be fixed. + # Important! Required for limits.h to be fixed. ln -snf ../include $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include #-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib #ln -snf ../lib/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib @@ -444,7 +444,7 @@ endif # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index eea12895e..07c42b1ae 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -155,9 +155,9 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # Note: The soft float situation has improved considerably with gcc 3.4.x. # We can dispense with the custom spec files, as well as libfloat for the arm case. - # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x + # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x # which needs to be integrated so we can kill of libfloat for good, except for - # anyone (?) who might still be using gcc 2.95. mjn3 + # anyone (?) who might still be using gcc 2.95. mjn3 ifeq ($(BR2_SOFT_FLOAT),y) ifeq ("$(strip $(ARCH))","arm") toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional @@ -228,21 +228,21 @@ gcc_initial-dirclean: ############################################################# # -# second pass compiler build. Build the compiler targeting +# second pass compiler build. Build the compiler targeting # the newly built shared uClibc library. # ############################################################# # # Sigh... I had to rework things because using --with-gxx-include-dir -# causes issues with include dir search order for g++. This seems to +# causes issues with include dir search order for g++. This seems to # have something to do with "path translations" and possibly doesn't -# affect gcc-target. However, I haven't tested gcc-target yet so no -# guarantees. mjn3 +# affect gcc-target. However, I haven't tested gcc-target yet so no +# guarantees. mjn3 GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) mkdir -p $(GCC_BUILD_DIR2) - # Important! Required for limits.h to be fixed. + # Important! Required for limits.h to be fixed. ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include #-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib #ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib @@ -465,7 +465,7 @@ endif # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ diff --git a/toolchain/kernel-headers/kernel-headers-new.makefile b/toolchain/kernel-headers/kernel-headers-new.makefile index e1cc429bd..6d3bb7573 100644 --- a/toolchain/kernel-headers/kernel-headers-new.makefile +++ b/toolchain/kernel-headers/kernel-headers-new.makefile @@ -50,7 +50,7 @@ endif ifeq ($(LINUX_HEADERS_IS_KERNEL),y) # Need to redefine KERNEL_HEADERS_PATCH_DIR if you want -# board specific kernel headers +# board specific kernel headers KERNEL_HEADERS_PATCH_DIR:=toolchain/kernel-headers/empty $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) diff --git a/toolchain/kernel-headers/kernel-headers-old.makefile b/toolchain/kernel-headers/kernel-headers-old.makefile index b510ac793..f9db79070 100644 --- a/toolchain/kernel-headers/kernel-headers-old.makefile +++ b/toolchain/kernel-headers/kernel-headers-old.makefile @@ -1,8 +1,8 @@ ############################################################# # -# Setup the kernel headers. I include a generic package of +# Setup the kernel headers. I include a generic package of # kernel headers here, so you shouldn't need to include your -# own. Be aware these kernel headers _will_ get blown away +# own. Be aware these kernel headers _will_ get blown away # by a 'make clean' so don't put anything sacred in here... # ############################################################# @@ -133,7 +133,7 @@ $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched $(LINUX_HEADERS_DIR)/Makefile; \ /bin/echo -e "KERNELRELEASE=\$$(VERSION).\$$(PATCHLEVEL).\$$(SUBLEVEL)\$$(EXTRAVERSION)" >> \ $(LINUX_HEADERS_DIR)/Makefile; \ - fi; + fi @if [ "$(ARCH)" = "powerpc" ];then \ (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-ppc$(NOMMU) asm;) \ elif [ "$(ARCH)" = "mips" ];then \ @@ -177,7 +177,7 @@ $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched else \ (cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-$(ARCH)$(NOMMU) asm;) \ fi - touch $(LINUX_HEADERS_DIR)/include/linux/autoconf.h; + touch $(LINUX_HEADERS_DIR)/include/linux/autoconf.h touch $(LINUX_HEADERS_DIR)/.configured endif diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 6dc024a1a..92eaf1558 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -1,8 +1,8 @@ ############################################################# # -# Setup the kernel headers. I include a generic package of +# Setup the kernel headers. I include a generic package of # kernel headers here, so you shouldn't need to include your -# own. Be aware these kernel headers _will_ get blown away +# own. Be aware these kernel headers _will_ get blown away # by a 'make clean' so don't put anything sacred in here... # ############################################################# diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 83577d33d..aa267016e 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -268,7 +268,7 @@ ifeq ($(BR2_x86_i686),y) endif endif -$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig +$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig cp -f $(UCLIBC_DIR)/.oldconfig $(UCLIBC_DIR)/.config mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib @@ -356,7 +356,7 @@ else fi; \ fi endif - # Build the host utils. Need to add an install target... + # Build the host utils. Need to add an install target... $(MAKE1) -C $(UCLIBC_DIR)/utils \ PREFIX=$(STAGING_DIR) \ HOSTCC="$(HOSTCC)" \ |