login: style fixes

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index a705bac32b9e4dd6b8a352141797218acd476482..cc223478ba582b16f843aafd5641760cd46e25d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,7 @@ allnoconfig: scripts/config/conf
 
 defconfig: scripts/config/conf
        @./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-       @$(SED) -i -r -e "s/^(CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
+       @$(SED) -i -r -e "s/^(CONFIG_(DEBUG.*|STATIC|SELINUX|NITPICK|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
        @./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
 
 
@@ -278,6 +278,7 @@ endif # CONFIG_FEATURE_FULL_LIBBUSYBOX
 APPLET_SRC:=$(APPLET_SRC-y)
 APPLETS_DEFINE:=$(APPLETS_DEFINE-y)
 else  # CONFIG_BUILD_AT_ONCE
+APPLET_SRC:=
 # no --combine, build archives out of the individual .o
 # This was the old way the binary was built.
 libbusybox-obj:=archival/libunarchive/libunarchive.a \
@@ -448,9 +449,6 @@ include/usage_compressed.h: .config $(USAGE_BIN) \
        "$(top_builddir)/scripts" > $@
 endif # CONFIG_FEATURE_COMPRESS_USAGE
 
-# workaround alleged bug in make-3.80, make-3.81
-.NOTPARALLEL: .depend
-
 depend dep: .depend
 .depend: scripts/bb_mkdep $(USAGE_BIN) $(DEP_INCLUDES)
        $(disp_gen)
@@ -484,8 +482,7 @@ distclean: clean
        rm -r -f include/config include/config.h $(DEP_INCLUDES)
        find . -name .depend'*' -print0 | xargs -0 rm -f
        find . -name '*.rej' -print0 | xargs -0 rm -f
-       rm -f .hdepend
-       rm -f .config .config.old .config.cmd
+       rm -f .hdepend busybox_old .config .config.old .config.cmd
 
 release: distclean #doc
        cd ..; \