Patch from Rogelio Serrano to defer checking whether the tty exists until
[oweals/busybox.git] / Makefile
index b99bb4f18926d52fa6217c753c4ebaa722d0d4ca..da02411bc3154b8c3a5f5d39f32b6c08dcdf9882 100644 (file)
--- a/Makefile
+++ b/Makefile
 # Makefile for busybox
 #
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Licensed under GPLv2, see the file LICENSE in this tarball for details.
 #
 
 #--------------------------------------------------------------
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
 noconfig_targets := menuconfig config oldconfig randconfig \
-       defconfig allyesconfig allnoconfig clean distclean \
+       defconfig allyesconfig allnoconfig allbareconfig \
+       clean distclean help \
        release tags
-TOPDIR=./
-include Rules.mak
-
-DIRS:=applets archival archival/libunarchive coreutils console-tools \
-       debianutils editors findutils init miscutils modutils networking \
-       networking/libiproute networking/udhcp procps loginutils shell \
-       sysklogd util-linux libpwdgrp coreutils/libcoreutils libbb
 
-ifeq ($(strip $(CONFIG_SELINUX)),y)
-CFLAGS += -I/usr/include/selinux
-LIBRARIES += -lsecure
+# the toplevel sourcedir
+ifndef top_srcdir
+top_srcdir=$(CURDIR)
+endif
+# toplevel directory of the object-tree
+ifndef top_builddir
+top_builddir=$(CURDIR)
 endif
 
-ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
-
-all: busybox busybox.links doc
-
-# In this section, we need .config
--include .config.cmd
-include $(patsubst %,%/Makefile.in, $(DIRS))
-
-busybox: .depend include/config.h $(libraries-y)
-       $(CC) $(LDFLAGS) -o $@ $(libraries-y) $(LIBRARIES)
-       $(STRIPCMD) $@
+export srctree=$(top_srcdir)
+vpath %/Config.in $(srctree)
 
-busybox.links: applets/busybox.mkll include/config.h
-       - $(SHELL) $^ >$@
+DIRS:=applets archival archival/libunarchive coreutils console-tools \
+       debianutils editors findutils init miscutils modutils networking \
+       networking/libiproute networking/udhcp procps loginutils shell \
+       sysklogd util-linux e2fsprogs libpwdgrp coreutils/libcoreutils libbb
 
-install: applets/install.sh busybox busybox.links
-       $(SHELL) $< $(PREFIX)
+SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS))
 
-uninstall: busybox.links
-       rm -f $(PREFIX)/bin/busybox
-       for i in `cat busybox.links` ; do rm -f $(PREFIX)$$i; done
-
-install-hardlinks: applets/install.sh busybox busybox.links
-       $(SHELL) $< $(PREFIX) --hardlinks
+# That's our default target when none is given on the command line
+.PHONY: _all
+_all:
 
+CONFIG_CONFIG_IN = $(top_srcdir)/Config.in
 
-# Documentation Targets
-doc: olddoc
+ifeq ($(KBUILD_SRC),)
 
-# Old Docs...
-olddoc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+ifdef O
+  ifeq ("$(origin O)", "command line")
+    KBUILD_OUTPUT := $(O)
+    top_builddir := $(O)
+  endif
+else
+# If no alternate output-dir was specified, we build in cwd
+# We are using KBUILD_OUTPUT nevertheless to make sure that we create
+# Rules.mak and the toplevel Makefile, in case they don't exist.
+  KBUILD_OUTPUT := $(top_builddir)
+endif
 
-docs/busybox.pod : docs/busybox_header.pod include/usage.h docs/busybox_footer.pod
-       - ( cat docs/busybox_header.pod; \
-           docs/autodocifier.pl include/usage.h; \
-           cat docs/busybox_footer.pod ) > docs/busybox.pod
+ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
+# pull in OS specific commands like cp, mkdir, etc. early
+-include $(top_srcdir)/Rules.mak
+endif
 
