summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2005-10-13 10:40:18 +0000
committerBernhard Reutner-Fischer2005-10-13 10:40:18 +0000
commit8c7a7e6e63c01d2d575bbaa43e1768ad2b97179b (patch)
tree08c307c55926456b2001311f7fbf7c04959a5cec
parentbb66a6c94ed7cf195a50478fa8415cbed54b3566 (diff)
downloadbusybox-8c7a7e6e63c01d2d575bbaa43e1768ad2b97179b.zip
busybox-8c7a7e6e63c01d2d575bbaa43e1768ad2b97179b.tar.gz
- split VERSION into parts
- add some filesystem operation wrapper variables for use in the makefiles and pull them in early in the toplevel makefile - use the cross-toolchain for "make sizes"
-rw-r--r--Makefile7
-rw-r--r--Rules.mak15
2 files changed, 20 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 63a2c13..9c3ed40 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,11 @@ else
KBUILD_OUTPUT := $(top_builddir)
endif
+ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
+# pull in OS specific commands like cp, mkdir, etc. early
+-include $(top_srcdir)/Rules.mak
+endif
+
# All object directories.
OBJ_DIRS := $(DIRS)
all_tree := $(patsubst %,$(top_builddir)/%,$(OBJ_DIRS) scripts scripts/config include)
@@ -252,7 +257,7 @@ sizes:
-rm -f busybox
$(MAKE) top_srcdir=$(top_srcdir) top_builddir=$(top_builddir) \
-f $(top_srcdir)/Makefile STRIPCMD=/bin/true
- nm --size-sort busybox
+ $(NM) --size-sort busybox
# Documentation Targets
doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
diff --git a/Rules.mak b/Rules.mak
index 1e519fb..6c44726 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -19,7 +19,11 @@
#--------------------------------------------------------
PROG := busybox
-VERSION := 1.1.0-pre1
+MAJOR_VERSION :=1
+MINOR_VERSION :=1
+SUBLEVEL_VERSION:=0
+EXTRAVERSION :=-pre1
+VERSION :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION)
BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
@@ -43,6 +47,15 @@ NM = $(CROSS)nm
STRIP = $(CROSS)strip
CPP = $(CC) -E
# MAKEFILES = $(top_builddir)/.config
+RM = rm
+RM_F = $(RM) -f
+LN = ln
+LN_S = $(LN) -s
+MKDIR = mkdir
+MKDIR_P = $(MKDIR) -p
+MV = mv
+CP = cp
+
# What OS are you compiling busybox for? This allows you to include
# OS specific things, syscall overrides, etc.