- 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"
This commit is contained in:
parent
bb66a6c94e
commit
8c7a7e6e63
7
Makefile
7
Makefile
@ -53,6 +53,11 @@ else
|
|||||||
KBUILD_OUTPUT := $(top_builddir)
|
KBUILD_OUTPUT := $(top_builddir)
|
||||||
endif
|
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.
|
# All object directories.
|
||||||
OBJ_DIRS := $(DIRS)
|
OBJ_DIRS := $(DIRS)
|
||||||
all_tree := $(patsubst %,$(top_builddir)/%,$(OBJ_DIRS) scripts scripts/config include)
|
all_tree := $(patsubst %,$(top_builddir)/%,$(OBJ_DIRS) scripts scripts/config include)
|
||||||
@ -252,7 +257,7 @@ sizes:
|
|||||||
-rm -f busybox
|
-rm -f busybox
|
||||||
$(MAKE) top_srcdir=$(top_srcdir) top_builddir=$(top_builddir) \
|
$(MAKE) top_srcdir=$(top_srcdir) top_builddir=$(top_builddir) \
|
||||||
-f $(top_srcdir)/Makefile STRIPCMD=/bin/true
|
-f $(top_srcdir)/Makefile STRIPCMD=/bin/true
|
||||||
nm --size-sort busybox
|
$(NM) --size-sort busybox
|
||||||
|
|
||||||
# Documentation Targets
|
# Documentation Targets
|
||||||
doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
|
doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
|
||||||
|
15
Rules.mak
15
Rules.mak
@ -19,7 +19,11 @@
|
|||||||
|
|
||||||
#--------------------------------------------------------
|
#--------------------------------------------------------
|
||||||
PROG := busybox
|
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")
|
BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z")
|
||||||
|
|
||||||
|
|
||||||
@ -43,6 +47,15 @@ NM = $(CROSS)nm
|
|||||||
STRIP = $(CROSS)strip
|
STRIP = $(CROSS)strip
|
||||||
CPP = $(CC) -E
|
CPP = $(CC) -E
|
||||||
# MAKEFILES = $(top_builddir)/.config
|
# 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
|
# What OS are you compiling busybox for? This allows you to include
|
||||||
# OS specific things, syscall overrides, etc.
|
# OS specific things, syscall overrides, etc.
|
||||||
|
Loading…
Reference in New Issue
Block a user