-docs/BusyBox.txt: docs/busybox.pod
+# All object directories.
+OBJ_DIRS := $(DIRS)
+all_tree := $(patsubst %,$(top_builddir)/%,$(OBJ_DIRS) scripts scripts/config include)
+all_tree: $(all_tree)
+$(all_tree):
+       @mkdir -p "$@"
+
+ifneq ($(KBUILD_OUTPUT),)
+# Invoke a second make in the output directory, passing relevant variables
+# Check that the output directory actually exists
+saved-output := $(KBUILD_OUTPUT)
+KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
+$(if $(wildcard $(KBUILD_OUTPUT)),, \
+     $(error output directory "$(saved-output)" does not exist))
+
+.PHONY: $(MAKECMDGOALS)
+
+$(filter-out _all,$(MAKECMDGOALS)) _all: $(KBUILD_OUTPUT)/Rules.mak $(KBUILD_OUTPUT)/Makefile all_tree
+       $(Q)$(MAKE) -C $(KBUILD_OUTPUT) \
+       top_srcdir=$(top_srcdir) \
+       top_builddir=$(top_builddir) \
+       KBUILD_SRC=$(top_srcdir) \
+       -f $(CURDIR)/Makefile $@
+
+$(KBUILD_OUTPUT)/Rules.mak:
+       @echo > $@
+       @echo top_srcdir=$(top_srcdir) >> $@
+       @echo top_builddir=$(KBUILD_OUTPUT) >> $@
+       @echo include $(top_srcdir)/Rules.mak >> $@
+
+$(KBUILD_OUTPUT)/Makefile:
+       @echo > $@
+       @echo top_srcdir=$(top_srcdir) >> $@
+       @echo top_builddir=$(KBUILD_OUTPUT) >> $@
+       @echo KBUILD_SRC='$$(top_srcdir)' >> $@
+       @echo include '$$(KBUILD_SRC)'/Makefile >> $@
+
+# Leave processing to above invocation of make
+skip-makefile := 1
+endif # ifneq ($(KBUILD_OUTPUT),)
+endif # ifeq ($(KBUILD_SRC),)
+
+ifeq ($(skip-makefile),)
+
+# We only need a copy of the Makefile for the config targets and reuse
+# the rest from the source directory, i.e. we do not cp ALL_MAKEFILES.
+scripts/config/Makefile: $(top_srcdir)/scripts/config/Makefile
+       cp $< $@
+
+_all: all
+
+help:
+       @echo 'Cleaning:'
+       @echo '  clean                  - delete temporary files created by build'
+       @echo '  distclean              - delete all non-source files (including .config)'
        @echo
-       @echo BusyBox Documentation
+       @echo 'Build:'
+       @echo '  all                    - Executable and documentation'
+       @echo '  busybox                - the swiss-army executable'
+       @echo '  doc                    - docs/BusyBox.{txt,html,1}'
        @echo
-       -mkdir -p docs
-       -pod2text $< > $@
-
-docs/BusyBox.1: docs/busybox.pod
-       - mkdir -p docs
-       - pod2man --center=BusyBox --release="version $(VERSION)" \
-               $< > $@
-
-docs/BusyBox.html: docs/busybox.net/BusyBox.html
-       - mkdir -p docs
-       -@ rm -f docs/BusyBox.html
-       -@ ln -s busybox.net/BusyBox.html docs/BusyBox.html
-
-docs/busybox.net/BusyBox.html: docs/busybox.pod
-       -@ mkdir -p docs/busybox.net
-       -  pod2html --noindex $< > \
-           docs/busybox.net/BusyBox.html
-       -@ rm -f pod2htm*
-
-
-# New docs based on DOCBOOK SGML
-newdoc: docs/busybox.txt docs/busybox.pdf docs/busybox/busyboxdocumentation.html
-
-docs/busybox.txt: docs/busybox.sgml
+       @echo 'Configuration:'
+       @echo '  allnoconfig            - disable all symbols in .config'
+       @echo '  allyesconfig           - enable all symbols in .config (see defconfig)'
+       @echo '  allbareconfig          - enable all applets without any sub-features'
+       @echo '  config         - text based configurator (of last resort)'
+       @echo '  defconfig              - set .config to largest generic configuration'
+       @echo '  menuconfig             - interactive curses-based configurator'
+       @echo '  oldconfig              - resolve any unresolved symbols in .config'
        @echo
-       @echo BusyBox Documentation
+       @echo 'Installation:'
+       @echo '  install                - install busybox into $(PREFIX)'
+       @echo '  uninstall'
+       @echo
+       @echo 'Development:'
+       @echo '  check                  - run the test suite for all applets'
+       @echo '  randconfig             - generate a random configuration'
+       @echo '  release                - create a distribution tarball'
+       @echo '  sizes                  - show size of all enabled busybox symbols'
        @echo
