the beginnings of a proper man page for busybox.

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 73aa2fc909b6a0c7e4ab64d367fb2088588136a4..91d4bd1c4495502691a98b9ba4837a7be1339d0a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 
 
 PROG=busybox
-VERSION=0.40
+VERSION=0.41
 BUILDTIME=$(shell date "+%Y%m%d-%H%M")
 
 # Comment out the following to make a debuggable build
@@ -33,10 +33,11 @@ ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'`
 
 GCCMAJVERSION=$(shell $(CC) --version | sed -n "s/^\([^\.]*\).*/\1/p" )
 GCCMINVERSION=$(shell $(CC) --version | sed -n "s/^[^\.]*\.\([^\.]*\)[\.].*/\1/p" )
+GCCEGCS=$(shell $(CC) --version | sed -n "s/.*\(egcs\).*/\1/p" )
 
 GCCSUPPORTSOPTSIZE=$(shell \
 if ( test $(GCCMAJVERSION) -eq 2 ) ; then \
-    if ( test $(GCCMINVERSION) -ge 91 ) ; then \
+    if ( test $(GCCMINVERSION) -ge 66 ) ; then \
        echo "true"; \
     else \
        echo "false"; \
@@ -49,11 +50,26 @@ else \
     fi; \
 fi; )
 
+GCCISEGCS=$(shell \
+if ( test "x$(GCCEGCS)" == "xegcs" ) ; then \
+               echo "true"; \
+       else \
+               echo "false"; \
+       fi; )
+
+EGCSEXTREMEFLAGS = -m386 -mcpu=i386 -march=i386 -malign-jumps=1 -malign-loops=1 -malign-functions=1
+GCCEXTREMEFLAGS  = -m386 -malign-jumps=1 -malign-loops=1 -malign-functions=1
+
+ifeq ($(GCCISEGCS), true)
+       EXTREMEFLAGS = $(EGCSEXTREMEFLAGS)
+else
+       EXTREMEFLAGS = $(GCCEXTREMEFLAGS)
+endif
 
 ifeq ($(GCCSUPPORTSOPTSIZE), true)
-    OPTIMIZATION=-Os
+       OPTIMIZATION=-Os $(EXTREMEFLAGS)
 else
-    OPTIMIZATION=-O2
+       OPTIMIZATION=-O2 $(EXTREMEFLAGS)
 endif
 
 # -D_GNU_SOURCE is needed because environ is used in init.c
@@ -80,12 +96,8 @@ LIBRARIES=
 OBJECTS=$(shell ./busybox.sh)
 CFLAGS+= -DBB_VER='"$(VERSION)"'
 CFLAGS+= -DBB_BT='"$(BUILDTIME)"'
-ifdef BB_INIT_RC_EXIT_CMD
-    CFLAGS += -DBB_INIT_CMD_IF_RC_SCRIPT_EXITS=${BB_INIT_RC_EXIT_CMD}
-endif
-
 ifdef BB_INIT_SCRIPT
-    CFLAGS += -DBB_INIT_SCRIPT=${BB_INIT_SCRIPT}
+    CFLAGS += -DINIT_SCRIPT=${BB_INIT_SCRIPT}
 endif
 
 all: busybox busybox.links
@@ -112,6 +124,6 @@ install: busybox busybox.links
 dist: release
 
 release: distclean
-       (cd .. ; rm -rf busybox-$(VERSION) ; cp -a busybox busybox-$(VERSION); rm -rf busybox-$(VERSION)/CVS busybox-$(VERSION)/.cvsignore ; tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)) 
+       (cd .. ; rm -rf busybox-$(VERSION) ; cp -a busybox busybox-$(VERSION); rm -rf busybox-$(VERSION)/CVS busybox-$(VERSION)/scripts/CVS busybox-$(VERSION)/docs/CVS busybox-$(VERSION)/.cvsignore ; tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION))