Scrub things a bit, shave off a few bytes.
[oweals/busybox.git] / Makefile
index 693d47b7c3293c2e06fbee23742869d758136583..48911f77e66dfc3689df4f89db839d3c702801ec 100644 (file)
--- a/Makefile
+++ b/Makefile
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-TOPDIR:= $(shell /bin/pwd)/
-include $(TOPDIR).config
-include $(TOPDIR)Rules.mak
-SUBDIRS:=applets archival archival/libunarchive console-tools \
-       editors fileutils findutils init miscutils modutils networking \
-       networking/udhcp procps loginutils shell shellutils sysklogd \
-       textutils util-linux libbb libpwdgrp
+#--------------------------------------------------------------
+# You shouldn't need to mess with anything beyond this point...
+#--------------------------------------------------------------
+noconfig_targets := menuconfig config oldconfig randconfig \
+       defconfig allyesconfig allnoconfig clean distclean \
+       release tags
+TOPDIR=./
+include Rules.mak
 
-all:    do-it-all
+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 libbb libpwdgrp
 
-#
-# Make "config" the default target if there is no configuration file or
-# "depend" the target if there is no top-level dependency information.
-ifeq (.config,$(wildcard .config))
-include .config
-ifeq (.depend,$(wildcard .depend))
-include .depend 
-do-it-all:      busybox busybox.links #doc
-include $(patsubst %,%/Makefile.in, $(SUBDIRS))
-else
-CONFIGURATION = depend
-do-it-all:      depend
-endif
-else
-CONFIGURATION = menuconfig
-do-it-all:      menuconfig
-endif
-
-
-busybox: depend $(libraries-y)
+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 $(libraries-y)
        $(CC) $(LDFLAGS) -o $@ $(libraries-y) $(LIBRARIES)
        $(STRIPCMD) $@
 
@@ -124,113 +117,111 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
        - mkdir -p docs
        (cd docs/busybox.net; sgmltools -b html ../busybox.sgml)
 
-
-
 # The nifty new buildsystem stuff
-$(TOPDIR)scripts/mkdep: scripts/mkdep.c
+scripts/mkdep: scripts/mkdep.c
        $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
 
-$(TOPDIR)scripts/split-include: scripts/split-include.c
+scripts/split-include: scripts/split-include.c
        $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
 
-$(TOPDIR).depend: $(TOPDIR)scripts/mkdep
+.depend: scripts/mkdep
        rm -f .depend .hdepend;
-       mkdir -p $(TOPDIR)include/config;
+       mkdir -p include/config;
        $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
-       scripts/mkdep -I $(TOPDIR)include -- \
-               `find $(TOPDIR) -name \*.c -print` >> .depend;
-       scripts/mkdep -I $(TOPDIR)include -- \
-               `find $(TOPDIR) -name \*.h -print` >> .hdepend;
-       $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" ;
-       @ echo -e "\n\nNow run 'make' to build BusyBox\n\n"
+       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: $(TOPDIR)include/config.h $(TOPDIR).depend
+depend dep: include/config.h .depend
 
-BB_SHELL := ${shell if [ -x "$$BASH" ]; then echo $$BASH; \
-       else if [ -x /bin/bash ]; then echo /bin/bash; \
-       else echo sh; fi ; fi}
-
-include/config/MARKER: depend $(TOPDIR)scripts/split-include
+include/config/MARKER: depend scripts/split-include
        scripts/split-include include/config.h include/config
        @ touch include/config/MARKER
 
-$(TOPDIR)include/config.h:
-       @if [ ! -f $(TOPDIR)include/config.h ] ; then \
-               make oldconfig; \
+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
 
-$(TOPDIR).config:
-       @if [ ! -f $(TOPDIR).config ] ; then \
-           cp $(TOPDIR)sysdeps/$(TARGET_OS)/defconfig $(TOPDIR).config; \
-       fi;
+%.o: %.c
+       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
-menuconfig: $(TOPDIR).config
-       mkdir -p $(TOPDIR)include/config
-       $(MAKE) -C scripts/lxdialog all
-       $(BB_SHELL) scripts/Menuconfig sysdeps/$(TARGET_OS)/config.in
+finished2:
+       @echo
+       @echo Finished installing...
+       @echo
 
