Lots of updates. Finished implementing BB_FEATURE_TRIVIAL_HELP

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index aaa0eddc49e8521fef8ca7dc6f94be33e936eff4..6323bd3378c5151dd8c662363d0e36c7da2da2ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 #
 
 PROG      := busybox
-VERSION   := 0.43
+VERSION   := 0.44
 BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
 export VERSION
 
@@ -31,42 +31,21 @@ DODEBUG = false
 # If you want a static binary, turn this on.
 DOSTATIC = false
 
-# This will choke on a non-debian system
-ARCH =`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'`
-
 CC = gcc
 
-GCCMAJVERSION = $(shell $(CC) --version | sed -n "s/^[^0-9]*\([0-9]\)\.\([0-9].*\)[\.].*/\1/p")
-GCCMINVERSION = $(shell $(CC) --version | sed -n "s/^[^0-9]*\([0-9]\)\.\([0-9].*\)[\.].*/\2/p")
-
-
-GCCSUPPORTSOPTSIZE = $(shell                   \
-if ( test $(GCCMAJVERSION) -eq 2 ) ; then      \
-    if ( test $(GCCMINVERSION) -ge 66 ) ; then \
-       echo "true";                            \
-    else                                       \
-       echo "false";                           \
-    fi;                                                \
-else                                           \
-    if ( test $(GCCMAJVERSION) -gt 2 ) ; then  \
-       echo "true";                            \
-    else                                       \
-       echo "false";                           \
-    fi;                                                \
-fi; )
-
+# 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)
 
-ifeq ($(GCCSUPPORTSOPTSIZE), true)
-    OPTIMIZATION = -Os
-else
-    OPTIMIZATION = -O2
-endif
 
 # Allow alternative stripping tools to be used...
 ifndef $(STRIPTOOL)
     STRIPTOOL = strip
 endif
 
+# TODO: Try compiling vs other libcs.  
+# See what -nostdinc and -nostdlib do for them.
+# also try --prefix=/usr/my-libc-stuff
 
 # -D_GNU_SOURCE is needed because environ is used in init.c
 ifeq ($(DODEBUG),true)
@@ -95,17 +74,40 @@ ifdef BB_INIT_SCRIPT
     CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
 endif
 
-all: busybox busybox.links
+# use '-ffunction-sections -fdata-sections' and '--gc-sections' if they work
+ifeq ($(shell $(CC) -ffunction-sections -fdata-sections -S \
+       -o /dev/null -xc /dev/null && $(LD) --gc-sections -v >/dev/null && echo 1),1)
+    CFLAGS += -ffunction-sections -fdata-sections -DFUNCTION_SECTIONS
+    LDFLAGS += --gc-sections
+endif
+
+all: busybox busybox.links doc
+
+doc: docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+
+docs/BusyBox.txt: docs/busybox.pod
+       @echo
+       @echo BusyBox Documentation
+       @echo
+       pod2text docs/busybox.pod > docs/BusyBox.txt
+
+docs/BusyBox.1: docs/busybox.pod
+       pod2man --center=BusyBox --release="version $(VERSION)" docs/busybox.pod > docs/BusyBox.1
+
+docs/BusyBox.html: docs/busybox.pod
+       pod2html docs/busybox.pod > docs/BusyBox.html
+       - rm -f pod2html*
+
+clean:
 
 busybox: $(OBJECTS)
        $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
        $(STRIP)
-       $(MAKE) -C docs
-       
+
 busybox.links: busybox.def.h
        - ./busybox.mkll | sort >$@
 
-regexp.o nfsmount.o: %.o: %.h
+regexp.o nfsmount.o cmdedit.o: %.o: %.h
 $(OBJECTS): %.o: busybox.def.h internal.h  %.c Makefile
 
 test tests:
@@ -115,6 +117,7 @@ clean:
        - rm -f busybox.links *~ *.o core
        - rm -rf _install
        - cd tests && $(MAKE) clean
+       - rm -f BusyBox.html BusyBox.1 BusyBox.txt pod2html*
 
 distclean: clean
        - rm -f busybox
@@ -123,8 +126,7 @@ distclean: clean
 install: busybox busybox.links
        ./install.sh $(PREFIX)
 
-dist release: distclean
-       $(MAKE) -C docs
+dist release: distclean doc
        cd ..;                                  \
        rm -rf busybox-$(VERSION);              \
        cp -a busybox busybox-$(VERSION);       \