aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/avahi/avahi.mk2
-rw-r--r--package/berkeleydb/berkeleydb.mk2
-rw-r--r--package/boa/boa.mk7
-rw-r--r--package/dillo/dillo.mk4
-rw-r--r--package/dm/dm.mk4
-rw-r--r--package/dmalloc/dmalloc.mk6
-rw-r--r--package/dmraid/dmraid.mk2
-rw-r--r--package/dropbear/dropbear.mk5
-rw-r--r--package/fakeroot/fakeroot.mk4
-rw-r--r--package/file/file.mk2
-rw-r--r--package/iperf/iperf.mk5
-rw-r--r--package/ipsec-tools/ipsec-tools.mk5
-rw-r--r--package/libeXosip2/libeXosip2.mk8
-rw-r--r--package/libfloat/libfloat.mk2
-rw-r--r--package/liblockfile/liblockfile.mk2
-rw-r--r--package/libmad/libmad.mk8
-rw-r--r--package/libosip2/libosip2.mk11
-rw-r--r--package/links/links.mk3
-rw-r--r--package/lockfile-progs/lockfile-progs.mk4
-rw-r--r--package/ltp-testsuite/ltp-testsuite.mk2
-rw-r--r--package/ltt/ltt.mk2
-rw-r--r--package/lua/lua.mk12
-rw-r--r--package/madplay/madplay.mk2
-rw-r--r--package/nbd/nbd.mk5
-rw-r--r--package/ncftp/ncftp.mk2
-rw-r--r--package/netsnmp/netsnmp.mk6
-rw-r--r--package/openssh/openssh.mk4
-rw-r--r--package/openssl/openssl.mk6
-rw-r--r--package/python/python.mk5
-rw-r--r--package/rdesktop/rdesktop.mk12
-rw-r--r--package/socat/socat.mk9
-rw-r--r--package/speex/speex.mk11
-rw-r--r--package/sqlite/sqlite.mk8
-rw-r--r--package/strace/strace.mk2
-rw-r--r--package/stunnel/stunnel.mk3
-rw-r--r--package/tinyhttpd/tinyhttpd.mk2
-rw-r--r--package/tn5250/tn5250.mk3
-rw-r--r--package/valgrind/valgrind.mk4
38 files changed, 94 insertions, 92 deletions
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index cff96937aa..2f423d7dc9 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -181,7 +181,7 @@ endif
avahi: uclibc busybox libdaemon $(AVAHI_TARGETS)
avahi-clean:
- $(MAKE) -C $(AVAHI_DIR) distclean
+ -$(MAKE) -C $(AVAHI_DIR) distclean
-rm -rf $(TARGET_DIR)/etc/avahi
-rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
-rm -f $(TARGET_DIR)/etc/init.d/S*avahi*
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 84d7c1d34d..1d7b16d441 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -84,7 +84,7 @@ $(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a
berkeleydb-headers: $(TARGET_DIR)/usr/lib/libdb.a
berkeleydb-clean:
- $(MAKE) -C $(DB_DIR)/build_unix clean
+ -$(MAKE) -C $(DB_DIR)/build_unix clean
berkeleydb-dirclean:
rm -rf $(DB_DIR)
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index a429cd2f5d..df4dd730dc 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -68,9 +68,10 @@ boa: uclibc $(BOA_WORKDIR)/.installed
boa-source: $(DL_DIR)/$(BOA_SOURCE)
boa-clean:
- @if [ -d $(BOA_WORKDIR)/Makefile ]; then \
- $(MAKE) -C $(BOA_WORKDIR) clean; \
- fi
+ -$(MAKE) -C $(BOA_WORKDIR) clean
+ rm -rf $(TARGET_DIR)/usr/sbin/boa \
+ $(TARGET_DIR)/usr/lib/boa/boa_indexer \
+ $(TARGET_DIR)/etc/mime.types $(TARGET_DIR)/etc/boa
boa-dirclean:
rm -rf $(BOA_DIR) $(BOA_WORKDIR)
diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index 2a6e9eceb7..b407d60025 100644
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -44,9 +44,7 @@ dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
dillo-source: $(DL_DIR)/$(DILLO_SOURCE)
dillo-clean:
- @if [ -d $(DILLO_DIR)/Makefile ]; then \
- $(MAKE) -C $(DILLO_DIR) clean; \
- fi
+ -$(MAKE) -C $(DILLO_DIR) clean
dillo-dirclean:
rm -rf $(DILLO_DIR)
diff --git a/package/dm/dm.mk b/package/dm/dm.mk
index e407f89359..a9c1bdd99b 100644
--- a/package/dm/dm.mk
+++ b/package/dm/dm.mk
@@ -114,9 +114,9 @@ $(DM_TARGET_HEADER): $(DM_TARGET_LIBRARY)
dm: uclibc $(DM_TARGET_BINARY) $(DM_TARGET_LIBRARY) #$(DM_TARGET_HEADER)
dm-clean:
- rm $(DM_TARGET_BINARY) $(DM_TARGET_LIBRARY) \
+ rm -f $(DM_TARGET_BINARY) $(DM_TARGET_LIBRARY) \
$(DM_TARGET_LIBRARY).$(DM_BASEVER) $(DM_TARGET_HEADER)
- $(MAKE) -C $(DM_DIR) clean
+ -$(MAKE) -C $(DM_DIR) clean
dm-dirclean:
rm -rf $(DM_DIR)
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index 0ff3fc42dd..c705b517e5 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -85,11 +85,11 @@ $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY)
dmalloc: uclibc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
dmalloc-clean:
- rm -f $(TARGET_DIR)/usr/lib/libdmalloc*
- rm -f $(STAGING_DIR)/usr/lib/libdmalloc*
+ -rm -f $(TARGET_DIR)/usr/lib/libdmalloc*
+ -rm -f $(STAGING_DIR)/usr/lib/libdmalloc*
rm -f $(STAGING_DIR)/usr/include/dmalloc.h
rm -f $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
- $(MAKE) -C $(DMALLOC_DIR) clean
+ -$(MAKE) -C $(DMALLOC_DIR) clean
dmalloc-dirclean:
rm -rf $(DMALLOC_DIR)
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index f790ca5cb4..500ee0d529 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -52,7 +52,7 @@ dmraid: uclibc dm zlib $(DMRAID_TARGET_BINARY)
dmraid-clean:
rm -f $(DMRAID_TARGET_BINARY) $(TARGET_DIR)/etc/init.d/dmraid
- $(MAKE) -C $(DMRAID_DIR) clean
+ -$(MAKE) -C $(DMRAID_DIR) clean
dmraid-dirclean:
rm -rf $(DMRAID_DIR)
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index bed75537af..c4d11c5e83 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -63,9 +63,10 @@ $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY)
dropbear: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
dropbear-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) \
- LD=$(TARGET_CC) -C $(DROPBEAR_DIR) uninstall
-$(MAKE) -C $(DROPBEAR_DIR) clean
+ rm -f $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
+ rm -f $(TARGET_DIR)/usr/bin/{scp,ssh,dbclient,dropbearkey,dropbearconvert}
+ rm -f $(TARGET_DIR)/etc/init.d/S50dropbear
dropbear-dirclean:
rm -rf $(DROPBEAR_DIR)
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 94e22f431e..d657710b1f 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -57,7 +57,7 @@ $(STAGING_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked
host-fakeroot: uclibc $(STAGING_DIR)/usr/bin/fakeroot
host-fakeroot-clean:
- $(MAKE) -C $(FAKEROOT_DIR1) clean
+ -$(MAKE) -C $(FAKEROOT_DIR1) clean
host-fakeroot-dirclean:
rm -rf $(FAKEROOT_DIR1)
@@ -115,7 +115,7 @@ endif
fakeroot: uclibc $(TARGET_DIR)/usr/bin/fakeroot
fakeroot-clean:
- $(MAKE) -C $(FAKEROOT_DIR2) clean
+ -$(MAKE) -C $(FAKEROOT_DIR2) clean
rm -f $(TARGET_DIR)/usr/bin/fake{d,root}
fakeroot-dirclean:
diff --git a/package/file/file.mk b/package/file/file.mk
index fe7a8a6135..f4205718cd 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -40,7 +40,7 @@ $(TOOL_BUILD_DIR)/bin/file: $(FILE_DIR1)/.configured
host-file: $(TOOL_BUILD_DIR)/bin/file
host-file-clean:
- $(MAKE) -C $(FILE_DIR1) clean
+ -$(MAKE) -C $(FILE_DIR1) clean
host-file-dirclean:
rm -rf $(FILE_DIR1)
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 87f40a61e4..731490274c 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -58,9 +58,8 @@ iperf: $(TARGET_DIR)/usr/bin/iperf
iperf-source: $(DL_DIR)/$(IPERF_SOURCE)
iperf-clean:
- @if [ -d $(IPERF_KDIR)/Makefile ]; then \
- $(MAKE) -C $(IPERF_DIR) clean; \
- fi
+ rm -f $(TARGET_DIR)/usr/bin/iperf
+ -$(MAKE) -C $(IPERF_DIR) clean
iperf-dirclean:
rm -rf $(IPERF_DIR)
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 05d6eb76c2..cc3d7c4373 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -142,8 +142,8 @@ ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
ipsec-tools-uninstall:
ipsec-tools-clean:
- $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall
- $(MAKE) -C $(IPSEC_TOOLS_DIR) clean
+ -$(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall
+ -$(MAKE) -C $(IPSEC_TOOLS_DIR) clean
ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_LIBS)),y)
rm -f $(addprefix $(STAGING_DIR)/lib/, \
libipsec.a libipsec.la libracoon.a libracoon.la)
@@ -151,7 +151,6 @@ endif
rm -f $(IPSEC_TOOLS_DIR)/.configured
ipsec-tools-dirclean:
- @echo $(LINUX_DIR)
rm -rf $(IPSEC_TOOLS_DIR)
ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS)), y)
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 9a69754de5..7c0637a566 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -89,11 +89,9 @@ libeXosip2: uclibc $(TARGET_DIR)/usr/lib/libeXosip2.so
libeXosip2-source: $(DL_DIR)/$(LIBEXOSIP2_SOURCE)
libeXosip2-clean:
- @if [ -d $(LIBEXOSIP2_DIR)/Makefile ]; then \
- $(MAKE) -C $(LIBEXOSIP2_DIR) clean; \
- fi
- rm -f $(STAGING_DIR)/usr/lib/libeXosip2.*
- rm -f $(TARGET_DIR)/usr/lib/libeXosip2.*
+ -$(MAKE) -C $(LIBEXOSIP2_DIR) clean
+ -rm -f $(STAGING_DIR)/usr/lib/libeXosip2.*
+ -rm -f $(TARGET_DIR)/usr/lib/libeXosip2.*
libeXosip2-dirclean:
diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk
index 75ca49a03a..14e98c1414 100644
--- a/package/libfloat/libfloat.mk
+++ b/package/libfloat/libfloat.mk
@@ -29,7 +29,7 @@ libfloat-source: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH)
$(LIBFLOAT_DIR)/.unpacked: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH)
$(LIBFLOAT_CAT) $(DL_DIR)/$(LIBFLOAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
# Remove the binary files distributed with the the package.
- $(MAKE) -C $(LIBFLOAT_DIR) clean
+ -$(MAKE) -C $(LIBFLOAT_DIR) clean
toolchain/patch-kernel.sh $(LIBFLOAT_DIR) $(DL_DIR) $(LIBFLOAT_PATCH)
toolchain/patch-kernel.sh $(LIBFLOAT_DIR) package/libfloat/ libfloat\*.patch
touch $@
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 07f6245431..148c687302 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -60,7 +60,7 @@ liblockfile-clean:
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(STAGING_DIR)/usr/share/man
endif
- $(MAKE) -C $(LIBLOCKFILE_DIR) clean
+ -$(MAKE) -C $(LIBLOCKFILE_DIR) clean
liblockfile-dirclean:
rm -rf $(LIBLOCKFILE_DIR)
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 053b243810..9ea27fd4da 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -64,12 +64,10 @@ libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a
libmad-source: $(DL_DIR)/$(LIBMAD_SOURCE)
libmad-clean:
- @if [ -d $(LIBMAD_DIR)/Makefile ]; then \
- $(MAKE) -C $(LIBMAD_DIR) clean; \
- fi
- rm -f $(STAGING_DIR)/usr/lib/libmad.*
+ -$(MAKE) -C $(LIBMAD_DIR) clean
+ -rm -f $(STAGING_DIR)/usr/lib/libmad.*
rm -f $(STAGING_DIR)/usr/include/mad.h
- rm -f $(TARGET_DIR)/usr/lib/libmad.*
+ -rm -f $(TARGET_DIR)/usr/lib/libmad.*
rm -f $(TARGET_DIR)/usr/include/mad.h
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index c575755be7..053ae78dd5 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -67,12 +67,11 @@ libosip2: uclibc $(TARGET_DIR)/usr/lib/libosip2.so $(TARGET_DIR)/usr/lib/libosip
libosip2-source: $(DL_DIR)/$(LIBOSIP2_SOURCE)
libosip2-clean:
- @if [ -d $(LIBOSIP2_DIR)/Makefile ]; then \
- $(MAKE) -C $(LIBOSIP2_DIR) clean; \
- fi
- rm -f $(STAGING_DIR)/usr/lib/libosip2.*
- rm -f $(TARGET_DIR)/usr/lib/libosip2.*
-
+ -$(MAKE) -C $(LIBOSIP2_DIR) clean
+ -rm -f $(STAGING_DIR)/usr/lib/libosip2.*
+ -rm -f $(STAGING_DIR)/usr/lib/libosipparser2.*
+ -rm -f $(TARGET_DIR)/usr/lib/libosip2.*
+ -rm -f $(TARGET_DIR)/usr/lib/libosipparser2.*
libosip2-dirclean:
rm -rf $(LIBOSIP2_DIR)
diff --git a/package/links/links.mk b/package/links/links.mk
index 1c92fbb25d..5743c1bfd3 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -48,7 +48,8 @@ $(TARGET_DIR)/usr/bin/links: $(LINKS_DIR)/links
install -c $(LINKS_DIR)/links $(TARGET_DIR)/usr/bin/links
links-clean:
- $(MAKE) -C $(LINKS_DIR) clean
+ -$(MAKE) -C $(LINKS_DIR) clean
+ rm -f $(TARGET_DIR)/usr/bin/links
links-dirclean:
rm -rf $(LINKS_DIR)
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index d15354fb63..3f1b97392e 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -29,8 +29,8 @@ $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked
lockfile-progs: uclibc liblockfile $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY)
lockfile-progs-clean:
- rm -f $(TARGET_DIR)/usr/bin/lockfile-*
- $(MAKE) -C $(LOCKFILE_PROGS_DIR) clean
+ -rm -f $(TARGET_DIR)/usr/bin/lockfile-*
+ -$(MAKE) -C $(LOCKFILE_PROGS_DIR) clean
lockfile-progs-dirclean:
rm -rf $(LOCKFILE_PROGS_DIR)
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 95ac67202a..1cc8ff7de7 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -53,7 +53,7 @@ $(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled
ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/.installed
ltp-testsuite-clean:
- $(MAKE) -C $(LTP_TESTSUITE_DIR) clean
+ -$(MAKE) -C $(LTP_TESTSUITE_DIR) clean
ltp-testsuite-dirclean:
rm -rf $(LTP_TESTSUITE_DIR)
diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk
index b8d84ed75d..e062d4db26 100644
--- a/package/ltt/ltt.mk
+++ b/package/ltt/ltt.mk
@@ -50,7 +50,7 @@ $(TOOL_BUILD_DIR)/bin/tracevisualizer: $(LTT_DIR1)/$(LTT_BINARY)
host-ltt-tracevisualizer: $(TOOL_BUILD_DIR)/bin/tracevisualizer
host-ltt-clean:
- $(MAKE) -C $(LTT_DIR1) clean
+ -$(MAKE) -C $(LTT_DIR1) clean
host-ltt-dirclean:
rm -rf $(LTT_DIR1)
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index ee8ffac129..45a446cfdd 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -12,7 +12,7 @@ LUA_SITE=http://www.lua.org/ftp
LUA_DIR=$(BUILD_DIR)/lua-$(LUA_VERSION)
-LUA_CFLAGS=-DLUA_USE_LINUX
+LUA_CFLAGS=-DLUA_USE_LINUX
LUA_MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
$(DL_DIR)/$(LUA_SOURCE):
@@ -53,7 +53,7 @@ $(TARGET_DIR)/usr/bin/luac: $(STAGING_DIR)/usr/bin/luac
cp -dpf $(STAGING_DIR)/usr/bin/luac $(TARGET_DIR)/usr/bin/luac
-lua-bins: $(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
+lua-bins: $(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
lua-libs: $(TARGET_DIR)/usr/lib/liblua.a
@@ -62,9 +62,11 @@ lua: uclibc readline ncurses lua-bins lua-libs
lua-source: $(DL_DIR)/$(LUA_SOURCE)
lua-clean:
- @if [ -d $(LUA_DIR)/Makefile ]; then \
- $(MAKE) -C $(LUA_DIR) clean; \
- fi
+ rm -f $(STAGING_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
+ rm -f $(STAGING_DIR)/usr/lib/liblua.a
+ rm -f $(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
+ rm -f $(TARGET_DIR)/usr/lib/liblua.a
+ -$(MAKE) -C $(LUA_DIR) clean
lua-dirclean:
rm -rf $(LUA_DIR)
diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk
index fbba23ef06..2d99916b38 100644
--- a/package/madplay/madplay.mk
+++ b/package/madplay/madplay.mk
@@ -56,7 +56,7 @@ madplay: uclibc $(MADPLAY_ALSA_DEP) libmad libid3tag $(TARGET_DIR)/$(MADPLAY_TAR
madplay-clean:
rm -f $(TARGET_DIR)/$(MADPLAY_TARGET_BIN)
- $(MAKE) -C $(MADPLAY_DIR) clean
+ -$(MAKE) -C $(MADPLAY_DIR) clean
madplay-dirclean:
rm -rf $(MADPLAY_DIR)
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 65432bf2fc..80ee2b8b49 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -42,9 +42,8 @@ nbd: uclibc $(TARGET_DIR)/sbin/nbd-client
nbd-source: $(DL_DIR)/$(NBD_SOURCE)
nbd-clean:
- @if [ -d $(NBD_DIR)/Makefile ]; then \
- $(MAKE) -C $(NBD_DIR) clean; \
- fi
+ rm -f $(TARGET_DIR)/sbin/nbd-client
+ -$(MAKE) -C $(NBD_DIR) clean
nbd-dirclean:
rm -rf $(NBD_DIR)
diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk
index 911c8cefc5..6a7a32b719 100644
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -67,7 +67,7 @@ $(TARGET_DIR)/usr/bin/ncftp $(TARGET_DIR)/usr/bin/ncftp%: $(addprefix $(NCFTP_DI
ncftp: uclibc $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
ncftp-clean:
- $(MAKE) -C $(NCFTP_DIR) clean
+ -$(MAKE) -C $(NCFTP_DIR) clean
rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
ncftp-dirclean:
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 1ef53eac6c..f51699cb7f 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -105,9 +105,9 @@ netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h
netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE)
netsnmp-clean:
- $(MAKE) PREFIX=$(TARGET_DIR) INSTALL_PREFIX=$(TARGET_DIR) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETSNMP_DIR) uninstall
- $(MAKE) -C $(NETSNMP_DIR) clean
- rm -rf $(TARGET_DIR)/etc/snmp/{snmpd{,trapd},mib2c*}.conf \
+ -$(MAKE) PREFIX=$(TARGET_DIR) INSTALL_PREFIX=$(TARGET_DIR) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETSNMP_DIR) uninstall
+ -$(MAKE) -C $(NETSNMP_DIR) clean
+ -rm -rf $(TARGET_DIR)/etc/snmp/{snmpd{,trapd},mib2c*}.conf \
$(TARGET_DIR)/etc/default/snmpd \
$(TARGET_DIR)/usr/include/net-snmp
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 6881bc4211..4b0e821900 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -73,8 +73,8 @@ openssh: openssl zlib $(TARGET_DIR)/usr/bin/ssh
openssh-source: $(DL_DIR)/$(OPENSSH_SOURCE)
openssh-clean:
- $(MAKE) -C $(OPENSSH_DIR) clean
- $(MAKE) CC=$(TARGET_CC) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) uninstall
+ -$(MAKE) -C $(OPENSSH_DIR) clean
+ -$(MAKE) CC=$(TARGET_CC) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) uninstall
openssh-dirclean:
rm -rf $(OPENSSH_DIR)
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 259b5f1599..d256e0215a 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -94,10 +94,10 @@ openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
openssl-source: $(DL_DIR)/$(OPENSSL_SOURCE)
openssl-clean:
- $(MAKE) -C $(OPENSSL_DIR) clean
+ -$(MAKE) -C $(OPENSSL_DIR) clean
rm -f $(STAGING_DIR)/usr/bin/openssl $(TARGET_DIR)/usr/bin/openssl
- rm -f $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/libcrypto.so*
- rm -f $(STAGING_DIR)/usr/lib/libssl.so* $(TARGET_DIR)/usr/lib/libssl.so*
+ -rm -f $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/libcrypto.so*
+ -rm -f $(STAGING_DIR)/usr/lib/libssl.so* $(TARGET_DIR)/usr/lib/libssl.so*
rm -rf $(STAGING_DIR)/usr/include/openssl $(TARGET_DIR)/usr/include/openssl
openssl-dirclean:
diff --git a/package/python/python.mk b/package/python/python.mk
index 050db443fb..82c938e9f5 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -89,7 +89,7 @@ $(PYTHON_DIR)/.hostpython: $(PYTHON_DIR)/.patched
$(MAKE) python Parser/pgen && \
mv python hostpython && \
mv Parser/pgen Parser/hostpgen && \
- $(MAKE) distclean \
+ -$(MAKE) distclean \
) && \
touch $@
@@ -167,7 +167,8 @@ python: uclibc $(PYTHON_DEPS) $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)
python-clean:
-$(MAKE) -C $(PYTHON_DIR) distclean
- rm $(PYTHON_DIR)/.configured $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)
+ rm -f $(PYTHON_DIR)/.configured $(TARGET_DIR)/$(PYTHON_TARGET_BINARY)
+ -rm -rf $(TARGET_DIR)/usr/lib/python* $(TARGET_DIR)/usr/include/python*
python-dirclean:
rm -rf $(PYTHON_DIR)
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index f3bbd2a340..d2d03f9c8c 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -35,18 +35,16 @@ $(RDESKTOP_DIR)/.configured: $(RDESKTOP_DIR)/.unpacked
$(RDESKTOP_DIR)/rdesktop: $(RDESKTOP_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(RDESKTOP_DIR)
-$(RDESKTOP_DIR)/.installed: $(RDESKTOP_DIR)/rdesktop
- cp $(RDESKTOP_DIR)/rdesktop $(TARGET_DIR)/usr/bin
- touch $(RDESKTOP_DIR)/.installed
+$(TARGET_DIR)/usr/bin/rdesktop: $(RDESKTOP_DIR)/rdesktop
+ cp $^ $@
-rdesktop: uclibc openssl $(XSERVER) $(RDESKTOP_DIR)/.installed
+rdesktop: uclibc openssl $(XSERVER) $(TARGET_DIR)/usr/bin/rdesktop
rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)
rdesktop-clean:
- @if [ -d $(RDESKTOP_DIR)/Makefile ]; then \
- $(MAKE) -C $(RDESKTOP_DIR) clean; \
- fi
+ -$(MAKE) -C $(RDESKTOP_DIR) clean
+ rm -f $(TARGET_DIR)/usr/bin/rdesktop
rdesktop-dirclean:
rm -rf $(RDESKTOP_DIR) $(RDESKTOP_DIR)
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 3478b515d6..10b3c9f074 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -54,19 +54,18 @@ $(SOCAT_WORKDIR)/socat: $(SOCAT_WORKDIR)/Makefile
rm -f $@
$(MAKE) -C $(SOCAT_WORKDIR)
-$(SOCAT_WORKDIR)/.installed: $(SOCAT_WORKDIR)/socat
+$(TARGET_DIR)/usr/bin/socat: $(SOCAT_WORKDIR)/socat
mkdir -p $(TARGET_DIR)/usr/man/man1
$(MAKE) -C $(SOCAT_WORKDIR) install prefix=$(TARGET_DIR)/usr DESTDIR=$(TARGET_DIR)
touch $@
-socat: uclibc $(SOCAT_WORKDIR)/.installed
+socat: uclibc $(TARGET_DIR)/usr/bin/socat
socat-source: $(DL_DIR)/$(SOCAT_SOURCE)
socat-clean:
- @if [ -d $(SOCAT_WORKDIR)/Makefile ]; then \
- $(MAKE) -C $(SOCAT_WORKDIR) clean; \
- fi
+ -$(MAKE) -C $(SOCAT_WORKDIR) clean
+ rm -f $(TARGET_DIR)/usr/bin/{socat,filan,procan}
socat-dirclean:
rm -rf $(SOCAT_DIR) $(SOCAT_WORKDIR)
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index e659ef6d08..a6b66f5f89 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -82,16 +82,19 @@ $(TARGET_DIR)/usr/bin/speexenc: $(TARGET_DIR)/usr/bin/speexdec
$(TARGET_DIR)/usr/lib/libspeex.so: $(TARGET_DIR)/usr/bin/speexenc
cp -dpf $(STAGING_DIR)/usr/lib/libspeex.so* $(TARGET_DIR)/usr/lib
-speex-bins:
+speex-bins:
speex: uclibc libogg $(TARGET_DIR)/usr/lib/libspeex.so
speex-source: $(DL_DIR)/$(SPEEX_SOURCE)
speex-clean:
- @if [ -d $(SPEEX_DIR)/Makefile ]; then \
- $(MAKE) -C $(SPEEX_DIR) clean; \
- fi
+ -$(MAKE) -C $(SPEEX_DIR) clean
+ -rm -f $(STAGING_DIR)/usr/lib/libspeex.so*
+ rm -f $(STAGING_DIR)/usr/bin/speexenc $(STAGING_DIR)/usr/bin/speexdec
+ -rm -f $(TARGET_DIR)/usr/lib/libspeex.so*
+ rm -f $(TARGET_DIR)/usr/bin/speexenc $(TARGET_DIR)/usr/bin/speexdec
+
speex-dirclean:
rm -rf $(SPEEX_DIR)
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index dd36ecfff9..f6aa68f64a 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -68,9 +68,11 @@ sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
sqlite-clean:
- @if [ -d $(SQLITE_DIR)/Makefile ]; then \
- $(MAKE) -C $(SQLITE_DIR) clean; \
- fi
+ -$(MAKE) -C $(SQLITE_DIR) clean
+ -rm -rf $(STAGING_DIR)/usr/lib/libsqlite*
+ -rm -rf $(STAGING_DIR)/usr/bin/sqlite3
+ -rm -rf $(TARGET_DIR)/usr/lib/libsqlite*
+ -rm -rf $(TARGET_DIR)/usr/bin/sqlite3
sqlite-dirclean:
rm -rf $(SQLITE_DIR)
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 010ab2ad5f..e6c841cb98 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -69,7 +69,7 @@ strace: uclibc $(TARGET_DIR)/usr/bin/strace
strace-clean:
rm -f $(TARGET_DIR)/usr/bin/strace
- $(MAKE) -C $(STRACE_DIR) clean
+ -$(MAKE) -C $(STRACE_DIR) clean
strace-dirclean:
rm -rf $(STRACE_DIR)
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 56a77cdd7d..563e527b1f 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -65,7 +65,8 @@ endif
stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel
stunnel-clean:
- $(MAKE) -C $(STUNNEL_DIR) clean
+ -$(MAKE) -C $(STUNNEL_DIR) clean
+ rm -f $(TARGET_DIR)/usr/bin/stunnel
stunnel-dirclean:
rm -rf $(STUNNEL_DIR)
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 812feb220e..30e1ca4a09 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -38,7 +38,7 @@ $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY): $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY)
tinyhttpd: uclibc $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
tinyhttpd-clean:
- $(MAKE) -C $(TINYHTTPD_DIR) clean
+ -$(MAKE) -C $(TINYHTTPD_DIR) clean
@rm -f $(TARGET_DIR)/$(TINYHTTPD_TARGET_BINARY)
@rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
@rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/var/www
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 20beb8d9ad..efaa921a07 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -47,7 +47,8 @@ tn5250: uclibc slang $(TARGET_DIR)/usr/bin/tn5250
tn5250-source: $(DL_DIR)/$(TN5250_SOURCE)
tn5250-clean:
- $(MAKE) -C $(TN5250_DIR) clean
+ -$(MAKE) -C $(TN5250_DIR) clean
+ rm -f $(TARGET_DIR)/usr/bin/tn5250
tn5250-dirclean:
rm -rf $(TN5250_DIR)
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 9385aab9e3..8ba144830e 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -75,7 +75,9 @@ valgrind: $(TARGET_DIR)/usr/bin/valgrind
valgrind-source: $(DL_DIR)/$(VALGRIND_SOURCE)
valgrind-clean:
- $(MAKE) -C $(VALGRIND_DIR) clean
+ -$(MAKE) -C $(VALGRIND_DIR) clean
+ -rm -f $(TARGET_DIR)/usr/bin/valgrind*
+ rm -rf $(TARGET_DIR)/usr/lib/valgrind
valgrind-dirclean:
rm -rf $(VALGRIND_DIR)