-       - mkdir -p docs
-       (cd docs; sgmltools -b txt busybox.sgml)
-
-docs/busybox.dvi: docs/busybox.sgml
-       - mkdir -p docs
-       (cd docs; sgmltools -b dvi busybox.sgml)
-
-docs/busybox.ps: docs/busybox.sgml
-       - mkdir -p docs
-       (cd docs; sgmltools -b ps busybox.sgml)
-
-docs/busybox.pdf: docs/busybox.ps
-       - mkdir -p docs
-       (cd docs; ps2pdf busybox.ps)
-
-docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
-       - mkdir -p docs
-       (cd docs/busybox.net; sgmltools -b html ../busybox.sgml)
-
-# The nifty new buildsystem stuff
-scripts/mkdep: scripts/mkdep.c
-       $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
-
-scripts/split-include: scripts/split-include.c
-       $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
-
-.depend: scripts/mkdep
-       rm -f .depend .hdepend;
-       mkdir -p include/config;
-       $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
-       scripts/mkdep -I include -- \
-               `find . -name \*.c -print` >> .depend;
-       scripts/mkdep -I include -- \
-               `find . -name \*.h -print` >> .hdepend;
-       $(MAKE) $(patsubst %,_sfdep_%,$(DIRS)) _FASTDEP_ALL_SUB_DIRS="$(DIRS)" ;
-
-depend dep: include/config.h .depend
-
-include/config/MARKER: depend scripts/split-include
-       scripts/split-include include/config.h include/config
-       @ touch include/config/MARKER
-
-include/config.h: .config
-       @if [ ! -x ./scripts/config/conf ] ; then \
-           $(MAKE) -C scripts/config conf; \
-       fi;
-       @./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in
 
-%.o: %.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
-finished2:
-       @echo
-       @echo Finished installing...
-       @echo
+include $(top_srcdir)/Rules.mak
 
-else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
+ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
 
+# Default target if none was requested explicitly
 all: menuconfig
 
+# warn if no configuration exists and we are asked to build a non-config target
+.config:
+       @echo ""
+       @echo "No $(top_builddir)/$@ found!"
+       @echo "Please refer to 'make  help', section Configuration."
+       @echo ""
+       @exit 1
+
 # configuration
 # ---------------------------------------------------------------------------
 
-scripts/config/conf:
-       $(MAKE) -C scripts/config conf
+scripts/config/conf: scripts/config/Makefile
+       $(Q)$(MAKE) -C scripts/config conf
        -@if [ ! -f .config ] ; then \
-               cp sysdeps/$(TARGET_OS)/defconfig .config; \
+               touch .config; \
        fi
-scripts/config/mconf:
-       $(MAKE) -C scripts/config ncurses conf mconf
+
+scripts/config/mconf: scripts/config/Makefile
+       $(Q)$(MAKE) -C scripts/config ncurses conf mconf
        -@if [ ! -f .config ] ; then \
-               cp sysdeps/$(TARGET_OS)/defconfig .config; \
+               touch .config; \
        fi
 
 menuconfig: scripts/config/mconf
-       @./scripts/config/mconf sysdeps/$(TARGET_OS)/Config.in
+       @[ -f .config ] || make $(MAKEFLAGS) defconfig
+       @./scripts/config/mconf $(CONFIG_CONFIG_IN)
 
 config: scripts/config/conf
-       @./scripts/config/conf sysdeps/$(TARGET_OS)/Config.in
+       @./scripts/config/conf $(CONFIG_CONFIG_IN)
 
 oldconfig: scripts/config/conf
-       @./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in
+       @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 randconfig: scripts/config/conf
-       @./scripts/config/conf -r sysdeps/$(TARGET_OS)/Config.in
+       @./scripts/config/conf -r $(CONFIG_CONFIG_IN)
 
 allyesconfig: scripts/config/conf
-       @./scripts/config/conf -y sysdeps/$(TARGET_OS)/Config.in
+       @./scripts/config/conf -y $(CONFIG_CONFIG_IN)
+       @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER)=.*/# \1 is not set/" .config
+       @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 allnoconfig: scripts/config/conf
-       @./scripts/config/conf -n sysdeps/$(TARGET_OS)/Config.in
+       @./scripts/config/conf -n $(CONFIG_CONFIG_IN)
+
+# defconfig is allyesconfig minus any features that are specialized enough
+# or cause enough behavior change that the user really should switch them on
+# manually if that's what they want.  Sort of "maximum sane config".
 
 defconfig: scripts/config/conf
