Oops. Forgot the usleep.c file.

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index 10b76ee43ebc430709eb0510c16ebd2392630dd1..4d5dbb65603144c2909507b6b482cc21416a4e98 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-# PROG      := busybox
-VERSION   := 0.42
+PROG      := busybox
+VERSION   := 0.43
 BUILDTIME := $(shell TZ=GMT date "+%Y%m%d-%H%M")
+BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
+BUILDTIME := $(shell TZ=UTC date --utc -R)
 
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
@@ -30,7 +32,7 @@ DODEBUG = false
 # If you want a static binary, turn this on.  I can't think
 # of many situations where anybody would ever want it static, 
 # but...
-DOSTATIC = false
+DOSTATIC = true
 
 # This will choke on a non-debian system
 ARCH =`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'`
@@ -77,7 +79,7 @@ ifeq ($(DODEBUG),true)
 else
     CFLAGS  += -Wall $(OPTIMIZATION) -fomit-frame-pointer -fno-builtin -D_GNU_SOURCE
     LDFLAGS  = -s
-    STRIP    = $(STRIPTOOL) --remove-section=.note --remove-section=.comment
+    STRIP    = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
     #Only staticly link when _not_ debugging 
     ifeq ($(DOSTATIC),true)
        LDFLAGS += --static
@@ -89,7 +91,7 @@ ifndef $(PREFIX)
 endif
 
 LIBRARIES =
-OBJECTS   = $(shell ./busybox.sh) messages.o utility.o
+OBJECTS   = $(shell ./busybox.sh) busybox.o messages.o utility.o
 CFLAGS    += -DBB_VER='"$(VERSION)"'
 CFLAGS    += -DBB_BT='"$(BUILDTIME)"'
 ifdef BB_INIT_SCRIPT
@@ -101,7 +103,7 @@ all: busybox busybox.links
 
 busybox: $(OBJECTS)
        $(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
-       $(STRIP) $@
+       $(STRIP)
 
 busybox.links: busybox.def.h
        - ./busybox.mkll | sort >$@