-config: $(TOPDIR).config
-       mkdir -p $(TOPDIR)include/config
-       $(BB_SHELL) scripts/Configure sysdeps/$(TARGET_OS)/config.in
+else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
-oldconfig: $(TOPDIR).config
-       mkdir -p $(TOPDIR)include/config
-       $(BB_SHELL) scripts/Configure -d sysdeps/$(TARGET_OS)/config.in
+all: menuconfig
 
+# configuration
+# ---------------------------------------------------------------------------
 
-ifdef CONFIGURATION
-..$(CONFIGURATION):
-       @echo
-       @echo "You have a bad or nonexistent" .$(CONFIGURATION) ": running 'make" $(CONFIGURATION)"'"
-       @echo
-       $(MAKE) $(CONFIGURATION)
-       @echo
-       @echo "Successful. Try re-making (ignore the error that follows)"
-       @echo
-       exit 1
+scripts/config/conf:
+       make -C scripts/config conf
+       -@if [ ! -f .config ] ; then \
+               cp sysdeps/$(TARGET_OS)/defconfig .config; \
+       fi
+scripts/config/mconf:
+       make -C scripts/config ncurses conf mconf
+       -@if [ ! -f .config ] ; then \
+               cp sysdeps/$(TARGET_OS)/defconfig .config; \
+       fi
 
-dummy:
+menuconfig: scripts/config/mconf
+       @./scripts/config/mconf sysdeps/$(TARGET_OS)/Config.in
 
-else
+config: scripts/config/conf
+       @./scripts/config/conf sysdeps/$(TARGET_OS)/Config.in
 
-dummy:
+oldconfig: scripts/config/conf
+       @./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in
 
-endif
+randconfig: scripts/config/conf
+       @./scripts/config/conf -r sysdeps/$(TARGET_OS)/Config.in
 
+allyesconfig: scripts/config/conf
+       @./scripts/config/conf -y sysdeps/$(TARGET_OS)/Config.in
 
-%.o: %.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+allnoconfig: scripts/config/conf
+       @./scripts/config/conf -n sysdeps/$(TARGET_OS)/Config.in
 
+defconfig: scripts/config/conf
+       @./scripts/config/conf -d sysdeps/$(TARGET_OS)/Config.in
 
-# Testing...
-test tests:
-       # old way of doing it
-       #cd tests && $(MAKE) all
-       # new way of doing it
+test tests: busybox
+       # Note that 'tests' is depricated.  Use 'make check' instead
+       # To use the nice new testsuite....
        cd tests && ./tester.sh
 
-# Cleanup
+check: busybox
+       cd testsuite && ./runtest
+
 clean:
        - $(MAKE) -C tests clean
-       - $(MAKE) -C scripts/lxdialog clean
        - rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
            docs/busybox.net/BusyBox.html
        - rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
            docs/busybox.pdf docs/busybox.pod docs/busybox.net/busybox.html \
            docs/busybox _install pod2htm* *.gdb *.elf *~ core
        - rm -f busybox busybox.links libbb/loop.h .config.old .hdepend
-       - rm -f scripts/split-include scripts/mkdep .*config.log
-       - rm -rf include/config include/config.h
+       - rm -f .*config.log
        - find . -name .\*.flags -exec rm -f {} \;   
-       - find . -name .depend -exec rm -f {} \;
        - find . -name \*.o -exec rm -f {} \;
        - find . -name \*.a -exec rm -f {} \;
 
 distclean: clean
-       - rm -f busybox 
-       - cd tests && $(MAKE) distclean
+       - rm -f scripts/split-include scripts/mkdep
+       - rm -rf include/config include/config.h
+       - find . -name .depend -exec rm -f {} \;
+       rm -f .config .config.old .config.cmd
+       - $(MAKE) -C scripts/config clean
 
-dist release: distclean doc
+release: distclean #doc
        cd ..;                                  \
        rm -rf busybox-$(VERSION);              \
        cp -a busybox busybox-$(VERSION);       \
@@ -247,13 +238,13 @@ dist release: distclean doc
                                                \
        tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;
 
+tags:
+       ctags -R .
 
 
-.PHONY: tags check depend
+endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
-tags:
-       ctags -R .
+.PHONY: dummy subdirs release distclean clean config oldconfig \
+       menuconfig tags check test tests depend
 
-check: busybox
-       cd testsuite && ./runtest