diff options
169 files changed, 306 insertions, 306 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index a6d356ffa..768d040a6 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -59,7 +59,7 @@ # relative path in the package source from which to run configure and # make # -## The following variables contain hook target names; +## The following variables contain hook target names ## by default they do nothing, they can be overriden in package makefiles # # FOO_HOOK_POST_BUILD, FOO_HOOK_POST_INSTALL @@ -192,7 +192,7 @@ $(BUILD_DIR)/%/.stamp_configured: --exec-prefix=/usr \ --sysconfdir=/etc \ $($(PKG)_CONF_OPT) - touch $@; + touch $@ # Build $(BUILD_DIR)/%/.stamp_built: diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 90b17f950..5f103671e 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -36,7 +36,7 @@ $(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked --enable-static \ --disable-docs \ $(DISABLE_NLS) \ - ); + ) touch $@ $(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY): $(ALSA_LIB_DIR)/.configured diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index d74763b42..0261a12e7 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -31,7 +31,7 @@ $(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ - ); + ) touch $@ $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/.configured @@ -68,7 +68,7 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY mkdir -p $(TARGET_DIR)/usr/share/sounds/alsa; \ cp -rdpf $(STAGING_DIR)/usr/share/alsa/speaker-test/* $(TARGET_DIR)/usr/share/alsa/speaker-test/; \ cp -rdpf $(STAGING_DIR)/usr/share/sounds/alsa/* $(TARGET_DIR)/usr/share/sounds/alsa/; \ - fi; + fi touch -c $@ alsa-utils: uclibc alsa-lib ncurses $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) diff --git a/package/argus/argus.mk b/package/argus/argus.mk index c8e42523b..413dcc05d 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -41,7 +41,7 @@ $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured diff --git a/package/at/at.mk b/package/at/at.mk index 4e7855dd0..c60eb555e 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -38,7 +38,7 @@ $(AT_DIR)/.configured: $(AT_DIR)/.unpacked --with-atspool=/var/lib/atspool \ --with-daemon_username=at \ --with-daemon_groupname=at \ - ); + ) touch $@ $(AT_DIR)/$(AT_BINARY): $(AT_DIR)/.configured diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 0f6975c11..aa6d1e5d6 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -106,7 +106,7 @@ $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked --disable-glibtest \ --enable-explicit-deps=no \ --disable-debug \ - ); + ) touch $(ATK_DIR)/.configured $(ATK_DIR)/atk/.libs/$(ATK_BINARY): $(ATK_DIR)/.configured diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk index 3581a8fc7..87eda30c3 100644 --- a/package/aumix/aumix.mk +++ b/package/aumix/aumix.mk @@ -35,7 +35,7 @@ $(AUMIX_DIR)/.configured: $(AUMIX_DIR)/.unpacked --without-gpm \ --without-sysmouse \ $(DISABLE_NLS) \ - ); + ) touch $(AUMIX_DIR)/.configured $(AUMIX_DIR)/src/aumix: $(AUMIX_DIR)/.configured diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 92427693a..a6bf8bfde 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -53,7 +53,7 @@ $(AUTOCONF_DIR)/.configured: $(AUTOCONF_SRC_DIR)/.unpacked --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $@ $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY): $(AUTOCONF_DIR)/.configured @@ -73,7 +73,7 @@ $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY): $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY) infodir=$(TARGET_DIR)/usr/info \ mandir=$(TARGET_DIR)/usr/man \ includedir=$(TARGET_DIR)/usr/include \ - -C $(AUTOCONF_DIR) install; + -C $(AUTOCONF_DIR) install rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc touch -c $@ @@ -102,14 +102,14 @@ $(AUTOCONF_HOST_DIR)/.configured: $(AUTOCONF_SRC_DIR)/.unpacked EMACS="no" \ $(AUTOCONF_SRC_DIR)/configure \ --prefix=$(STAGING_DIR)/usr \ - ); + ) touch $@ $(AUTOCONF_HOST_DIR)/bin/$(AUTOCONF_BINARY): $(AUTOCONF_HOST_DIR)/.configured $(MAKE1) -C $(AUTOCONF_HOST_DIR) $(AUTOCONF): $(AUTOCONF_HOST_DIR)/bin/$(AUTOCONF_BINARY) - $(MAKE) -C $(AUTOCONF_HOST_DIR) install; + $(MAKE) -C $(AUTOCONF_HOST_DIR) install host-autoconf: host-m4 host-libtool $(AUTOCONF) diff --git a/package/automake/automake.mk b/package/automake/automake.mk index d09f624b7..b89f013d8 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -55,7 +55,7 @@ $(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_SRC_DIR)/.unpacked --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $@ $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY): $(AUTOMAKE_DIR)/.configured @@ -105,7 +105,7 @@ $(AUTOMAKE_HOST_DIR)/.configured: $(AUTOMAKE_SRC_DIR)/.unpacked WANT_AUTOCONF=2.5 \ $(AUTOMAKE_SRC_DIR)/configure \ --prefix=$(STAGING_DIR)/usr \ - ); + ) touch $@ $(AUTOMAKE_HOST_DIR)/$(AUTOMAKE_BINARY): $(AUTOMAKE_HOST_DIR)/.configured diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index b2c9142ac..b69c74fb1 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -6,7 +6,7 @@ # # This program 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; +# Public License as published by the Free Software Foundation # either version 2.1 of the License, or (at your option) any # later version. @@ -139,7 +139,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP) --with-avahi-group=default \ --with-autoipd-user=default \ --with-autoipd-group=default \ - ); + ) touch $@ $(AVAHI_DIR)/.compiled: $(AVAHI_DIR)/.configured diff --git a/package/bash/bash.mk b/package/bash/bash.mk index bf8eda79c..784b678dc 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -55,7 +55,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked --with-curses \ --enable-alias \ --without-bash-malloc \ - ); + ) touch $@ $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 953125775..6a3af1491 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -48,7 +48,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist --disable-compat185 \ --with-pic \ $(DISABLE_LARGEFILE) \ - ); + ) $(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile touch $(DB_DIR)/.configured diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 87311dbe8..5038af897 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -47,7 +47,7 @@ $(BIND_DIR2)/Makefile: $(BIND_DIR2)/.unpacked $(DISABLE_IPV6) \ --with-libtool \ --with-pic \ - ); + ) $(BIND_DIR2)/$(BIND_BINARY): $(BIND_DIR2)/Makefile $(MAKE) $(TARGET_CONFIGURE_OPTS) -j1 -C $(BIND_DIR2) diff --git a/package/bison/bison.mk b/package/bison/bison.mk index 2255a832e..8a1273413 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -42,7 +42,7 @@ $(BISON_DIR)/.configured: $(BISON_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) echo 'all install:' > $(BISON_DIR)/examples/Makefile touch $(BISON_DIR)/.configured diff --git a/package/boa/boa.mk b/package/boa/boa.mk index 4bc4a344e..c5c42f97f 100644 --- a/package/boa/boa.mk +++ b/package/boa/boa.mk @@ -45,7 +45,7 @@ $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) touch $(BOA_WORKDIR)/Makefile $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer: $(BOA_WORKDIR)/Makefile @@ -70,7 +70,7 @@ boa-source: $(DL_DIR)/$(BOA_SOURCE) boa-clean: @if [ -d $(BOA_WORKDIR)/Makefile ] ; then \ $(MAKE) -C $(BOA_WORKDIR) clean ; \ - fi; + fi boa-dirclean: rm -rf $(BOA_DIR) $(BOA_WORKDIR) diff --git a/package/bridge/bridge.mk b/package/bridge/bridge.mk index 5ca3b8300..ca86343d6 100644 --- a/package/bridge/bridge.mk +++ b/package/bridge/bridge.mk @@ -39,7 +39,7 @@ $(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ --with-linux-headers=$(LINUX_HEADERS_DIR) \ - ); + ) touch $(BRIDGE_BUILD_DIR)/.configured $(BRIDGE_BUILD_DIR)/brctl/brctl: $(BRIDGE_BUILD_DIR)/.configured diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 7c62c40d9..2be8d5c95 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/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index e89b1e83a..5e82b9955 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -48,7 +48,7 @@ $(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION) $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) (cd $(TARGET_DIR)/usr/bin; \ - rm -f bzip2 bunzip2 bzcat bzip2recover bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp); + rm -f bzip2 bunzip2 bzcat bzip2recover bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install rm -f $(TARGET_DIR)/usr/lib/libbz2.a diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index d3b834a46..5a617c710 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -110,7 +110,7 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked --enable-freetype=yes \ --enable-xlib=yes \ --enable-xlib-xrender=yes \ - ); + ) touch $(CAIRO_DIR)/.configured $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured @@ -118,7 +118,7 @@ $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured touch -c $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY) $(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(CAIRO_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(CAIRO_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libcairo.la touch -c $(STAGING_DIR)/lib/$(CAIRO_BINARY) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index fc2f634d5..43de029e2 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -101,7 +101,7 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked $(DISABLE_LARGEFILE) \ --disable-rpath \ --disable-dependency-tracking \ - ); + ) touch $@ $(COREUTILS_DIR)/$(COREUTILS_BINARY): $(COREUTILS_DIR)/.configured diff --git a/package/curl/curl.mk b/package/curl/curl.mk index a4020e1b9..42325ecbb 100644 --- a/package/curl/curl.mk +++ b/package/curl/curl.mk @@ -32,7 +32,7 @@ $(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=$(STAGING_DIR) \ - ); + ) touch $(CURL_DIR)/.configured $(CURL_DIR)/src/.libs/$(CURL_BINARY): $(CURL_DIR)/.configured diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 8e65259b7..235500f9a 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -64,7 +64,7 @@ $(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ $(CVS_CONFIGURE_ARGS) \ - ); + ) touch $@ $(CVS_DIR)/$(CVS_BINARY): $(CVS_DIR)/.configured diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 25118ef62..489252796 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -43,7 +43,7 @@ $(DASH_DIR)/.configured: $(DASH_DIR)/.unpacked --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $(DASH_DIR)/.configured $(DASH_DIR)/$(DASH_BINARY): $(DASH_DIR)/.configured diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 196691e91..5750071df 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -45,7 +45,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked /usr/bin/pkg-config --disable-xml-docs \ --disable-doxygen-docs \ --enable-asserts=yes \ - ); + ) touch $(DBUS_GLIB_DIR)/.configured $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY): $(DBUS_GLIB_DIR)/.configured diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 0f98475db..8ecb39aa7 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -47,7 +47,7 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked --without-xml \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-system-pid-file=/var/run/messagebus.pid \ - ); + ) touch $@ $(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index d60c15f11..2b7b81912 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -36,7 +36,7 @@ $(DHCP_DIR)/.configured: $(DHCP_DIR)/.unpacked (cd $(DHCP_DIR); \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ - ./configure ); + ./configure ) touch $(DHCP_DIR)/.configured $(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 7033ca99e..8a6494696 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -27,7 +27,7 @@ $(DIALOG_DIR)/.configured: $(DIALOG_DIR)/.source --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); + ) touch $@ $(DIALOG_DIR)/$(DIALOG_BINARY): $(DIALOG_DIR)/.configured diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index c94401588..d65c29e5c 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -96,7 +96,7 @@ $(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(DIFFUTILS_DIR)/.configured $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY): $(DIFFUTILS_DIR)/.configured diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index 322061c5b..1863accf6 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -29,7 +29,7 @@ $(DILLO_DIR)/.configured: $(DILLO_DIR)/.unpacked --sysconfdir=/etc \ --program-transform-name='' \ --disable-dlgui \ - ); + ) touch $(DILLO_DIR)/.configured $(DILLO_DIR)/src/dillo: $(DILLO_DIR)/.configured @@ -46,7 +46,7 @@ dillo-source: $(DL_DIR)/$(DILLO_SOURCE) dillo-clean: @if [ -d $(DILLO_DIR)/Makefile ] ; then \ $(MAKE) -C $(DILLO_DIR) clean ; \ - fi; + fi dillo-dirclean: rm -rf $(DILLO_DIR) diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 0de264493..d65103b77 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -64,7 +64,7 @@ $(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked --disable-sdl \ --disable-video4linux \ --disable-video4linux2 \ - --enable-fusion ); + --enable-fusion ) touch $(DIRECTFB_DIR)/.configured $(DIRECTFB_DIR)/.compiled: $(DIRECTFB_DIR)/.configured diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 5ffbfc33c..6c6b4ba86 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -42,7 +42,7 @@ $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked --with-included-popt \ --without-gtk \ --without-gnome \ - ); + ) touch $(DISTCC_DIR)/.configured $(DISTCC_DIR)/$(DISTCC_BINARY): $(DISTCC_DIR)/.configured diff --git a/package/dm/dm.mk b/package/dm/dm.mk index 94767e4e9..2f828ed63 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -77,7 +77,7 @@ $(DM_DIR)/.configured: $(DM_DIR)/.unpacked $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ --with-user=$(shell id -un) --with-group=$(shell id -gn) \ - ); + ) touch $(DM_DIR)/.configured $(DM_DIR)/$(DM_BINARY): dm-build diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 471179705..b6aafc269 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -63,7 +63,7 @@ $(DMALLOC_DIR)/.configured: $(DMALLOC_DIR)/.unpacked --infodir=/usr/info \ --enable-shlib \ $(DMALLOC_CONFIG_ARGS) \ - ); + ) touch $@ $(DMALLOC_DIR)/$(DMALLOC_BINARY): $(DMALLOC_DIR)/.configured @@ -78,7 +78,7 @@ $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY) includedir="$(STAGING_DIR)/usr/share/info/" \ -C $(DMALLOC_DIR) install (cd $(STAGING_DIR)/usr/lib; \ - mv libdmalloc*.so $(TARGET_DIR)/usr/lib); + mv libdmalloc*.so $(TARGET_DIR)/usr/lib) cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) $(STRIP) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY) diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index f531c5d9d..402e3bed7 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -35,7 +35,7 @@ $(DMRAID_DIR)/.configured: $(DMRAID_DIR)/.unpacked $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ --with-user=$(shell id -un) --with-group=$(shell id -gn) \ - ); + ) touch $(DMRAID_DIR)/.configured $(DMRAID_DIR)/tools/$(DMRAID_BINARY): $(DMRAID_DIR)/.configured diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 6c3f4aa85..f8c4b1c0c 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -37,7 +37,7 @@ $(DROPBEAR_DIR)/.configured: $(DROPBEAR_DIR)/.unpacked --localstatedir=/var \ $(DISABLE_NLS) \ --with-shared \ - ); + ) touch $@ $(DROPBEAR_DIR)/$(DROPBEAR_BINARY): $(DROPBEAR_DIR)/.configured diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index ad7ce6bc2..c58ed62c9 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -53,7 +53,7 @@ $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked --disable-e2initrd-helper \ --without-catgets $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured diff --git a/package/ed/ed.mk b/package/ed/ed.mk index a08678cb0..48746cde5 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -29,7 +29,7 @@ $(ED_DIR)/.configured: $(ED_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --exec-prefix=/usr \ - ); + ) touch $@ $(ED_DIR)/$(ED_BINARY): $(ED_DIR)/.configured diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 2b866671c..310f1c192 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -27,7 +27,7 @@ $(ETHTOOL_DIR)/.configured: $(ETHTOOL_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); + ) touch $@ $(ETHTOOL_DIR)/ethtool: $(ETHTOOL_DIR)/.configured diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 46a590fc4..f5ad3120c 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -45,7 +45,7 @@ $(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked --mandir=/man \ --infodir=/info \ --enable-shared \ - ); + ) touch $@ $(EXPAT_DIR)/$(EXPAT_BINARY): $(EXPAT_DIR)/.configured diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 78e7ad6bb..15eb0ef17 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -39,7 +39,7 @@ $(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked $(FAKEROOT_SOURCE_DIR)/configure \ --prefix=/usr \ $(DISABLE_NLS) \ - ); + ) touch $@ $(FAKEROOT_DIR1)/faked: $(FAKEROOT_DIR1)/.configured @@ -90,7 +90,7 @@ $(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) touch $@ $(FAKEROOT_DIR2)/faked: $(FAKEROOT_DIR2)/.configured diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index fd717d014..2fa0ed7c0 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -23,7 +23,7 @@ $(FBSET_DIR)/$(FBSET_BINARY): $(FBSET_DIR)/.unpacked ($(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ $(MAKE) -C $(FBSET_DIR) CC=$(TARGET_CC) \ - ); + ) touch -c $@ $(TARGET_DIR)/$(FBSET_TARGET_BINARY): $(FBSET_DIR)/$(FBSET_BINARY) diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index c7440eca6..528bb6f8c 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -29,7 +29,7 @@ $(FBV_DIR)/.configured: $(FBV_DIR)/.unpacked --prefix=/usr \ --cc=$(TARGET_CC) \ --libs="-lz -lm" \ - ); + ) touch $@ $(FBV_DIR)/$(FBV_BINARY): $(FBV_DIR)/.configured diff --git a/package/file/file.mk b/package/file/file.mk index 23632ecc1..5a5058dc5 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -30,7 +30,7 @@ $(FILE_DIR1)/.configured: $(FILE_SOURCE_DIR)/.unpacked CC="$(HOSTCC)" \ $(FILE_SOURCE_DIR)/configure \ --prefix=$(FILE_DIR1)/install \ - ); + ) touch $(FILE_DIR1)/.configured $(TOOL_BUILD_DIR)/bin/file: $(FILE_DIR1)/.configured @@ -81,7 +81,7 @@ $(FILE_DIR2)/.configured: $(FILE_SOURCE_DIR)/.unpacked $(DISABLE_LARGEFILE) \ --enable-static \ --disable-fsect-man5 \ - ); + ) touch $(FILE_DIR2)/.configured $(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOL_BUILD_DIR)/bin/file diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 8eddef103..90afdb7b0 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -44,7 +44,7 @@ $(FINDUTILS_DIR)/.configured: $(FINDUTILS_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(FINDUTILS_DIR)/.configured $(FINDUTILS_DIR)/$(FINDUTILS_BINARY): $(FINDUTILS_DIR)/.configured @@ -53,14 +53,14 @@ $(FINDUTILS_DIR)/$(FINDUTILS_BINARY): $(FINDUTILS_DIR)/.configured # This stuff is needed to work around GNU make deficiencies findutils-target_binary: $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) @if [ -L $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY) ] ; then \ - rm -f $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY); fi; + rm -f $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY); fi @if [ ! -f $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) -o $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY) \ -ot $(FINDUTILS_DIR)/$(FINDUTILS_BINARY) ] ; then \ set -x; \ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) install; \ $(STRIP) $(TARGET_DIR)/usr/lib/locate/* > /dev/null 2>&1; \ rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi; + $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi findutils: uclibc findutils-target_binary diff --git a/package/flex/flex.mk b/package/flex/flex.mk index c08addaf6..0aec98b51 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -54,7 +54,7 @@ $(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked --includedir=$(TARGET_DIR)/usr/include \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 1bf66918d..e8937ae6e 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -40,7 +40,7 @@ $(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked --includedir=/usr/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $(FREETYPE_DIR)/.configured $(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured @@ -79,7 +79,7 @@ $(FREETYPE_DIR1)/.configured: $(FREETYPE_DIR1)/.unpacked ./configure \ CC="$(HOSTCC)" \ --prefix="$(FREETYPE_HOST_DIR)" \ - ); + ) touch $(FREETYPE_DIR1)/.configured $(FREETYPE_DIR1)/.compiled: $(FREETYPE_DIR1)/.configured diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 9628a2f7d..d058877d4 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -44,7 +44,7 @@ $(GAWK_DIR)/.configured: $(GAWK_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(GAWK_DIR)/.configured $(GAWK_DIR)/$(GAWK_BINARY): $(GAWK_DIR)/.configured diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 37fd8c264..8558098c6 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -100,7 +100,7 @@ $(GETTEXT_DIR)/.configured: $(GETTEXT_DIR)/.unpacked --enable-shared \ $(IGNORE_EXTERNAL_GETTEXT) \ $(OPENMP) \ - ); + ) touch $@ $(GETTEXT_DIR)/$(GETTEXT_BINARY): $(GETTEXT_DIR)/.configured diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index cbc72402f..db057c164 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -43,7 +43,7 @@ $(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked --prefix=/usr \ $(PREFERRED_LIB_FLAGS) \ $(DISABLE_NLS) \ - ); + ) touch $@ $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY): $(GMP_TARGET_DIR)/.configured @@ -86,7 +86,7 @@ $(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked --enable-shared \ --enable-static \ $(DISABLE_NLS) \ - ); + ) touch $@ $(GMP_HOST_DIR)/lib/libgmp$(HOST_LIBEXT) $(GMP_HOST_DIR)/lib/libgmp$(HOST_SHREXT) $(GMP_HOST_DIR)/lib/libgmp$(HOST_SHREXT).(GMP_LIBVERSION): $(GMP_DIR2)/.configured diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 535e712b5..02add799b 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -47,7 +47,7 @@ $(GNUGREP_DIR)/.configured: $(GNUGREP_DIR)/.unpacked $(DISABLE_LARGEFILE) \ --disable-perl-regexp \ --without-included-regex \ - ); + ) touch $(GNUGREP_DIR)/.configured $(GNUGREP_DIR)/$(GNUGREP_BINARY): $(GNUGREP_DIR)/.configured @@ -56,7 +56,7 @@ $(GNUGREP_DIR)/$(GNUGREP_BINARY): $(GNUGREP_DIR)/.configured # This stuff is needed to work around GNU make deficiencies grep-target_binary: $(GNUGREP_DIR)/$(GNUGREP_BINARY) @if [ -L $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY) ] ; then \ - rm -f $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY); fi; + rm -f $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY); fi @if [ ! -f $(GNUGREP_DIR)/$(GNUGREP_BINARY) -o $(TARGET_DIR)/$(GNUGREP_TARGET_BINARY) -ot \ $(GNUGREP_DIR)/$(GNUGREP_BINARY) ] ; then \ set -x; \ diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk index 80ad9fd44..464e81711 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -122,7 +122,7 @@ $(GTK2_ENGINES_DIR)/.configured: $(GTK2_ENGINES_DIR)/.unpacked --disable-development \ --disable-paranoia \ --disable-deprecated \ - ); + ) touch $(GTK2_ENGINES_DIR)/.configured $(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ENGINES_BINARY): $(GTK2_ENGINES_DIR)/.configured @@ -130,7 +130,7 @@ $(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ENGINES_BINARY): $(GTK2_ENGINES_DIR)/.confi touch -c $(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ENGINES_BINARY) $(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY): $(GTK2_ENGINES_DIR)/gtk/.libs/$(GTK2_ENGINES_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(GTK2_ENGINES_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(GTK2_ENGINES_DIR) install touch -c $(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY) $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/$(GTK2_ENGINES_BINARY): $(STAGING_DIR)/lib/$(GTK2_ENGINES_BINARY) @@ -145,7 +145,7 @@ $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/$(GTK2_ENGINES_BINARY): $(STAGING_DIR)/ gtk2-engines: libgtk2 $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/$(GTK2_ENGINES_BINARY) gtk2-engines-clean: - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(GTK2_ENGINES_DIR) uninstall; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(GTK2_ENGINES_DIR) uninstall -$(MAKE) -C $(GTK2_ENGINES_DIR) clean gtk2-engines-dirclean: diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 9503dd029..201e874ca 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -42,7 +42,7 @@ $(GZIP_DIR)/.configured: $(GZIP_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(GZIP_DIR)/.configured $(GZIP_BINARY): $(GZIP_DIR)/.configured diff --git a/package/hal/hal.mk b/package/hal/hal.mk index fa2307657..e452ebd6a 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -56,7 +56,7 @@ $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config --disable-static \ --disable-acpi-acpid \ --disable-acpi-proc \ - ); + ) touch $(HAL_DIR)/.configured $(HAL_DIR)/hald/hald: $(HAL_DIR)/.configured diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index b85aba16e..5b11a801f 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -27,7 +27,7 @@ $(HASERL_DIR)/.configured: $(HASERL_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); + ) touch $@ $(HASERL_DIR)/src/haserl: $(HASERL_DIR)/.configured diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk index 540510056..5bf2b317d 100644 --- a/package/hotplug/hotplug.mk +++ b/package/hotplug/hotplug.mk @@ -16,12 +16,12 @@ $(HOTPLUG_DIR): $(HOTPLUG_SOURCE) $(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR) $(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \ KERNEL_INCLUDE_DIR=$(STAGING_DIR)/usr/include \ - TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR); - $(STRIP) $(HOTPLUG_DIR)/hotplug; + TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR) + $(STRIP) $(HOTPLUG_DIR)/hotplug touch -c $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug - cp $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug; + cp $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug touch -c $(TARGET_DIR)/sbin/hotplug hotplug: uclibc $(TARGET_DIR)/sbin/hotplug diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index dfccaaa82..a31cd78c8 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -56,7 +56,7 @@ $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked --without-fpx \ --without-freetype \ --without-x \ - ); + ) touch $@ $(IMAGEMAGICK_DIR)/.compiled: $(IMAGEMAGICK_DIR)/.configured diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 3571141b7..a8655fec1 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -43,7 +43,7 @@ $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ --includedir=$(STAGING_DIR)/usr/include \ - ); + ) touch $(IPERF_DIR)/.configured $(IPERF_DIR)/src/iperf: $(IPERF_DIR)/.configured @@ -60,7 +60,7 @@ iperf-source: $(DL_DIR)/$(IPERF_SOURCE) iperf-clean: @if [ -d $(IPERF_KDIR)/Makefile ] ; then \ $(MAKE) -C $(IPERF_DIR) clean ; \ - fi; + fi iperf-dirclean: rm -rf $(IPERF_DIR) diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 29c504936..23ed458ab 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -60,7 +60,7 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked --enable-shared \ --enable-static \ --without-x \ - ); + ) touch $(JPEG_DIR)/.configured $(JPEG_DIR)/.libs/libjpeg.a: $(JPEG_DIR)/.configured diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 00f59f1fd..130d5a01e 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -51,7 +51,7 @@ $(KEXEC_DIR)/.configured: $(KEXEC_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/ \ $(KEXEC_CONFIG_OPTS) \ - ); + ) touch $@ $(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/build/sbin/$(KEXEC_BINARY): $(KEXEC_DIR)/.configured diff --git a/package/less/less.mk b/package/less/less.mk index a976b2000..c6b6ae50f 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -27,8 +27,8 @@ $(LESS_DIR)/.configured: $(LESS_DIR)/.source --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); - touch $(LESS_DIR)/.configured; + ) + touch $(LESS_DIR)/.configured $(LESS_DIR)/$(LESS_BINARY): $(LESS_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(LESS_DIR) diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index 2911af680..101871d65 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -39,8 +39,8 @@ $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source --includedir=/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); - touch $(LIBCGI_DIR)/.configured; + ) + touch $(LIBCGI_DIR)/.configured $(LIBCGI_DIR)/$(LIBCGI_LIBRARY): $(LIBCGI_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(LIBCGI_DIR) diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 8103b3a7d..689d7d028 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -39,7 +39,7 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked --includedir=/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $(LIBCGICC_DIR)/.configured $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index 1c70f0bf0..caccf9030 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -58,7 +58,7 @@ $(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked $(DISABLE_LARGEFILE) \ --disable-lynx \ --disable-shared \ - ); + ) touch $(LIBDAEMON_DIR)/.configured $(LIBDAEMON_DIR)/.compiled: $(LIBDAEMON_DIR)/.configured diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index fc2e066ef..fd7e6d4a5 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -39,7 +39,7 @@ $(LIBDRM_DIR)/.configured: $(LIBDRM_DIR)/.unpacked --includedir=/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $(LIBDRM_DIR)/.configured $(LIBDRM_DIR)/.compiled: $(LIBDRM_DIR)/.configured diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk index 4f613f288..293043199 100644 --- a/package/libelf/libelf.mk +++ b/package/libelf/libelf.mk @@ -36,7 +36,7 @@ $(LIBELF_DIR)/.configured: $(LIBELF_DIR)/.unpacked --sysconfdir=/etc \ $(DISABLE_NLS) \ --enable-shared \ - ); + ) touch $@ $(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VERSION): $(LIBELF_DIR)/.configured diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 5867817fd..5befbfbd6 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -33,7 +33,7 @@ $(LIBEVENT_DIR)/.configured: $(LIBEVENT_DIR)/.unpacked --prefix=/usr \ --disable-static \ --with-gnu-ld \ - ); + ) touch $@ $(LIBEVENT_DIR)/$(LIBEVENT_BINARY): $(LIBEVENT_DIR)/.configured diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index d7ef14ada..07da596e0 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -41,7 +41,7 @@ $(LIBGCRYPT_DIR)/.configured: $(LIBGCRYPT_DIR)/.source --includedir=/usr/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $@ $(LIBGCRYPT_DIR)/$(LIBGCRYPT_LIBRARY): $(LIBGCRYPT_DIR)/.configured diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 82eb6f235..740d57671 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -43,7 +43,7 @@ $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked --infodir=/usr/info \ --enable-shared \ $(DISABLE_NLS) \ - ); + ) touch $(LIBGLIB12_DIR)/.configured $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.configured @@ -64,7 +64,7 @@ $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINAR oldincludedir=$(STAGING_DIR)/include \ infodir=$(STAGING_DIR)/info \ mandir=$(STAGING_DIR)/man \ - -C $(LIBGLIB12_DIR) install; + -C $(LIBGLIB12_DIR) install $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10: $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) cp -dpf $(STAGING_DIR)/lib/libglib.so $(TARGET_DIR)/lib/ diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 787953a90..9ec0be3b5 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -102,7 +102,7 @@ $(LIBGLIB2_DIR)/.configured: $(LIBGLIB2_DIR)/.unpacked --enable-shared \ --enable-static \ $(DISABLE_NLS) \ - ); + ) touch $(LIBGLIB2_DIR)/.configured $(LIBGLIB2_DIR)/glib/.libs/$(LIBGLIB2_BINARY): $(LIBGLIB2_DIR)/.configured @@ -110,7 +110,7 @@ $(LIBGLIB2_DIR)/glib/.libs/$(LIBGLIB2_BINARY): $(LIBGLIB2_DIR)/.configured touch -c $(LIBGLIB2_DIR)/glib/.libs/$(LIBGLIB2_BINARY) $(STAGING_DIR)/lib/$(LIBGLIB2_BINARY): $(LIBGLIB2_DIR)/glib/.libs/$(LIBGLIB2_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGLIB2_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGLIB2_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libglib-2.0.la $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libgmodule-2.0.la $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libgobject-2.0.la diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 7e321c318..dc3b088a9 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -40,8 +40,8 @@ $(LIBGPG_ERROR_DIR)/.configured: $(LIBGPG_ERROR_DIR)/.source --includedir=/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); - touch $(LIBGPG_ERROR_DIR)/.configured; + ) + touch $(LIBGPG_ERROR_DIR)/.configured $(LIBGPG_ERROR_DIR)/$(LIBGPG_ERROR_LIBRARY): $(LIBGPG_ERROR_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(LIBGPG_ERROR_DIR) diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index 1a04aa826..d4c31c5c1 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -50,7 +50,7 @@ $(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked --disable-glibtest \ --disable-xim \ --enable-shared \ - ); + ) touch $(LIBGTK12_DIR)/.configured $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/.configured @@ -72,7 +72,7 @@ $(STAGING_DIR)/lib/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINA oldincludedir=$(STAGING_DIR)/include \ infodir=$(STAGING_DIR)/info \ mandir=$(STAGING_DIR)/man \ - -C $(LIBGTK12_DIR) install; + -C $(LIBGTK12_DIR) install touch -c $(STAGING_DIR)/lib/$(LIBGTK12_BINARY) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY) diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 284ae6c05..5ac6a142b 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -116,7 +116,7 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked --disable-glibtest \ --enable-explicit-deps=no \ --disable-debug \ - ); + ) touch $(LIBGTK2_DIR)/.configured $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/.configured @@ -124,7 +124,7 @@ $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/.configured touch -c $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY) $(STAGING_DIR)/lib/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGTK2_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGTK2_DIR) install touch -c $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY) diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk index 24164fdc9..581d12eb4 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -32,7 +32,7 @@ $(LIBID3TAG_DIR)/.configured: $(LIBID3TAG_DIR)/.unpacked --prefix=/usr \ --sysconfdir=/etc \ $(DISABLE_NLS) \ - ); + ) touch $@ $(LIBID3TAG_DIR)/src/.libs/$(LIBID3TAG_BIN): $(LIBID3TAG_DIR)/.configured @@ -54,7 +54,7 @@ libid3tag-source: $(DL_DIR)/$(LIBID3TAG_SOURCE) libid3tag-clean: @if [ -d $(LIBID3TAG_DIR)/Makefile ] ; then \ $(MAKE) -C $(LIBID3TAG_DIR) clean ; \ - fi; + fi rm -f $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) rm -f $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index 99ddd9d8c..959c21887 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -29,7 +29,7 @@ $(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --enable-shared \ - ); + ) touch $@ $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 3a01ac243..242dc92bc 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -32,7 +32,7 @@ $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked --disable-debugging \ --enable-speed \ $(DISABLE_NLS) \ - ); + ) touch $@ $(LIBMAD_DIR)/libmad.la: $(LIBMAD_DIR)/.configured @@ -60,7 +60,7 @@ libmad-source: $(DL_DIR)/$(LIBMAD_SOURCE) libmad-clean: @if [ -d $(LIBMAD_DIR)/Makefile ] ; then \ $(MAKE) -C $(LIBMAD_DIR) clean ; \ - fi; + fi rm -f $(STAGING_DIR)/usr/lib/libmad.* rm -f $(STAGING_DIR)/usr/include/mad.h rm -f $(TARGET_DIR)/usr/lib/libmad.* diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 2d8283757..7a0cac27e 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -55,7 +55,7 @@ $(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked --localstatedir=/var \ --without-libpng-compat \ --without-x \ - ); + ) touch $@ $(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured @@ -63,7 +63,7 @@ $(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured touch $@ $(STAGING_DIR)/usr/lib/libpng.so: $(LIBPNG_DIR)/.compiled - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libpng12.la $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index 98ac85647..598bf4ffe 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -36,7 +36,7 @@ $(LIBRAW1394_DIR)/.configured: $(LIBRAW1394_DIR)/.unpacked --includedir=/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $@ $(LIBRAW1394_DIR)/.compiled: $(LIBRAW1394_DIR)/.configured diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 792cc26e5..0f2787a12 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -29,7 +29,7 @@ $(LIBSNDFILE_DIR)/.configured: $(LIBSNDFILE_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); + ) touch $@ $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY): $(LIBSNDFILE_DIR)/.configured diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index 362732250..9166480f6 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -47,7 +47,7 @@ $(LIBSYSFS_DIR)/.configured: $(LIBSYSFS_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); + ) touch $@ $(LIBSYSFS_DIR)/.compiled: $(LIBSYSFS_DIR)/.configured diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 57fd31fb5..08a86be24 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -49,7 +49,7 @@ $(LIBTOOL_DIR)/.configured: $(LIBTOOL_SRC_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) touch $@ $(LIBTOOL_DIR)/$(LIBTOOL_BINARY): $(LIBTOOL_DIR)/.configured @@ -70,7 +70,7 @@ $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_DIR)/$(LIBTOOL_BINARY) infodir=$(TARGET_DIR)/usr/info \ mandir=$(TARGET_DIR)/usr/man \ includedir=$(TARGET_DIR)/usr/include \ - -C $(LIBTOOL_DIR) install; + -C $(LIBTOOL_DIR) install $(STRIP) $(TARGET_DIR)//usr/lib/libltdl.so.*.*.* > /dev/null 2>&1 $(SED) "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool $(SED) "s,^LD.*,LD=\"/usr/bin/ld\"," $(TARGET_DIR)/usr/bin/libtool @@ -107,7 +107,7 @@ $(LIBTOOL_HOST_DIR)/.configured: $(LIBTOOL_SRC_DIR)/.unpacked $(LIBTOOL_SRC_DIR)/configure \ --prefix=$(STAGING_DIR)/usr \ $(DISABLE_NLS) \ - ); + ) touch $@ $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY): $(LIBTOOL_HOST_DIR)/.configured diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk index d365bcdca..44b680db1 100644 --- a/package/libungif/libungif.mk +++ b/package/libungif/libungif.mk @@ -37,7 +37,7 @@ $(LIBUNGIF_DIR)/.configured: $(LIBUNGIF_DIR)/.unpacked --enable-static \ --prefix=/usr \ --without-x \ - ); + ) touch $@ $(LIBUNGIF_DIR)/lib/.libs/libungif.a: $(LIBUNGIF_DIR)/.configured diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index a4d167ff5..fc2c787ae 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -42,7 +42,7 @@ $(LIBUSB_DIR)/.configured: $(LIBUSB_DIR)/.unpacked --prefix=/ \ --disable-debug \ --disable-build-docs \ - ); + ) touch $@ $(STAGING_DIR)/lib/libusb.so: $(LIBUSB_DIR)/.configured diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index f8088f77e..11e24675d 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -44,7 +44,7 @@ $(LIBXML2_DIR)/.configured: $(LIBXML2_DIR)/.unpacked --without-python \ --without-threads \ $(DISABLE_NLS) \ - ); + ) touch $(LIBXML2_DIR)/.configured $(STAGING_DIR)/usr/lib/libxml2.so: $(LIBXML2_DIR)/.configured @@ -81,7 +81,7 @@ libxml2-source: $(DL_DIR)/$(LIBXML2_SOURCE) libxml2-clean: @if [ -d $(LIBXML2_DIR)/Makefile ] ; then \ $(MAKE) -C $(LIBXML2_DIR) clean ; \ - fi; + fi rm -f $(STAGING_DIR)/usr/lib/libxml2.* rm -f $(TARGET_DIR)/usr/lib/libxml2.* diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 252d08b18..8dc9437e6 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -58,7 +58,7 @@ $(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked --program-prefix="" \ $(DISABLE_IPV6) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured @@ -72,7 +72,7 @@ $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY) $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) @if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] ; then \ $(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \ - fi; + fi $(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y) diff --git a/package/links/links.mk b/package/links/links.mk index 1d0ad016e..5e492b35d 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -37,7 +37,7 @@ $(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) touch $(LINKS_DIR)/.configured $(LINKS_DIR)/links: $(LINKS_DIR)/.configured diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index c094d4610..30b2c0a89 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -55,7 +55,7 @@ $(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ --disable-timesync \ - ); + ) $(SED) "s/-lnsl//;" $(LRZSZ_DIR)/src/Makefile $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(LRZSZ_DIR)/config.h touch $(LRZSZ_DIR)/.configured diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index 9a8a76977..21f317f8d 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -49,7 +49,7 @@ $(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.patched --prefix=/usr \ --sysconfdir=/etc \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(LTRACE_DIR)/$(LTRACE_BINARY): $(LTRACE_DIR)/.configured diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index def7fd20e..6d11e8719 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -36,7 +36,7 @@ $(LTT_DIR1)/.configured: $(LTT_DIR1)/.unpacked ./configure \ --prefix=$(TOOL_BUILD_DIR) \ $(LTT_WITHOUT_GTK) \ - ); + ) touch $(LTT_DIR1)/.configured $(LTT_DIR1)/$(LTT_BINARY): $(LTT_DIR1)/.configured @@ -84,7 +84,7 @@ $(LTT_DIR2)/.configured: $(LTT_DIR2)/.unpacked --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $(LTT_DIR2)/.configured $(LTT_DIR2)/$(LTT_TARGET_BINARY): $(LTT_DIR2)/.configured diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index ba05e255a..d8839ae3a 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -58,7 +58,7 @@ $(LVM2_DIR)/.configured: $(LVM2_DIR)/.unpacked $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ --with-user=$(shell id -un) --with-group=$(shell id -gn) \ - ); + ) touch $(LVM2_DIR)/.configured $(LVM2_TARGET_SBINS): $(LVM2_DIR)/.configured diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index ecaf21b48..bff2fd48c 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -41,7 +41,7 @@ $(LZMA_HOST_DIR)/.configured: $(LZMA_HOST_DIR)/.unpacked CXX="$(HOSTCXX)" \ ./configure \ --prefix=/ \ - ); + ) touch $@ $(LZMA_HOST_DIR)/src/lzma/lzma: $(LZMA_HOST_DIR)/.configured @@ -105,7 +105,7 @@ $(LZMA_TARGET_DIR)/.configured: $(LZMA_TARGET_DIR)/.unpacked --disable-debug \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(LZMA_TARGET_DIR)/src/lzma/lzma: $(LZMA_TARGET_DIR)/.configured diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 77840830f..6618f1a17 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -40,7 +40,7 @@ $(LZO_DIR)/.configured: $(LZO_DIR)/.unpacked --includedir=/usr/include \ --libdir=/usr/lib \ $(LZO_CONFIG_SHARED) \ - ); + ) touch $@ $(LZO_DIR)/src/liblzo.la: $(LZO_DIR)/.configured diff --git a/package/m4/m4.mk b/package/m4/m4.mk index dbdc6b05e..1ca48dc64 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -46,7 +46,7 @@ $(M4_DIR)/.configured: $(M4_DIR)/.unpacked --prefix=/usr \ --exec-prefix=/usr \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(M4_DIR)/src/$(M4_BINARY): $(M4_DIR)/.configured @@ -66,7 +66,7 @@ $(TARGET_DIR)/$(M4_TARGET_BINARY): $(M4_DIR)/src/$(M4_BINARY) infodir=$(TARGET_DIR)/usr/info \ mandir=$(TARGET_DIR)/usr/man \ includedir=$(TARGET_DIR)/usr/include \ - -C $(M4_DIR) install; + -C $(M4_DIR) install $(STRIP) $(TARGET_DIR)/$(M4_TARGET_BINARY) > /dev/null 2>&1 rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc @@ -103,14 +103,14 @@ $(M4_HOST_DIR)/.configured: $(M4_HOST_DIR)/.unpacked ./configure \ --prefix=$(STAGING_DIR)/usr \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(M4_HOST_DIR)/src/$(M4_BINARY): $(M4_HOST_DIR)/.configured $(MAKE) -C $(M4_HOST_DIR) $(STAGING_DIR)/$(M4_TARGET_BINARY): $(M4_HOST_DIR)/src/$(M4_BINARY) - $(MAKE) -C $(M4_HOST_DIR) install; + $(MAKE) -C $(M4_HOST_DIR) install host-m4: uclibc $(STAGING_DIR)/$(M4_TARGET_BINARY) diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index b7533ff10..c095e6442 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -42,7 +42,7 @@ $(MADPLAY_DIR)/.configured: $(MADPLAY_DIR)/.unpacked $(MADPLAY_USE_ALSA) \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(MADPLAY_DIR)/$(MADPLAY_BIN): $(MADPLAY_DIR)/.configured diff --git a/package/make/make.mk b/package/make/make.mk index cd0b5b2a7..109d83bf7 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -45,7 +45,7 @@ $(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(GNUMAKE_DIR)/$(GNUMAKE_BINARY): $(GNUMAKE_DIR)/.configured diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index 36f6b41df..4436ec8bf 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -235,7 +235,7 @@ $(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ $(MATCHBOX_LIB_OPTS) \ - ); + ) touch $(MATCHBOX_LIB_DIR)/.configured $(MATCHBOX_SNOTIFY_DIR)/.configured: $(MATCHBOX_SNOTIFY_DIR)/.unpacked @@ -258,7 +258,7 @@ $(MATCHBOX_SNOTIFY_DIR)/.configured: $(MATCHBOX_SNOTIFY_DIR)/.unpacked --with-x \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ - ); + ) touch $(MATCHBOX_SNOTIFY_DIR)/.configured $(MATCHBOX_WM_DIR)/.configured: $(MATCHBOX_WM_DIR)/.unpacked @@ -285,7 +285,7 @@ $(MATCHBOX_WM_DIR)/.configured: $(MATCHBOX_WM_DIR)/.unpacked --x-libraries=$(STAGING_DIR)/usr/lib \ $(MATCHBOX_WM_OPTS) \ $(MATCHBOX_SNOTIFY_OPTS) \ - ); + ) touch $(MATCHBOX_WM_DIR)/.configured $(MATCHBOX_SM_DIR)/.configured: $(MATCHBOX_SM_DIR)/.unpacked @@ -311,7 +311,7 @@ $(MATCHBOX_SM_DIR)/.configured: $(MATCHBOX_SM_DIR)/.unpacked --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ $(MATCHBOX_SNOTIFY_OPTS) \ - ); + ) touch $(MATCHBOX_SM_DIR)/.configured $(MATCHBOX_CN_DIR)/.configured: $(MATCHBOX_CN_DIR)/.unpacked @@ -336,7 +336,7 @@ $(MATCHBOX_CN_DIR)/.configured: $(MATCHBOX_CN_DIR)/.unpacked --with-x \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ - ); + ) touch $(MATCHBOX_CN_DIR)/.configured $(MATCHBOX_PL_DIR)/.configured: $(MATCHBOX_PL_DIR)/.unpacked @@ -362,7 +362,7 @@ $(MATCHBOX_PL_DIR)/.configured: $(MATCHBOX_PL_DIR)/.unpacked --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ $(MATCHBOX_SNOTIFY_OPTS) \ - ); + ) touch $(MATCHBOX_PL_DIR)/.configured $(MATCHBOX_DP_DIR)/.configured: $(MATCHBOX_DP_DIR)/.unpacked @@ -388,7 +388,7 @@ $(MATCHBOX_DP_DIR)/.configured: $(MATCHBOX_DP_DIR)/.unpacked --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ $(MATCHBOX_SNOTIFY_OPTS) \ - ); + ) touch $(MATCHBOX_DP_DIR)/.configured $(MATCHBOX_FK_DIR)/.configured: $(MATCHBOX_FK_DIR)/.unpacked @@ -413,7 +413,7 @@ $(MATCHBOX_FK_DIR)/.configured: $(MATCHBOX_FK_DIR)/.unpacked --with-x \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ - ); + ) $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FK_DIR)/Makefile touch $(MATCHBOX_FK_DIR)/.configured @@ -439,7 +439,7 @@ $(MATCHBOX_KB_DIR)/.configured: $(MATCHBOX_KB_DIR)/.unpacked --with-x \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib \ - ); + ) touch $(MATCHBOX_KB_DIR)/.configured $(MATCHBOX_LIB_DIR)/.compiled: $(MATCHBOX_LIB_DIR)/.configured diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index 5907343cd..b6fcb0494 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -112,7 +112,7 @@ $(METACITY_DIR)/.configured: $(METACITY_DIR)/.unpacked --disable-sm \ --disable-nls \ --disable-startup-notification \ - ); + ) touch $(METACITY_DIR)/.configured $(METACITY_DIR)/.compiled: $(METACITY_DIR)/.configured @@ -120,7 +120,7 @@ $(METACITY_DIR)/.compiled: $(METACITY_DIR)/.configured touch $(METACITY_DIR)/.compiled $(STAGING_DIR)/lib/*metacity*.so: $(METACITY_DIR)/.compiled - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(METACITY_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(METACITY_DIR) install touch -c $(STAGING_DIR)/lib/*metacity*.so $(TARGET_DIR)/lib/*metacity*.so: $(STAGING_DIR)/lib/*metacity*.so diff --git a/package/microwin/microwin.mk b/package/microwin/microwin.mk index 68c990843..f0183926c 100644 --- a/package/microwin/microwin.mk +++ b/package/microwin/microwin.mk @@ -34,7 +34,7 @@ $(MICROWIN_DIR)/.prepared: $(MICROWIN_DIR)/.unpacked $(MICROWIN_DIR)/.configured: $(MICROWIN_DIR)/.prepared (cd $(MICROWIN_DIR); \ - ); + ) touch $(MICROWIN_DIR)/.configured $(MICROWIN_BINARY): $(MICROWIN_DIR)/.configured diff --git a/package/mkdosfs/mkdosfs.mk b/package/mkdosfs/mkdosfs.mk index 6d8ae2175..0f8e71bd2 100644 --- a/package/mkdosfs/mkdosfs.mk +++ b/package/mkdosfs/mkdosfs.mk @@ -26,7 +26,7 @@ $(MKDOSFS_DIR)/.unpacked: $(DL_DIR)/$(MKDOSFS_SOURCE) touch $(MKDOSFS_DIR)/.unpacked $(MKDOSFS_DIR)/$(MKDOSFS_BINARY): $(MKDOSFS_DIR)/.unpacked - $(MAKE) CFLAGS="$(MKDOSFS_CFLAGS)" CC="$(TARGET_CC)" -C $(MKDOSFS_DIR); + $(MAKE) CFLAGS="$(MKDOSFS_CFLAGS)" CC="$(TARGET_CC)" -C $(MKDOSFS_DIR) $(STRIP) $(MKDOSFS_DIR)/mkdosfs/mkdosfs touch -c $(MKDOSFS_DIR)/mkdosfs/mkdosfs diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index 87e1817d5..e935e8098 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -35,8 +35,8 @@ $(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.unpacked --prefix=/ \ --sysconfdir=/etc \ --program-transform-name='' \ - ); - touch $(MODULE_INIT_TOOLS_DIR)/.configured; + ) + touch $(MODULE_INIT_TOOLS_DIR)/.configured $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(MODULE_INIT_TOOLS_DIR) @@ -89,8 +89,8 @@ $(MODULE_INIT_TOOLS_DIR2)/.configured: $(MODULE_INIT_TOOLS_DIR2)/.source --build=$(GNU_HOST_NAME) \ --sysconfdir=/etc \ --program-transform-name='' \ - ); - touch $(MODULE_INIT_TOOLS_DIR2)/.configured; + ) + touch $(MODULE_INIT_TOOLS_DIR2)/.configured $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR2)/.configured $(MAKE) -C $(MODULE_INIT_TOOLS_DIR2) diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index 0b7eb900d..5a3787f2a 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -39,7 +39,7 @@ $(MODUTILS_DIR1)/.configured: $(MODUTILS_DIR1)/.source --build=$(GNU_HOST_NAME) \ --prefix=/ \ --sysconfdir=/etc \ - ); + ) touch $(MODUTILS_DIR1)/.configured $(MODUTILS_DIR1)/.build: $(MODUTILS_DIR1)/.configured @@ -110,8 +110,8 @@ $(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source --build=$(GNU_HOST_NAME) \ --prefix=/ \ --sysconfdir=/etc \ - ); - touch $(MODUTILS_DIR2)/.configured; + ) + touch $(MODUTILS_DIR2)/.configured $(MODUTILS_DIR2)/$(MODUTILS_BINARY): $(MODUTILS_DIR2)/.configured $(MAKE1) -C $(MODUTILS_DIR2) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index f6659e13f..67a396211 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -59,7 +59,7 @@ $(MPFR_TARGET_DIR)/.configured: $(MPFR_DIR)/.unpacked $(STAGING_DIR)/usr/lib/$(G $(PREFERRED_LIB_FLAGS) \ --with-gmp=$(GMP_TARGET_DIR) \ $(DISABLE_NLS) \ - ); + ) touch $@ $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.configured @@ -67,7 +67,7 @@ $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.configured $(MAKE) -C $(MPFR_TARGET_DIR) $(STAGING_DIR)/usr/lib/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(MPFR_TARGET_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(MPFR_TARGET_DIR) install $(STRIP) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libmpfr$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/usr/lib/libmpfr.a: $(STAGING_DIR)/usr/lib/$(MPFR_BINARY) @@ -104,7 +104,7 @@ $(MPFR_DIR2)/.configured: $(MPFR_DIR)/.unpacked $(GMP_HOST_DIR)/lib/$(GMP_HOST_B --enable-static \ --with-gmp=$(GMP_HOST_DIR) \ $(DISABLE_NLS) \ - ); + ) touch $@ $(MPFR_HOST_DIR)/lib/libmpfr$(HOST_LIBEXT) $(MPFR_HOST_DIR)/lib/libmpfr$(HOST_SHREXT) $(MPFR_HOST_DIR)/lib/libmpfr$(HOST_SHREXT).$(MPFR_LIBVERSION): $(MPFR_DIR2)/.configured diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 22494573c..f8c2176ca 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -43,7 +43,7 @@ $(MPG123_DIR)/.configured: $(MPG123_DIR)/.unpacked $(MPG123_USE_ALSA) \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(MPG123_DIR)/$(MPG123_BIN): $(MPG123_DIR)/.configured diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index 1fe103db6..89f2c96a4 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -46,7 +46,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked --disable-mpdvdkit \ --disable-tv \ --enable-dynamic-plugins \ - ); + ) touch $@ $(MPLAYER_DIR)/$(MPLAYER_BINARY): $(MPLAYER_DIR)/.configured diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 0813762fd..00bd15d05 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -31,7 +31,7 @@ $(NANO_DIR)/.configured: $(NANO_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/ \ --enable-tiny \ - ); + ) touch $(NANO_DIR)/.configured $(NANO_DIR)/$(NANO_BINARY): $(NANO_DIR)/.configured diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index f1b640bac..48a5d31a5 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -27,7 +27,7 @@ $(NBD_DIR)/.configured: $(NBD_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ - ); + ) touch $(NBD_DIR)/.configured $(NBD_DIR)/nbd-client: $(NBD_DIR)/.configured @@ -44,7 +44,7 @@ nbd-source: $(DL_DIR)/$(NBD_SOURCE) nbd-clean: @if [ -d $(NBD_DIR)/Makefile ] ; then \ $(MAKE) -C $(NBD_DIR) clean ; \ - fi; + fi nbd-dirclean: rm -rf $(NBD_DIR) diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index e8eaac1a2..574a18d81 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -33,7 +33,7 @@ $(NCFTP_DIR)/.configured: $(NCFTP_DIR)/.source --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); + ) touch $@ $(NCFTP_DIR)/bin/%: $(NCFTP_DIR)/.configured diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index a1730f679..e301b72ec 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -75,7 +75,7 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched --enable-echo --enable-const --enable-overwrite \ --enable-broken_linker \ $(NCURSES_WANT_STATIC) \ - ); + ) touch $@ $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 8c2dc7a62..22eac03d2 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -30,7 +30,7 @@ $(NETCAT_DIR)/.configured: $(NETCAT_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/ \ - ); + ) touch $@ diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index 61dfb1684..76127b576 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -43,7 +43,7 @@ $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY mkdir -p $(TARGET_DIR)/etc; \ cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/; \ $(SED) "s/^\([a-z]\)/#\1/;" $(TARGET_DIR)/etc/inetd.conf; \ - fi; + fi touch -c $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) netkitbase: uclibc $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index c1adba147..ebae402b5 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -62,7 +62,7 @@ $(NETSNMP_DIR)/.configured: $(NETSNMP_DIR)/.unpacked --sysconfdir=/etc \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $(NETSNMP_DIR)/.configured $(NETSNMP_DIR)/agent/snmpd: $(NETSNMP_DIR)/.configured @@ -77,7 +77,7 @@ $(TARGET_DIR)/usr/sbin/snmpd: $(NETSNMP_DIR)/agent/snmpd mandir=$(TARGET_DIR)/usr/man \ includedir=$(STAGING_DIR)/usr/include/net-snmp \ ucdincludedir=$(STAGING_DIR)/usr/include/ucd-snmp \ - -C $(NETSNMP_DIR) install; + -C $(NETSNMP_DIR) install rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Copy the .conf files. diff --git a/package/newt/newt.mk b/package/newt/newt.mk index 96d02e012..55eb4aa0b 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -20,7 +20,7 @@ $(DL_DIR)/$(NEWT_SOURCE): $(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE) $(NEWT_CAT) $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(NEWT_DIR)/.source; + touch $(NEWT_DIR)/.source $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source (cd $(NEWT_DIR); rm -rf config.cache; \ @@ -43,23 +43,23 @@ $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); - touch $(NEWT_DIR)/.configured; + ) + 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) touch -c $@ $(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION) - cp -a $(NEWT_DIR)/libnewt.a $(STAGING_DIR)/usr/lib/; - cp -a $(NEWT_DIR)/newt.h $(STAGING_DIR)/usr/include/; - cp -a $(NEWT_DIR)/libnewt.so* $(STAGING_DIR)/usr/lib/; - (cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so); - (cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so.0.51); + cp -a $(NEWT_DIR)/libnewt.a $(STAGING_DIR)/usr/lib/ + cp -a $(NEWT_DIR)/newt.h $(STAGING_DIR)/usr/include/ + cp -a $(NEWT_DIR)/libnewt.so* $(STAGING_DIR)/usr/lib/ + (cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so) + (cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so.0.51) touch -c $@ $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/usr/lib/libnewt.a - cp -a $(STAGING_DIR)/usr/lib/libnewt.so* $(TARGET_DIR)/usr/lib/; + cp -a $(STAGING_DIR)/usr/lib/libnewt.so* $(TARGET_DIR)/usr/lib/ -$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so* touch -c $@ diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 38b7e8525..532a97156 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -20,7 +20,7 @@ $(NTP_DIR)/.patched: $(DL_DIR)/$(NTP_SOURCE) $(NTP_CAT) $(DL_DIR)/$(NTP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(NTP_DIR) package/ntp/ ntp\*.patch $(SED) "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," \ - $(NTP_DIR)/ntpd/refclock_pcf.c; + $(NTP_DIR)/ntpd/refclock_pcf.c $(SED) '/[[:space:](]index[[:space:]]*(/s/[[:space:]]*index[[:space:]]*(/ strchr(/g' $(NTP_DIR)/libisc/*.c $(NTP_DIR)/arlib/sample.c $(SED) '/[[:space:](]rindex[[:space:]]*(/s/[[:space:]]*rindex[[:space:]]*(/ strrchr(/g' $(NTP_DIR)/ntpd/*.c #$(SED) 's/\(^#[[:space:]]*include[[:space:]]*<sys\/var.h>\)/\/\/ \1/' $(NTP_DIR)/util/tickadj.c @@ -54,7 +54,7 @@ $(NTP_DIR)/.configured: $(NTP_DIR)/.patched --program-transform-name=s,,, \ --without-crypto \ --disable-tickadj \ - ); + ) touch $@ $(NTP_DIR)/$(NTP_BINARY): $(NTP_DIR)/.configured diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 8996201c4..8093951f0 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -42,7 +42,7 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked --without-x \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $@ $(OPENSSH_DIR)/ssh: $(OPENSSH_DIR)/.configured diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index e50c8d095..208dee493 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -54,7 +54,7 @@ $(OPENVPN_DIR)/.configured: $(OPENVPN_DIR)/.unpacked --program-prefix="" \ --enable-small \ $(THREAD_MODEL) \ - ); + ) touch $(OPENVPN_DIR)/.configured $(OPENVPN_DIR)/$(OPENVPN_BINARY): $(OPENVPN_DIR)/.configured diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 04c28e6fc..3f4fb5358 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -111,7 +111,7 @@ $(PANGO_DIR)/.configured: $(PANGO_DIR)/.unpacked --disable-glibtest \ --enable-explicit-deps=no \ --disable-debug \ - ); + ) touch $(PANGO_DIR)/.configured $(PANGO_DIR)/pango/.libs/$(PANGO_BINARY): $(PANGO_DIR)/.configured @@ -119,7 +119,7 @@ $(PANGO_DIR)/pango/.libs/$(PANGO_BINARY): $(PANGO_DIR)/.configured touch -c $(PANGO_DIR)/pango/.libs/$(PANGO_BINARY) $(STAGING_DIR)/lib/$(PANGO_BINARY): $(PANGO_DIR)/pango/.libs/$(PANGO_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(PANGO_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(PANGO_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libpango-1.0.la $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libpangocairo-1.0.la $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libpangoft2-1.0.la diff --git a/package/patch/patch.mk b/package/patch/patch.mk index f33e716b7..7cb2ac34c 100644 --- a/package/patch/patch.mk +++ b/package/patch/patch.mk @@ -42,7 +42,7 @@ $(GNUPATCH_DIR)/.configured: $(GNUPATCH_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(GNUPATCH_DIR)/.configured $(GNUPATCH_DIR)/$(GNUPATCH_BINARY): $(GNUPATCH_DIR)/.configured diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk index a66617e19..b3ba6b10c 100644 --- a/package/pcmcia/pcmcia.mk +++ b/package/pcmcia/pcmcia.mk @@ -61,16 +61,16 @@ $(PCMCIA_DIR)/cardmgr/cardmgr: $(PCMCIA_DIR)/.configured touch -c $(PCMCIA_DIR)/cardmgr/cardmgr $(TARGET_DIR)/sbin/cardmgr: $(PCMCIA_DIR)/cardmgr/cardmgr - rm -rf $(TARGET_DIR)/etc/pcmcia; + rm -rf $(TARGET_DIR)/etc/pcmcia $(MAKE) -i -C $(PCMCIA_DIR) install - rm -rf $(TARGET_DIR)/usr/man; - rm -rf $(TARGET_DIR)/usr/share/man; - rm -rf $(TARGET_DIR)/usr/X11R6/man; - rm -rf $(TARGET_DIR)/etc/rc.d; - rm -rf $(TARGET_DIR)/etc/rc?.d; - rm -f $(TARGET_DIR)/etc/init.d/pcmcia*; + rm -rf $(TARGET_DIR)/usr/man + rm -rf $(TARGET_DIR)/usr/share/man + rm -rf $(TARGET_DIR)/usr/X11R6/man + rm -rf $(TARGET_DIR)/etc/rc.d + rm -rf $(TARGET_DIR)/etc/rc?.d + rm -f $(TARGET_DIR)/etc/init.d/pcmcia* rm -f $(TARGET_DIR)/sbin/dump_cis $(TARGET_DIR)/sbin/pack_cis - rm -f $(TARGET_DIR)/usr/share/pnp.ids $(TARGET_DIR)/sbin/lspnp $(TARGET_DIR)/sbin/setpnp; + rm -f $(TARGET_DIR)/usr/share/pnp.ids $(TARGET_DIR)/sbin/lspnp $(TARGET_DIR)/sbin/setpnp rm -f $(TARGET_DIR)/sbin/pcinitrd rm -f $(TARGET_DIR)/sbin/probe rm -f $(TARGET_DIR)/sbin/ide_info diff --git a/package/php/php.mk b/package/php/php.mk index 3a1573779..df4317f68 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -91,7 +91,7 @@ $(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked $(PHP_CLI) \ $(PHP_CGI) \ $(PHP_ZLIB) \ - ); + ) touch $(PHP_DIR)/.configured $(PHP_DIR)/.built: $(PHP_DIR)/.configured diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index b19f6ddfc..91c521078 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -38,7 +38,7 @@ $(PKGCONFIG_DIR)/.configured: $(PKGCONFIG_DIR)/.unpacked --with-pc-path="$(STAGING_DIR)/lib/pkgconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(PKGCONFIG_DIR)/.configured $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY): $(PKGCONFIG_DIR)/.configured diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 26cab47b2..fb6ff0ecc 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -48,7 +48,7 @@ $(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) touch $(PPPD_DIR)/.configured $(PPPD_DIR)/$(PPPD_BINARY): $(PPPD_DIR)/.configured diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 385fc0bde..85b60232f 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -47,7 +47,7 @@ $(PROFTPD_DIR)/.configured: $(PROFTPD_DIR)/.unpacked $(DISABLE_LARGEFILE) \ $(ENABLE_IPV6) \ --with-gnu-ld \ - ); + ) touch $(PROFTPD_DIR)/.configured $(PROFTPD_DIR)/$(PROFTPD_BINARY): $(PROFTPD_DIR)/.configured @@ -60,7 +60,7 @@ $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY): $(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; \ - fi; + fi $(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d proftpd: uclibc $(TARGET_DIR)/$(PROFTPD_TARGET_BINARY) diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 311dc79fb..57e4aa134 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -28,7 +28,7 @@ $(PSMISC_DIR)/.configured: $(PSMISC_DIR)/.unpacked --prefix=/ \ $(DISABLE_NLS) \ $(DISABLE_IPV6) \ - ); + ) touch $(PSMISC_DIR)/.configured $(PSMISC_DIR)/$(PSMISC_BINARY): $(PSMISC_DIR)/.configured diff --git a/package/python/python.mk b/package/python/python.mk index 3318c3b07..a0eff5c0c 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -55,7 +55,7 @@ $(PYTHON_DIR)/.configured: $(PYTHON_DIR)/.hostpython --with-cxx=no \ $(DISABLE_IPV6) \ $(DISABLE_NLS) \ - ); + ) touch $@ $(PYTHON_DIR)/$(PYTHON_BINARY): $(PYTHON_DIR)/.configured diff --git a/package/qte/qte.mk b/package/qte/qte.mk index d1f3c7d0b..8ed6267e9 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -140,7 +140,7 @@ $(QTE_QTE_DIR)/.configured: $(QTE_QTE_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(TARGET_CONFIGURE_OPTS) \ ./configure \ $(QTE_QTE_CONFIGURE) -qconfig qpe -keypad-mode -qvfb -depths 4,8,16,32 -xplatform $(BR2_QTE_CROSS_PLATFORM) \ - ); + ) touch $@ ifneq ($(BR2_QTE_C_QTE_VERSION),$(BR2_QTE_C_QT3_VERSION)) @@ -150,7 +150,7 @@ $(QTE_QT3_DIR)/.configured: $(QTE_QT3_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked CC_FOR_BUILD="$(HOSTCC)" \ ./configure \ -fast $(QTE_QT3_CONFIGURE) \ - ); + ) touch $@ endif @@ -159,7 +159,7 @@ $(QTE_QVFB_DIR)/.configured: $(QTE_QVFB_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacke $(TARGET_CONFIGURE_OPTS) \ ./configure \ $(QTE_QVFB_CONFIGURE) \ - ); + ) touch $@ # --edition {other} @@ -174,7 +174,7 @@ $(QTE_QTOPIA_DIR)/.configured: $(QTE_QTOPIA_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unp ./configure \ $(QTE_QTOPIA_CONFIGURE) --edition phone -no-qtopiadesktop -dqt $(QTE_QT3_DIR) -arch generic -displaysize 160-240 -languages en_US \ -platform linux-g++ -qvfb -xplatform $(BR2_QTE_CROSS_PLATFORM) \ - ); + ) touch $@ # there is no build for tmake, only unpack @@ -201,7 +201,7 @@ $(QTE_QT3_DIR)/.make: $(QTE_QT3_DIR)/.unpacked $(MAKE) -C $(QTE_QT3_DIR)/tools/linguist/lupdate \ $(MAKE) -C $(QTE_QT3_DIR)/tools/designer/uilib \ $(MAKE) -C $(QTE_QT3_DIR)/tools/designer/uic - ); + ) touch $@ endif diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index 97cceb56d..ff04fb93c 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -168,7 +168,7 @@ endif $(QTOPIA4_LARGEFILE) \ $(QTOPIA4_ENDIAN) \ $(QTOPIA4_APPROVE_GPL_LICENSE) \ - ); + ) touch $(QTOPIA4_TARGET_DIR)/.configured $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_TARGET_DIR)/.configured @@ -254,7 +254,7 @@ endif $(QTOPIA4_LARGEFILE) \ $(QTOPIA4_ENDIAN) \ $(QTOPIA4_APPROVE_GPL_LICENSE) \ - ); + ) touch $(QTOPIA4_HOST_DIR)/.configured $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_HOST_DIR)/.configured diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index eb9cd7372..75cc04c73 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -148,7 +148,7 @@ $(QUAGGA_DIR)/.configured: $(QUAGGA_DIR)/.unpacked $(DISABLE_IPV6) \ $(QUAGGA_CONFIGURE) \ --program-transform-name='' \ - ); + ) touch $@ $(QUAGGA_BINARY): $(QUAGGA_DIR)/.configured diff --git a/package/raidtools/raidtools.mk b/package/raidtools/raidtools.mk index 448e15802..a765fdd8f 100644 --- a/package/raidtools/raidtools.mk +++ b/package/raidtools/raidtools.mk @@ -41,7 +41,7 @@ $(RAIDTOOLS2_DIR)/.configured: $(RAIDTOOLS2_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ --enable-fsect-man5 \ - ); + ) touch $(RAIDTOOLS2_DIR)/.configured $(RAIDTOOLS2_DIR)/$(RAIDTOOLS2_BINARY): $(RAIDTOOLS2_DIR)/.configured diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 3bca0542a..f1c873464 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -29,7 +29,7 @@ $(RDESKTOP_DIR)/.configured: $(RDESKTOP_DIR)/.unpacked --prefix=/usr \ --with-openssl=$(STAGING_DIR) \ --sysconfdir=/etc \ - ); + ) touch $(RDESKTOP_DIR)/.configured $(RDESKTOP_DIR)/rdesktop: $(RDESKTOP_DIR)/.configured @@ -46,7 +46,7 @@ rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE) rdesktop-clean: @if [ -d $(RDESKTOP_DIR)/Makefile ] ; then \ $(MAKE) -C $(RDESKTOP_DIR) clean ; \ - fi; + fi rdesktop-dirclean: rm -rf $(RDESKTOP_DIR) $(RDESKTOP_DIR) diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 642ab3a0b..d5718fc87 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -45,7 +45,7 @@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked --includedir=/usr/include \ --mandir=/usr/man \ --infodir=/usr/info \ - ); + ) touch $@ $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 89f33f1c3..454f30c4b 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -31,7 +31,7 @@ $(RSYNC_DIR)/.configured: $(RSYNC_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --with-included-popt \ - ); + ) touch $(RSYNC_DIR)/.configured $(RSYNC_DIR)/$(RSYNC_BINARY): $(RSYNC_DIR)/.configured diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 40f8e9376..188604fcd 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -19,7 +19,7 @@ ruby-source: $(DL_DIR)/$(RUBY_SOURCE) $(RUBY_DIR)/.unpacked: $(DL_DIR)/$(RUBY_SOURCE) $(RUBY_CAT) $(DL_DIR)/$(RUBY_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(RUBY_DIR) package/ruby/ ruby-*.patch - (cd $(RUBY_DIR); autoreconf); + (cd $(RUBY_DIR); autoreconf) touch $(RUBY_DIR)/.unpacked $(RUBY_DIR)/.configured: $(RUBY_DIR)/.unpacked @@ -43,7 +43,7 @@ $(RUBY_DIR)/.configured: $(RUBY_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(RUBY_DIR)/.configured $(RUBY_DIR)/$(RUBY_BINARY): $(RUBY_DIR)/.configured diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index 2b16c61f8..1aeae621f 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -53,7 +53,7 @@ $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked --x-libraries=$(STAGING_DIR)/usr/X11R6/lib \ --disable-resources \ --disable-memset \ - ); + ) touch $(RXVT_DIR)/.configured $(RXVT_BINARY): $(RXVT_DIR)/.configured diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 931c35ce7..0584c27e3 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -45,7 +45,7 @@ $(SAMBA_DIR)/.configured: $(SAMBA_DIR)/.unpacked --with-included-iniparser \ --disable-cups \ --disable-static \ - ); + ) touch $@ $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured @@ -101,7 +101,7 @@ $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) $(INSTALL) -m 0755 package/samba/S91smb $(TARGET_DIR)/etc/init.d @if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ] ; then \ $(INSTALL) -m 0755 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \ - fi; + fi rm -rf $(TARGET_DIR)/var/cache/samba rm -rf $(TARGET_DIR)/var/lib/samba diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 5eaa3f508..9e6c52c03 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -46,7 +46,7 @@ $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked --disable-arts \ --disable-esd \ --disable-nasm \ - --disable-video-x11 ); + --disable-video-x11 ) touch $@ $(STAGING_DIR)/include/directfb: @@ -60,7 +60,7 @@ $(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(STAGING_DIR)/include/directfb touch $@ $(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled - $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install touch -c $@ $(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so diff --git a/package/sed/sed.mk b/package/sed/sed.mk index f22d54c46..067996618 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -43,7 +43,7 @@ $(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked (cd $(SED_DIR1); rm -rf config.cache; \ ./configure \ --prefix=/usr \ - ); + ) touch $(SED_DIR1)/.configured $(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured @@ -52,7 +52,7 @@ $(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured # This stuff is needed to work around GNU make deficiencies build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY) @if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ] ; then \ - rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); fi; + rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); fi @if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) -o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \ -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \ set -x; \ @@ -119,7 +119,7 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked --infodir=/usr/info \ --include=$(STAGING_DIR)/usr/include \ $(DISABLE_NLS) \ - ); + ) touch $(SED_DIR2)/.configured $(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured @@ -128,7 +128,7 @@ $(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured # This stuff is needed to work around GNU make deficiencies sed-target_binary: $(SED_DIR2)/$(SED_BINARY) @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \ - rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi; + rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi @if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \ -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \ diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 8489c126f..e43882df0 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -51,7 +51,7 @@ $(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - ); + ) touch $@ $(SETSERIAL_DIR)/$(SETSERIAL_BINARY): $(SETSERIAL_DIR)/.configured diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk index 88980934f..d6dd26c0f 100644 --- a/package/sfdisk/sfdisk.mk +++ b/package/sfdisk/sfdisk.mk @@ -22,11 +22,11 @@ $(SFDISK_DIR)/sfdisk: $(SFDISK_DIR)/.patched $(MAKE) \ CROSS=$(TARGET_CROSS) DEBUG=false OPTIMIZATION="$(TARGET_CFLAGS)" \ -C $(SFDISK_DIR) - -$(STRIP) $(SFDISK_DIR)/sfdisk; + -$(STRIP) $(SFDISK_DIR)/sfdisk touch -c $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk - cp $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk; + cp $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk touch -c $(TARGET_DIR)/sbin/sfdisk sfdisk: uclibc $(TARGET_DIR)/sbin/sfdisk diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index e9a88df1c..064e8decf 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -44,7 +44,7 @@ $(SMARTMONTOOLS_DIR)/.configured: $(SMARTMONTOOLS_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(SMARTMONTOOLS_DIR)/.configured $(SMARTMONTOOLS_DIR)/$(SMARTMONTOOLS_BINARY): $(SMARTMONTOOLS_DIR)/.configured diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 52930b53e..c2ff2eb48 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -48,7 +48,7 @@ $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked --disable-termios \ $(DISABLE_NLS); \ $(SED) 's/#define HAVE_TERMIOS_ISPEED 1/#undef HAVE_TERMIOS_ISPEED/g' config.h; \ - ); + ) $(SOCAT_WORKDIR)/socat: $(SOCAT_WORKDIR)/Makefile rm -f $@ @@ -66,7 +66,7 @@ socat-source: $(DL_DIR)/$(SOCAT_SOURCE) socat-clean: @if [ -d $(SOCAT_WORKDIR)/Makefile ] ; then \ $(MAKE) -C $(SOCAT_WORKDIR) clean ; \ - fi; + fi socat-dirclean: rm -rf $(SOCAT_DIR) $(SOCAT_WORKDIR) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index a232f89a4..79645c0f2 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -48,7 +48,7 @@ $(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.unpacked --enable-tempstore \ --enable-threadsafe \ --enable-releasemode \ - ); + ) touch $(SQLITE_DIR)/.configured $(SQLITE_DIR)/sqlite3: $(SQLITE_DIR)/.configured @@ -69,7 +69,7 @@ sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE) sqlite-clean: @if [ -d $(SQLITE_DIR)/Makefile ] ; then \ $(MAKE) -C $(SQLITE_DIR) clean ; \ - fi; + fi sqlite-dirclean: rm -rf $(SQLITE_DIR) diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 8106d9d87..866a823b6 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -49,7 +49,7 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(STRACE_DIR)/.configured $(STRACE_DIR)/strace: $(STRACE_DIR)/.configured diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 09e5f8226..8375a3d90 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -47,7 +47,7 @@ $(STUNNEL_DIR)/.configured: $(STUNNEL_DIR)/.unpacked --with-ssl=$(STAGING_DIR) \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(STUNNEL_DIR)/.configured $(STUNNEL_DIR)/src/stunnel: $(STUNNEL_DIR)/.configured diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 1ab156fcf..b7e22f712 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -47,7 +47,7 @@ $(SUDO_DIR)/.configured: $(SUDO_DIR)/.unpacked $(SUDO_CONFIG_FILE) --without-interfaces \ --disable-authentication \ $(SUDO_EXTRA_CONFIG) \ - ); + ) touch $(SUDO_DIR)/.configured diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 0641969cd..ad2c03799 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -44,7 +44,7 @@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ - ); + ) touch $(GNUTAR_DIR)/.configured $(GNUTAR_DIR)/$(GNUTAR_BINARY): $(GNUTAR_DIR)/.configured @@ -53,12 +53,12 @@ $(GNUTAR_DIR)/$(GNUTAR_BINARY): $(GNUTAR_DIR)/.configured # This stuff is needed to work around GNU make deficiencies tar-target_binary: $(GNUTAR_DIR)/$(GNUTAR_BINARY) @if [ -L $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) ] ; then \ - rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi; + rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi @if [ ! -f $(GNUTAR_DIR)/$(GNUTAR_BINARY) -o $(TARGET_DIR)/$(GNUTAR_TARGET_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/tcl/tcl.mk b/package/tcl/tcl.mk index 22a476970..16fcd41e1 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -30,8 +30,8 @@ $(TCL_DIR)/.configured: $(TCL_DIR)/.source --disable-symbols \ --disable-langinfo \ --disable-framework \ - ); - touch $(TCL_DIR)/.configured; + ) + touch $(TCL_DIR)/.configured $(TCL_DIR)/unix/libtcl8.4.so: $(TCL_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(TCL_DIR)/unix diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 695001dd3..3482e12a0 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -42,7 +42,7 @@ $(TFTP_HPA_DIR)/.configured: $(TFTP_HPA_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_LARGEFILE) \ --without-tcpwrappers \ - ); + ) touch $(TFTP_HPA_DIR)/.configured $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY): $(TFTP_HPA_DIR)/.configured @@ -51,15 +51,15 @@ $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY): $(TFTP_HPA_DIR)/.configured # This stuff is needed to work around GNU make deficiencies $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY): $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) @if [ -L $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) ] ; then \ - rm -f $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); fi; + rm -f $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY); fi @if [ ! -f $(TFTP_HPA_DIR)/$(TFTP_HPA_BINARY) -o $(TARGET_DIR)/$(TFTP_HPA_TARGET_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; + fi tftpd: uclibc $(TARGET_DIR)/$(TFTP_HPA_TARGET_BINARY) diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index 3c676d18c..7974868cf 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -31,7 +31,7 @@ $(THTTPD_DIR)/.configured: $(THTTPD_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=$(THTTPD_ROOT) \ - ); + ) touch $(THTTPD_DIR)/.configured $(THTTPD_DIR)/$(THTTPD_BINARY): $(THTTPD_DIR)/.configured diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 17b86820e..b8a867ea3 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -51,7 +51,7 @@ $(TIFF_DIR)/.configured: $(TIFF_DIR)/.unpacked --with-jpeg-lib-dir=$(STAGING_DIR)/lib \ --with-zlib-include-dir=$(STAGING_DIR)/usr/include \ --with-zlib-lib-dir=$(STAGING_DIR)/lib \ - ); + ) touch $(TIFF_DIR)/.configured $(TIFF_DIR)/libtiff/.libs/libtiff.a: $(TIFF_DIR)/.configured diff --git a/package/tinyx-old/tinyx.mk b/package/tinyx-old/tinyx.mk index 7adf0a712..557348252 100644 --- a/package/tinyx-old/tinyx.mk +++ b/package/tinyx-old/tinyx.mk @@ -83,7 +83,7 @@ $(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) # $(TINYX_XFBDEV): $(TINYX_DIR)/.configure rm -f $(TINYX_BINX)/Xfbdev - #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>"; + #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>" #( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" ) #( cd $(TINYX_DIR) ; $(TARGET_CONFIGURE_OPTS) $(MAKE) World ) # diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index b6928b1a7..2adea0ade 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -83,7 +83,7 @@ $(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) # $(TINYX_XFBDEV): $(TINYX_DIR)/.configure rm -f $(TINYX_BINX)/Xfbdev - #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>"; + #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=<cross compiler dir>" #( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" ) #( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World ) # diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index 21109fc41..c62abfdc1 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -33,7 +33,7 @@ $(TN5250_DIR)/.configured: $(TN5250_DIR)/.dist --infodir=/usr/info \ $(DISABLE_NLS) \ --with-slang --without-x --without-ssl \ - ); + ) touch $(TN5250_DIR)/.configured $(TN5250_DIR)/src/tn5250: $(TN5250_DIR)/.configured diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index c6794c541..84890f211 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -44,7 +44,7 @@ $(TSLIB_DIR)/.configured: $(TSLIB_DIR)/.patched --disable-mk712 \ --disable-arctic2 \ --enable-input \ - ); + ) $(SED) 's:rpl\_malloc:malloc:g' $(TSLIB_DIR)/config.h touch $(TSLIB_DIR)/.configured diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk index d36d6b224..9f08f99be 100644 --- a/package/usbmount/usbmount.mk +++ b/package/usbmount/usbmount.mk @@ -25,7 +25,7 @@ $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY): $(USBMOUNT_DIR)/.unpacked $(INSTALL) -m 0755 -D $(USBMOUNT_DIR)/usbmount $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY) @if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ] ; then \ $(INSTALL) -m 0644 -D $(USBMOUNT_DIR)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \ - fi; + fi touch -c $@ usbmount: uclibc $(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY) diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index d80110622..fb7f6ce23 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -31,7 +31,7 @@ $(USBUTILS_DIR)/.configured: $(USBUTILS_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ - ); + ) touch $(USBUTILS_DIR)/.configured $(USBUTILS_DIR)/$(USBUTILS_BINARY): $(USBUTILS_DIR)/.configured diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 1d0cf7fc8..519513531 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -42,7 +42,7 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ ARCH=$(ARCH) \ - ); + ) $(SED) "s,^INSTALLSUID=.*,INSTALLSUID=\\$$\(INSTALL\) -m \\$$\(BINMODE\)," \ $(UTIL-LINUX_DIR)/MCONFIG $(SED) "s,^USE_TTY_GROUP=.*,USE_TTY_GROUP=no," $(UTIL-LINUX_DIR)/MCONFIG diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index e1ef96be4..9e5e1f560 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -35,7 +35,7 @@ $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched --disable-tui --disable-valgrindtk \ --without-x --without-included-gettext \ --disable-tls \ - ); + ) touch $(VALGRIND_DIR)/.configured $(VALGRIND_DIR)/none/vgskin_none.so: $(VALGRIND_DIR)/.configured @@ -58,7 +58,7 @@ $(TARGET_DIR)/usr/bin/valgrind: $(VALGRIND_DIR)/none/vgskin_none.so infodir=$(TARGET_DIR)/usr/info \ mandir=$(TARGET_DIR)/usr/man \ includedir=$(TARGET_DIR)/usr/include \ - -C $(VALGRIND_DIR) install; + -C $(VALGRIND_DIR) install mv $(TARGET_DIR)/usr/bin/valgrind $(TARGET_DIR)/usr/bin/valgrind.bin cp package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/ cp package/valgrind/valgrind.sh $(TARGET_DIR)/usr/bin/valgrind diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk index 92699f7d4..055400ff8 100644 --- a/package/vpnc/vpnc.mk +++ b/package/vpnc/vpnc.mk @@ -54,7 +54,7 @@ vpnc-source: $(DL_DIR)/$(VPNC_SOURCE) vpnc-clean: @if [ -d $(VPNC_DIR)/Makefile ] ; then \ $(MAKE) -C $(VPNC_DIR) clean ; \ - fi; + fi rm -f $(STAGING_DIR)/usr/bin/vpnc vpnc-dirclean: diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 04f249f04..5750d90a8 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -47,7 +47,7 @@ $(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \ --with-lzo-headers=$(STAGING_DIR)/usr/include \ --with-lzo-lib=$(STAGING_DIR)/usr/lib \ - ); + ) touch $(VTUN_DIR)/.configured $(VTUN_DIR)/$(VTUN_BINARY): $(VTUN_DIR)/.configured diff --git a/package/wget/wget.mk b/package/wget/wget.mk index eb3219f5c..76e1a1f31 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -32,7 +32,7 @@ $(WGET_DIR)/.configured: $(WGET_DIR)/.unpacked --disable-ipv6 \ $(DISABLE_NLS) \ --without-ssl \ - ); + ) touch $(WGET_DIR)/.configured $(WGET_DIR)/$(WGET_BINARY): $(WGET_DIR)/.configured diff --git a/package/which/which.mk b/package/which/which.mk index 548e65743..2bdb258de 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -29,7 +29,7 @@ $(WHICH_DIR)/.configured: $(WHICH_DIR)/.unpacked --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/ \ - ); + ) touch $(WHICH_DIR)/.configured $(WHICH_DIR)/$(WHICH_BINARY): $(WHICH_DIR)/.configured diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index c9f8d16b0..baf05109e 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -27,7 +27,7 @@ $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked ./runConfigure -plinux -minmem \ -nsocket -tnative -rpthread \ -c$(TARGET_CC) -x$(TARGET_CXX) \ - ); + ) touch $(XERCES_DIR)/.configured $(XERCES_DIR)/$(XERCES_BINARY): $(XERCES_DIR)/.configured diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 0c17c0946..4651ff220 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -48,7 +48,7 @@ $(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked --exec-prefix=/ \ --libdir=/usr/lib \ $(XFSPROGS_CONFIG_SHARED) \ - ); + ) touch $(XFSPROGS_DIR)/.configured $(XFSPROGS_DIR)/$(XFSPROGS_BINARY): $(XFSPROGS_DIR)/.configured diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index e5697a166..3fe94fcba 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -199,7 +199,7 @@ $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/ touch $(TARGET_DIR)/etc/ld.so.conf if [ "`grep -c '$(TARGET_LIBX)' $(TARGET_DIR)/etc/ld.so.conf`" = "0" ] ; then \ echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf; \ - fi; + fi touch -c $(XORG_LIBX)/libX11.so.6.2 $(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 14b252fc4..a3144d29b 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -112,7 +112,7 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched $(MULTILIB) \ --disable-werror \ $(SOFT_FLOAT_CONFIG_OPTION) \ - $(EXTRA_BINUTILS_CONFIG_OPTIONS)); + $(EXTRA_BINUTILS_CONFIG_OPTIONS)) touch $@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured @@ -161,7 +161,7 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched $(MULTILIB) \ $(BINUTILS_TARGET_CONFIG_OPTIONS) \ --disable-werror \ - $(SOFT_FLOAT_CONFIG_OPTION) ); + $(SOFT_FLOAT_CONFIG_OPTION) ) touch $@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk index cacf74c1d..402b3d4b3 100644 --- a/toolchain/ccache/ccache.mk +++ b/toolchain/ccache/ccache.mk @@ -39,7 +39,7 @@ $(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched --host=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ - ); + ) touch $@ $(CCACHE_DIR1)/$(CCACHE_BINARY): $(CCACHE_DIR1)/.configured @@ -50,18 +50,18 @@ $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY) cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin # Keep the actual toolchain binaries in a directory at the same level. # Otherwise, relative paths for include dirs break. - mkdir -p $(STAGING_DIR)/usr/bin-ccache; + mkdir -p $(STAGING_DIR)/usr/bin-ccache (cd $(STAGING_DIR)/usr/bin-ccache; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \ - ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc); + ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc) [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin-ccache/ (cd $(STAGING_DIR)/usr/bin; \ ln -fs ccache $(GNU_TARGET_NAME)-cc; \ ln -fs ccache $(GNU_TARGET_NAME)-gcc; \ ln -fs ccache $(REAL_GNU_TARGET_NAME)-cc; \ - ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc); + ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc) 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/ @@ -71,10 +71,10 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) ln -fs ccache $(GNU_TARGET_NAME)-c++; \ ln -fs ccache $(GNU_TARGET_NAME)-g++;\ ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \ - ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++); + ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++) (cd $(STAGING_DIR)/usr/bin-ccache; \ ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \ - ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++); + ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++) endif ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY) @@ -90,20 +90,20 @@ ccache-clean: ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \ - fi; + fi if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \ - fi; + 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/; \ - fi; + fi 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++;\ - ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++); + ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++) -$(MAKE) -C $(CCACHE_DIR1) clean ccache-dirclean: @@ -144,7 +144,7 @@ $(CCACHE_DIR2)/.configured: $(CCACHE_DIR2)/.patched --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) touch $@ $(CCACHE_DIR2)/$(CCACHE_BINARY): $(CCACHE_DIR2)/.configured diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index f235e5bb1..e5868b639 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -188,7 +188,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched $(MULTILIB) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured @@ -250,7 +250,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured @@ -274,10 +274,10 @@ endif if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ] ; then \ ln -snf $(REAL_GNU_TARGET_NAME)-gcc \ $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ - fi; + fi if [ ! -e $(STAGING_DIR)/usr/bin/gcc ] ; then \ ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ - fi; + fi # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_DIR)/usr; \ @@ -287,7 +287,7 @@ endif ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ - ); + ) # # Now for the ugly 3.3.x soft float hack... # @@ -297,12 +297,12 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \ echo soft float configured but no specs file for this arch ; \ /bin/false ; \ - fi; + fi # Replace specs file with one that defaults to soft float mode. if [ ! -f $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \ echo staging dir specs file is missing ; \ /bin/false ; \ - fi; + fi cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif @@ -385,7 +385,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ $(EXTRA_GCC_CONFIG_OPTIONS) \ - $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)); + $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured @@ -454,7 +454,7 @@ endif # Make sure we have 'cc'. if [ ! -e $(TARGET_DIR)/usr/bin/cc ] ; then \ ln -snf gcc $(TARGET_DIR)/usr/bin/cc ; \ - fi; + fi # These are in /lib, so... #rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* #touch -c $(TARGET_DIR)/usr/bin/gcc diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index b01c0805a..82a7bf95e 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -206,7 +206,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched $(MULTILIB) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured @@ -269,7 +269,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured @@ -298,10 +298,10 @@ endif if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ] ; then \ ln -snf $(REAL_GNU_TARGET_NAME)-gcc \ $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ - fi; + fi if [ ! -e $(STAGING_DIR)/usr/bin/cc ] ; then \ ln -snf gcc $(STAGING_DIR)/usr/bin/cc ; \ - fi; + fi # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_DIR); \ @@ -311,7 +311,7 @@ endif ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ - ); + ) # # Now for the ugly 3.3.x soft float hack... # @@ -321,12 +321,12 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \ echo soft float configured but no specs file for this arch ; \ /bin/false ; \ - fi; + fi # Replace specs file with one that defaults to soft float mode. if [ ! -f $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \ echo staging dir specs file is missing ; \ /bin/false ; \ - fi; + fi cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif @@ -406,7 +406,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ $(EXTRA_GCC_CONFIG_OPTIONS) \ - $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)); + $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured @@ -475,7 +475,7 @@ endif # Make sure we have 'cc'. if [ ! -e $(TARGET_DIR)/usr/bin/cc ] ; then \ ln -snf gcc $(TARGET_DIR)/usr/bin/cc ; \ - fi; + fi # These are in /lib, so... #rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* touch -c $@ diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 3b701e423..60596aeb0 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -105,7 +105,7 @@ $(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked --disable-sim --enable-gdbserver \ --without-included-gettext \ --disable-werror \ - ); + ) ifeq ($(BR2_ENABLE_LOCALE),y) -$(SED) "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile endif @@ -162,7 +162,7 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked --without-uiout $(DISABLE_GDBMI) \ --disable-tui --disable-gdbtk --without-x \ --without-included-gettext \ - ); + ) touch $@ $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured @@ -208,7 +208,7 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked --disable-tui --disable-gdbtk --without-x \ --without-included-gettext \ --enable-threads \ - ); + ) touch $@ $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index c97219b67..28e1c7609 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -302,7 +302,7 @@ else cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ fi; \ - fi; + fi endif touch $@ @@ -354,7 +354,7 @@ else cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(STAGING_DIR)/usr/include/ ; \ fi; \ - fi; + fi endif # Build the host utils. Need to add an install target... $(MAKE1) -C $(UCLIBC_DIR)/utils \ @@ -439,7 +439,7 @@ else cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(TARGET_DIR)/usr/include/ ; \ fi; \ - fi; + fi endif touch -c $@ |