-       @./scripts/config/conf -d sysdeps/$(TARGET_OS)/Config.in
+       @./scripts/config/conf -y $(CONFIG_CONFIG_IN)
+       @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|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
+       @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
-test tests: busybox
-       # Note that 'tests' is depricated.  Use 'make check' instead
-       # To use the nice new testsuite....
-       cd tests && ./tester.sh
 
-check: busybox
-       cd testsuite && ./runtest
+allbareconfig: scripts/config/conf
+       @./scripts/config/conf -y $(CONFIG_CONFIG_IN)
+       @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG|STATIC|SELINUX|DEVFSD|NC_GAPING_SECURITY_HOLE|BUILD_AT_ONCE)).*/# \1 is not set/" .config
+       @$(SED) -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config
+       @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config
+       @yes n | ./scripts/config/conf -o $(CONFIG_CONFIG_IN)
+
+else # ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
+
+all: busybox busybox.links doc
+
+# In this section, we need .config
+-include $(top_builddir)/.config.cmd
+include $(patsubst %,%/Makefile.in, $(SRC_DIRS))
+
+endif # ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
+
+-include $(top_builddir)/.config
+-include $(top_builddir)/.depend
+
+
+ifeq ($(strip $(CONFIG_BUILD_AT_ONCE)),y)
+libraries-y:=
+# Which parts of the internal libs are requested?
+# Per default we only want what was actually selected.
+# -a denotes all while -y denotes the selected ones.
+ifeq ($(strip $(CONFIG_FEATURE_FULL_LIBBUSYBOX)),y)
+LIBRARY_DEFINE:=$(LIBRARY_DEFINE-a)
+LIBRARY_SRC   :=$(LIBRARY_SRC-a)
+else # CONFIG_FEATURE_FULL_LIBBUSYBOX
+LIBRARY_DEFINE:=$(LIBRARY_DEFINE-y)
+LIBRARY_SRC   :=$(LIBRARY_SRC-y)
+endif # CONFIG_FEATURE_FULL_LIBBUSYBOX
+APPLET_SRC:=$(APPLET_SRC-y)
+APPLETS_DEFINE:=$(APPLETS_DEFINE-y)
+else  # CONFIG_BUILD_AT_ONCE
+# no --combine, build archives out of the individual .o
+# This was the old way the binary was built.
+libbusybox-obj:=archival/libunarchive/libunarchive.a \
+       networking/libiproute/libiproute.a \
+       libpwdgrp/libpwdgrp.a \
+       coreutils/libcoreutils/libcoreutils.a \
+       libbb/libbb.a
+libbusybox-obj:=$(patsubst %,$(top_builddir)/%,$(libbusybox-obj))
+
+ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y)
+# linking against libbusybox, so don't build the .a already contained in the .so
+libraries-y:=$(filter-out $(libbusybox-obj),$(libraries-y))
+endif # CONFIG_FEATURE_SHARED_BUSYBOX
+endif # CONFIG_BUILD_AT_ONCE
+
+
+ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y)
+LD_LIBBUSYBOX:=libbusybox.so
+LIBBUSYBOX_SONAME:=$(LD_LIBBUSYBOX).$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)
+DO_INSTALL_LIBS:=$(LD_LIBBUSYBOX) \
+       $(LD_LIBBUSYBOX).$(MAJOR_VERSION) \
+       $(LD_LIBBUSYBOX).$(MAJOR_VERSION).$(MINOR_VERSION)
+
+ifeq ($(strip $(CONFIG_BUILD_AT_ONCE)),y)
+ifneq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y)
+# --combine but not linking against libbusybox, so compile all
+BUSYBOX_SRC   := $(LIBRARY_SRC)
+BUSYBOX_DEFINE:= $(LIBRARY_DEFINE)
+endif # !CONFIG_FEATURE_SHARED_BUSYBOX
+$(LIBBUSYBOX_SONAME): $(LIBRARY_SRC)
+else # CONFIG_BUILD_AT_ONCE
+$(LIBBUSYBOX_SONAME): $(libbusybox-obj)
+endif # CONFIG_BUILD_AT_ONCE
+endif # CONFIG_BUILD_LIBBUSYBOX
+
+ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y)
+LDBUSYBOX:=-L$(top_builddir) -lbusybox
+endif
+
+ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y)
+$(LIBBUSYBOX_SONAME):
+ifndef MAJOR_VERSION
+       $(error MAJOR_VERSION needed for $@ is not defined)
+endif
+       $(do_link) $(LIB_CFLAGS) $(CFLAGS_COMBINE) \
+       -Wl,-soname=$(LD_LIBBUSYBOX).$(MAJOR_VERSION) \
+       -Wl,-z,combreloc $(LIB_LDFLAGS) \
+       -o $(@) \
+       -Wl,--start-group -Wl,--whole-archive \
+       $(LIBRARY_DEFINE) $(^) \
+       -Wl,--no-whole-archive -Wl,--end-group
+       @rm -f $(DO_INSTALL_LIBS)
+       @for i in $(DO_INSTALL_LIBS); do ln -s $(@) $$i ; done
+       $(do_strip)
+
+endif # ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y)
+
+busybox_unstripped: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(libraries-y)
+       $(do_link) $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) \
+       -o $@ -Wl,--start-group  \
+       $(APPLETS_DEFINE) $(APPLET_SRC) \
+       $(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
+       $(LDBUSYBOX) $(LIBRARIES) \
+       -Wl,--end-group
+
+busybox: busybox_unstripped
+       $(Q)cp busybox_unstripped busybox
+       $(do_strip)
+
+busybox.links: $(top_srcdir)/applets/busybox.mkll include/bb_config.h $(top_srcdir)/include/applets.h
+       $(Q)-$(SHELL) $^ >$@
+
+install: $(top_srcdir)/applets/install.sh busybox busybox.links
+       $(Q)DO_INSTALL_LIBS="$(strip $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS))" \
+               $(SHELL) $< $(PREFIX) $(INSTALL_OPTS)
+ifeq ($(strip $(CONFIG_FEATURE_SUID)),y)
+       @echo
+       @echo
+       @echo --------------------------------------------------
+       @echo You will probably need to make your busybox binary
+       @echo setuid root to ensure all configured applets will
+       @echo work properly.
+       @echo --------------------------------------------------
+       @echo
+endif
+
+uninstall: busybox.links
+       rm -f $(PREFIX)/bin/busybox
+       for i in `cat busybox.links` ; do rm -f $(PREFIX)$$i; done
+ifneq ($(strip $(DO_INSTALL_LIBS)),n)
+       for i in $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS); do \
+               rm -f $(PREFIX)$$i; \
+       done
+endif
+
+# see if we are in verbose mode
+KBUILD_VERBOSE :=
+ifdef V
+  ifeq ("$(origin V)", "command line")
+    KBUILD_VERBOSE := $(V)
+  endif
+endif
+ifneq ($(strip $(KBUILD_VERBOSE)),)
+  CHECK_VERBOSE := -v
+# ARFLAGS+=v
+endif
+check test: busybox
+       bindir=$(top_builddir) srcdir=$(top_srcdir)/testsuite \
+       $(top_srcdir)/testsuite/runtest $(CHECK_VERBOSE)
+
+sizes: busybox_unstripped
+       $(NM) --size-sort $(<)
+
+# Documentation Targets
+doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+
+docs/busybox.pod : $(top_srcdir)/docs/busybox_header.pod $(top_srcdir)/include/usage.h $(top_srcdir)/docs/busybox_footer.pod $(top_srcdir)/docs/autodocifier.pl
+       $(disp_doc)
+       $(Q)-mkdir -p docs
+       $(Q)-( cat $(top_srcdir)/docs/busybox_header.pod ; \
+           $(top_srcdir)/docs/autodocifier.pl $(top_srcdir)/include/usage.h ; \
+           cat $(top_srcdir)/docs/busybox_footer.pod ; ) > docs/busybox.pod
+
+docs/BusyBox.txt: docs/busybox.pod
+       $(disp_doc)
+       $(Q)-mkdir -p docs
+       $(Q)-pod2text $< > $@
+
+docs/BusyBox.1: docs/busybox.pod
+       $(disp_doc)
+       $(Q)-mkdir -p docs
+       $(Q)-pod2man --center=BusyBox --release="version $(VERSION)" \
+               $< > $@
+
+docs/BusyBox.html: docs/busybox.net/BusyBox.html
+       $(disp_doc)
+       $(Q)-mkdir -p docs
+       $(Q)-rm -f docs/BusyBox.html
+       $(Q)-cp docs/busybox.net/BusyBox.html docs/BusyBox.html
+
+docs/busybox.net/BusyBox.html: docs/busybox.pod
+       $(Q)-mkdir -p docs/busybox.net
+       $(Q)-pod2html --noindex $< > \
+           docs/busybox.net/BusyBox.html
+       $(Q)-rm -f pod2htm*
+
+# The nifty new dependency stuff
+scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
+       $(Q)$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
+
+DEP_INCLUDES := include/bb_config.h
+
+ifeq ($(strip $(CONFIG_BBCONFIG)),y)
+DEP_INCLUDES += include/bbconfigopts.h
+
+include/bbconfigopts.h: .config
+       $(disp_gen)
+       $(Q)$(top_srcdir)/scripts/config/mkconfigs > $@
+endif
+
+depend dep: .depend
+.depend: scripts/bb_mkdep $(DEP_INCLUDES)
+       $(disp_gen)
+       $(Q)rm -f .depend
+       $(Q)mkdir -p include/config
+       $(Q)scripts/bb_mkdep -I $(top_srcdir)/include $(top_srcdir) > $@.tmp
+       $(Q)mv $@.tmp $@
+
+include/bb_config.h: .config
+       @if [ ! -x $(top_builddir)/scripts/config/conf ] ; then \
+           $(MAKE) -C scripts/config conf; \
+       fi;
+       @$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 clean:
-       - $(MAKE) -C tests clean
-       - rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
-           docs/busybox.pdf docs/busybox.pod docs/busybox.net/busybox.html \
+       - $(MAKE) -C scripts/config $@
+       - rm -f docs/busybox.dvi docs/busybox.ps \
+           docs/busybox.pod docs/busybox.net/busybox.html \
            docs/busybox pod2htm* *.gdb *.elf *~ core .*config.log \
            docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
