Completely rework the config system so that it no longer annoys me to work on

the busybox development tree.  This eliminates the use of recursive make, and
once again allows us to run 'make' in a subdirectory with the expected result.
And things are now much faster too.  Greatly improved IMHO...
 -Erik

1 files changed, 41 insertions, 206 deletions

diff --git a/Makefile b/Makefile
index 19c28ed..28b041c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.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
@@ -17,175 +17,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-PROG      := busybox
-VERSION   := 0.61.pre
-BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
-TOPDIR    := ${shell /bin/pwd}
-HOSTCC    := gcc
-HOSTCFLAGS:= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-
-
-# What OS are you compiling busybox for?  This allows you to include
-# OS specific things, syscall overrides, etc.
-TARGET_OS := linux
-
-# With a modern GNU make(1) (highly recommended, that's what all the
-# developers use), all of the following configuration values can be
-# overridden at the command line.  For example:
-#   make CROSS=powerpc-linux- BB_SRC_DIR=$HOME/busybox PREFIX=/mnt/app
-
-# If you want to add some simple compiler switches (like -march=i686),
-# especially from the command line, use this instead of CFLAGS directly.
-# For optimization overrides, it's better still to set OPTIMIZATION.
-CFLAGS_EXTRA =
- 
-# If you want a static binary, turn this on.
-DOSTATIC = false
-
-# Set the following to `true' to make a debuggable build.
-# Leave this set to `false' for production use.
-DODEBUG = false
-
-# This enables compiling with dmalloc ( http://dmalloc.com/ )
-# which is an excellent public domain mem leak and malloc problem
-# detector.  To enable dmalloc, before running busybox you will
-# want to first set up your environment.
-# eg: `export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile`
-# The debug= value is generated using the following command
-# dmalloc -p log-stats -p log-non-free -p log-bad-space -p log-elapsed-time \
-#      -p check-fence -p check-heap -p check-lists -p check-blank \
-#      -p check-funcs -p realloc-copy -p allow-free-null
-# Do not enable this for production builds...
-DODMALLOC = false
-
-# Electric-fence is another very useful malloc debugging library.
-# Do not enable this for production builds...
-DOEFENCE  = false
-
-# If you want large file summit support, turn this on.
-# This has no effect if you don't have a kernel with lfs
-# support, and a system with libc-2.1.3 or later.
-# Some of the programs that can benefit from lfs support
-# are dd, gzip, mount, tar, and mkfs_minix.
-# LFS allows you to use the above programs for files
-# larger than 2GB!
-DOLFS = false
-
-# If you have a "pristine" source directory, point BB_SRC_DIR to it.
-# Experimental and incomplete; tell the mailing list
-# <busybox@busybox.net> if you do or don't like it so far.
-BB_SRC_DIR =
-
-# If you are running a cross compiler, you may want to set CROSS
-# to something more interesting, like "arm-linux-".
-CROSS =
-CC              = $(CROSS)gcc
-AR              = $(CROSS)ar
-AS              = $(CROSS)as
-LD              = $(CROSS)ld
-NM              = $(CROSS)nm
-STRIP           = $(CROSS)strip
-CPP             = $(CC) -E
-MAKEFILES       = $(TOPDIR)/.config
-export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
-
-
-# To compile vs uClibc, just use the compiler wrapper built by uClibc...
-# Everything should compile and work as expected these days...
-#CC = /usr/i386-linux-uclibc/usr/bin/i386-uclibc-gcc
-
-# To compile vs some other alternative libc, you may need to use/adjust
-# the following lines to meet your needs...
-#
-# If you are using Red Hat 6.x with the compatible RPMs (for developing under
-# Red Hat 5.x and glibc 2.0) uncomment the following.  Be sure to read about
-# using the compatible RPMs (compat-*) at http://www.redhat.com !
-#LIBCDIR=/usr/i386-glibc20-linux
-#
-# The following is used for libc5 (if you install altgcc and libc5-altdev
-# on a Debian system).  
-#LIBCDIR=/usr/i486-linuxlibc1
-#
-# For other libraries, you are on your own...
-#LDFLAGS+=-nostdlib
-#LIBRARIES = $(LIBCDIR)/lib/libc.a -lgcc
-#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
-#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
-
-# use '-Os' optimization if available, else use -O2
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null \
-	>/dev/null 2>&1; then echo "-Os"; else echo "-O2" ; fi}
-GCC_STACK_BOUNDRY := ${shell if $(CC) -mpreferred-stack-boundary=2 -S -o /dev/null -xc /dev/null \
-	>/dev/null 2>&1; then echo "-mpreferred-stack-boundary=2"; else echo "" ; fi}
-OPTIMIZATIONS=$(OPTIMIZATION) -fomit-frame-pointer $(GCC_STACK_BOUNDRY) #-fstrict-aliasing -march=i386 -mcpu=i386 -malign-functions=0 -malign-jumps=0
-WARNINGS=-Wall -Wstrict-prototypes -Wshadow
-CFLAGS = -I$(TOPDIR)/include
-ARFLAGS = -r
-
-#
-#--------------------------------------------------------
-# If you're going to do a lot of builds with a non-vanilla configuration,
-# it makes sense to adjust parameters above, so you can type "make"
-# by itself, instead of following it by the same half-dozen overrides
-# every time.  The stuff below, on the other hand, is probably less
-# prone to casual user adjustment.
-# 
-
-ifeq ($(strip $(DOLFS)),true)
-    # For large file summit support
-    CFLAGS+=-D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64
-endif
-ifeq ($(strip $(DODMALLOC)),true)
-    # For testing mem leaks with dmalloc
-    CFLAGS+=-DDMALLOC
-    LIBRARIES = -ldmalloc
-    # Force debug=true, since this is useless when not debugging...
-    DODEBUG = true
-else
-    ifeq ($(strip $(DOEFENCE)),true)
-	LIBRARIES = -lefence
-	# Force debug=true, since this is useless when not debugging...
-	DODEBUG = true
-    endif
-endif
-ifeq ($(strip $(DODEBUG)),true)
-    CFLAGS  += $(WARNINGS) -g -D_GNU_SOURCE
-    LDFLAGS += -Wl,-warn-common
-    STRIPCMD = /bin/true -Not_stripping_since_we_are_debugging
-else
-    CFLAGS  += $(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE
-    LDFLAGS += -s -Wl,-warn-common
-    STRIPCMD    = $(STRIP) --remove-section=.note --remove-section=.comment
-endif
-ifeq ($(strip $(DOSTATIC)),true)
-    LDFLAGS += --static
-endif
-
-ifndef $(PREFIX)
-    PREFIX = `pwd`/_install
-endif
-
-# Additional complications due to support for pristine source dir.
-# Include files in the build directory should take precedence over
-# the copy in BB_SRC_DIR, both during the compilation phase and the
-# shell script that finds the list of object files.
-# Work in progress by <ldoolitt@recycle.lbl.gov>.
-#
-ifneq ($(strip $(BB_SRC_DIR)),)
-    VPATH = $(BB_SRC_DIR)
-endif
-
-OBJECTS   = $(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o
-CFLAGS    += $(CROSS_CFLAGS)
-ifdef BB_INIT_SCRIPT
-    CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
-endif
-
-# Put user-supplied flags at the end, where they
-# have a chance of winning.
-CFLAGS += $(CFLAGS_EXTRA)
-
-.EXPORT_ALL_VARIABLES:
+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 \
+	procps pwd_grp pwd_grp/libpwd_grp shell shellutils sysklogd \
+	textutils util-linux libbb
 
 all:    do-it-all
 
@@ -196,7 +34,8 @@ ifeq (.config,$(wildcard .config))
 include .config
 ifeq (.depend,$(wildcard .depend))
 include .depend 
-do-it-all:      busybox busybox.links doc
+do-it-all:      busybox busybox.links #doc
+include $(patsubst %,%/Makefile.in, $(SUBDIRS))
 else
 CONFIGURATION = depend
 do-it-all:      depend
@@ -207,18 +46,9 @@ do-it-all:      menuconfig
 endif
 
 
-SUBDIRS =applets archival archival/libunarchive console-tools editors \
-	fileutils findutils init miscutils modutils networking procps \
-	pwd_grp shell shellutils sysklogd textutils util-linux libbb
-
-bbsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
-
-$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/config/MARKER
-	$(MAKE) CFLAGS="$(CFLAGS)" -C $(patsubst _dir_%, %, $@)
-
-busybox: config.h dep-files bbsubdirs
-	$(CC) $(LDFLAGS) -o $@ applets/busybox.o $(shell find $(SUBDIRS) -name \*.a) $(LIBRARIES)
-	$(STRIPCMD) $(PROG)
+busybox: depend $(libraries-y)
+	$(CC) $(LDFLAGS) $(libraries-y) $(LIBRARIES) -o $@
+	$(STRIPCMD) $@
 
 busybox.links: applets/busybox.mkll
 	- $(SHELL) $^ >$@
@@ -291,52 +121,52 @@ 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
+$(TOPDIR)scripts/mkdep: scripts/mkdep.c
 	$(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
 
-scripts/split-include: scripts/split-include.c
+$(TOPDIR)scripts/split-include: scripts/split-include.c
 	$(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
 
-dep-files: scripts/mkdep
-	@if [ ! -f .depend ] ; then \
-		rm -f .depend .hdepend; \
-		mkdir -p $(TOPDIR)/include/config; \
-		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)" ; \
-	fi;
-
-
-depend dep: config.h dep-files
+$(TOPDIR).depend: $(TOPDIR)scripts/mkdep
+	rm -f .depend .hdepend;
+	mkdir -p $(TOPDIR)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"
 
+depend dep: $(TOPDIR)include/config.h $(TOPDIR).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: scripts/split-include include/config.h
+include/config/MARKER: depend $(TOPDIR)scripts/split-include
 	scripts/split-include include/config.h include/config
 	@ touch include/config/MARKER
 
-config.h:
-	@if [ ! -f include/config.h ] ; then \
+$(TOPDIR)include/config.h:
+	@if [ ! -f $(TOPDIR)include/config.h ] ; then \
 		make oldconfig; \
 	fi;
 
 menuconfig:
-	mkdir -p $(TOPDIR)/include/config
+	mkdir -p $(TOPDIR)include/config
 	$(MAKE) -C scripts/lxdialog all
 	$(BB_SHELL) scripts/Menuconfig sysdeps/$(TARGET_OS)/config.in
 
 config:
-	mkdir -p $(TOPDIR)/include/config
+	mkdir -p $(TOPDIR)include/config
 	$(BB_SHELL) scripts/Configure sysdeps/$(TARGET_OS)/config.in
 
 oldconfig:
-	mkdir -p $(TOPDIR)/include/config
+	mkdir -p $(TOPDIR)include/config
 	$(BB_SHELL) scripts/Configure -d sysdeps/$(TARGET_OS)/config.in
 
 
@@ -359,7 +189,10 @@ dummy:
 
 endif
 
-include Rules.mak
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+
 
 # Testing...
 test tests:
@@ -407,9 +240,11 @@ dist release: distclean doc
 
 
 
-.PHONY: tags check
+.PHONY: tags check depend
+
 tags:
 	ctags -R .
 
 check: busybox
 	cd testsuite && ./runtest
+