-           docs/busybox.net/BusyBox.html busybox.links libbb/loop.h \
-           .config.old .hdepend busybox
-       - rm -rf _install
-       - find . -name .\*.flags -exec rm -f {} \;   
-       - find . -name \*.o -exec rm -f {} \;
-       - find . -name \*.a -exec rm -f {} \;
+           docs/busybox.net/BusyBox.html busybox.links \
+           libbusybox.so* \
+           .config.old busybox busybox_unstripped
+       - rm -r -f _install testsuite/links
+       - find . -name .\*.flags -o -name \*.o  -o -name \*.om \
+           -o -name \*.os -o -name \*.osm -o -name \*.a | xargs rm -f
 
 distclean: clean
-       - rm -f scripts/split-include scripts/mkdep
-       - rm -rf include/config include/config.h
-       - find . -name .depend -exec rm -f {} \;
+       - rm -f scripts/bb_mkdep
+       - rm -r -f include/config $(DEP_INCLUDES)
+       - find . -name .depend'*' | xargs rm -f
        rm -f .config .config.old .config.cmd
-       - $(MAKE) -C scripts/config clean
 
 release: distclean #doc
-       cd ..;                                  \
-       rm -rf busybox-$(VERSION);              \
-       cp -a busybox busybox-$(VERSION);       \
-                                               \
-       find busybox-$(VERSION)/ -type d        \
-                                -name CVS      \
-                                -print         \
-               -exec rm -rf {} \; ;            \
-                                               \
-       find busybox-$(VERSION)/ -type f        \
-                                -name .\#*     \
-                                -print         \
-               -exec rm -f {} \;  ;            \
-                                               \
-       tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;
+       cd ..; \
+       rm -r -f $(PROG)-$(VERSION); \
+       cp -a busybox $(PROG)-$(VERSION); \
+       \
+       find $(PROG)-$(VERSION)/ -type d \
+               -name .svn \
+               -print \
+               -exec rm -r -f {} \; ; \
+       \
+       find $(PROG)-$(VERSION)/ -type f \
+               -name .\#* \
+               -print \
+               -exec rm -f {} \; ; \
+       \
+       tar -cvzf $(PROG)-$(VERSION).tar.gz $(PROG)-$(VERSION)/;
 
 tags:
        ctags -R .
 
 
-endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
+endif # ifeq ($(skip-makefile),)
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \
-       menuconfig tags check test tests depend
-
-
+       menuconfig tags check test depend dep buildtree