X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=68d7db247a937874f6162f30bf1eb60bfe2b2046;hb=741f40b58edf3644c6bc8e6863ee9ad681b21562;hp=8af07906218cfbb8b2d922078e03dec32f8ec66b;hpb=53b55ac08d55bed26b2d95a4a27549cd1caa947e;p=oweals%2Fbusybox.git diff --git a/Makefile b/Makefile index 8af079062..68d7db247 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Makefile for busybox # -# Copyright (C) 1999,2000,2001 Erik Andersen +# Copyright (C) 1999,2000,2001 by Erik Andersen # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,14 +18,21 @@ # PROG := busybox -VERSION := 0.50 -BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z") -export VERSION +VERSION := 0.61.pre +BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") +TOPDIR := ${shell /bin/pwd} +HOSTCC := gcc +HOSTCFLAGS:= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer + + +# What OS are you compiling busybox for? This allows you to include +# OS specific things, syscall overrides, etc. +TARGET_OS := linux # With a modern GNU make(1) (highly recommended, that's what all the # developers use), all of the following configuration values can be # overridden at the command line. For example: -# make CROSS=powerpc-linux- BB_SRC_DIR=$HOME/busybox PREFIX=/mnt/app +# make CROSS=powerpc-linux- CONFIG_SRC_DIR=$HOME/busybox PREFIX=/mnt/app # If you want to add some simple compiler switches (like -march=i686), # especially from the command line, use this instead of CFLAGS directly. @@ -37,21 +44,8 @@ DOSTATIC = false # Set the following to `true' to make a debuggable build. # Leave this set to `false' for production use. -# eg: `make DODEBUG=true tests' -# Do not enable this for production builds... DODEBUG = false -# Setting this to `true' will cause busybox to directly use the system's -# password and group functions. Assuming you use GNU libc, when this is -# `true', you will need to install the /etc/nsswitch.conf configuration file -# and the required libnss_* libraries. This generally makes your embedded -# system quite a bit larger... If you leave this off, busybox will directly -# use the /etc/password, /etc/group files (and your system will be smaller, and -# I will get fewer emails asking about how glibc NSS works). Enabling this adds -# just 1.4k to the binary size (which is a _lot_ less then glibc NSS costs), -# Most people will want to leave this set to false. -USE_SYSTEM_PWD_GRP = true - # This enables compiling with dmalloc ( http://dmalloc.com/ ) # which is an excellent public domain mem leak and malloc problem # detector. To enable dmalloc, before running busybox you will @@ -60,6 +54,10 @@ USE_SYSTEM_PWD_GRP = true # Do not enable this for production builds... DODMALLOC = false +# Electric-fence is another very useful malloc debugging library. +# Do not enable this for production builds... +DOEFENCE = false + # If you want large file summit support, turn this on. # This has no effect if you don't have a kernel with lfs # support, and a system with libc-2.1.3 or later. @@ -69,22 +67,28 @@ DODMALLOC = false # larger than 2GB! DOLFS = false -# If you have a "pristine" source directory, point BB_SRC_DIR to it. +# If you have a "pristine" source directory, point CONFIG_SRC_DIR to it. # Experimental and incomplete; tell the mailing list -# if you do or don't like it so far. -BB_SRC_DIR = +# if you do or don't like it so far. +CONFIG_SRC_DIR = -# If you are running a cross compiler, you may want to set this -# to something more interesting, like "powerpc-linux-". +# If you are running a cross compiler, you may want to set CROSS +# to something more interesting, like "arm-linux-". CROSS = -CC = $(CROSS)gcc -AR = $(CROSS)ar -STRIPTOOL = $(CROSS)strip +CC = $(CROSS)gcc +AR = $(CROSS)ar +AS = $(CROSS)as +LD = $(CROSS)ld +NM = $(CROSS)nm +STRIP = $(CROSS)strip +CPP = $(CC) -E +MAKEFILES = $(TOPDIR)/.config +export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP + # To compile vs uClibc, just use the compiler wrapper built by uClibc... -# This make things very easy? Everything should compile and work as -# expected these days... -#CC = ../uClibc/extra/gcc-uClibc/gcc-uClibc-i386 +# Everything should compile and work as expected these days... +#CC = /usr/i386-linux-uclibc/usr/bin/i386-uclibc-gcc # To compile vs some other alternative libc, you may need to use/adjust # the following lines to meet your needs... @@ -105,10 +109,14 @@ STRIPTOOL = $(CROSS)strip #GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") # 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) - -WARNINGS = -Wall +OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null \ + >/dev/null 2>&1; then echo "-Os"; else echo "-O2" ; fi} +GCC_STACK_BOUNDRY := ${shell if $(CC) -mpreferred-stack-boundary=2 -S -o /dev/null -xc /dev/null \ + >/dev/null 2>&1; then echo "-mpreferred-stack-boundary=2"; else echo "" ; fi} +OPTIMIZATIONS=$(OPTIMIZATION) -fomit-frame-pointer $(GCC_STACK_BOUNDRY) +WARNINGS=-Wall -Wstrict-prototypes -Wshadow +CFLAGS = -I$(TOPDIR)/include +ARFLAGS = -r # #-------------------------------------------------------- @@ -121,7 +129,7 @@ WARNINGS = -Wall ifeq ($(strip $(DOLFS)),true) # For large file summit support - CFLAGS+=-D_FILE_OFFSET_BITS=64 + CFLAGS+=-D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 endif ifeq ($(strip $(DODMALLOC)),true) # For testing mem leaks with dmalloc @@ -129,29 +137,24 @@ ifeq ($(strip $(DODMALLOC)),true) LIBRARIES = -ldmalloc # Force debug=true, since this is useless when not debugging... DODEBUG = true +else + ifeq ($(strip $(DOEFENCE)),true) + LIBRARIES = -lefence + # Force debug=true, since this is useless when not debugging... + DODEBUG = true + endif endif ifeq ($(strip $(DODEBUG)),true) CFLAGS += $(WARNINGS) -g -D_GNU_SOURCE LDFLAGS += -Wl,-warn-common - STRIP = + STRIPCMD = else - CFLAGS += $(WARNINGS) $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE + CFLAGS += $(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE LDFLAGS += -s -Wl,-warn-common - STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG) + STRIPCMD = $(STRIP) --remove-section=.note --remove-section=.comment endif ifeq ($(strip $(DOSTATIC)),true) LDFLAGS += --static - # - #use '-ffunction-sections -fdata-sections' and '--gc-sections' (if they - # work) to try and strip out any unused junk. Doesn't do much for me, - # but you may want to give it a shot... - # - #ifeq ($(shell $(CC) -ffunction-sections -fdata-sections -S \ - # -o /dev/null -xc /dev/null 2>/dev/null && $(LD) \ - # --gc-sections -v >/dev/null && echo 1),1) - # CFLAGS += -ffunction-sections -fdata-sections - # LDFLAGS += --gc-sections - #endif endif ifndef $(PREFIX) @@ -160,65 +163,18 @@ endif # Additional complications due to support for pristine source dir. # Include files in the build directory should take precedence over -# the copy in BB_SRC_DIR, both during the compilation phase and the +# the copy in CONFIG_SRC_DIR, both during the compilation phase and the # shell script that finds the list of object files. # Work in progress by . # -ifneq ($(strip $(BB_SRC_DIR)),) - VPATH = $(BB_SRC_DIR) -endif -#ifneq ($(strip $(VPATH)),) -# CFLAGS += -I- -I. $(patsubst %,-I%,$(subst :, ,$(VPATH))) -#endif - -# We need to set APPLET_SOURCES to something like -# $(shell busybox.sh Config.h) -# but in a manner that works with VPATH and BB_SRC_DIR. -# Possible ways to approach this: -# -# 1. Explicitly search through .:$(VPATH) for busybox.sh and config.h, -# then $(shell $(BUSYBOX_SH) $(CONFIG_H) $(BB_SRC_DIR)) -# -# 2. Explicity search through .:$(VPATH) for slist.mk, -# then $(shell $(MAKE) -f $(SLIST_MK) VPATH=$(VPATH) BB_SRC_DIR=$(BB_SRC_DIR)) -# -# 3. Create slist.mk in this directory, with commands embedded in -# a $(shell ...) command, and $(MAKE) it immediately. -# -# 4. Use a real rule within this makefile to create a file that sets -# APPLET_SOURCE_LIST, then include that file. Has complications -# with the first trip through the makefile (before processing the -# include) trying to do too much, and a spurious warning the first -# time make is run. -# -# This is option 3: -# -#APPLET_SOURCES = $(shell \ -# echo -e 'all: busybox.sh Config.h\n\t@ $$(SHELL) $$^ $$(BB_SRC_DIR)' >slist.mk; \ -# make -f slist.mk VPATH=$(VPATH) BB_SRC_DIR=$(BB_SRC_DIR) \ -#) -# And option 4: --include applet_source_list - -OBJECTS = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o utility.o -CFLAGS += $(CROSS_CFLAGS) -CFLAGS += -DBB_VER='"$(VERSION)"' -CFLAGS += -DBB_BT='"$(BUILDTIME)"' -ifdef BB_INIT_SCRIPT - CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"' +ifneq ($(strip $(CONFIG_SRC_DIR)),) + VPATH = $(CONFIG_SRC_DIR) endif -ifneq ($(strip $(USE_SYSTEM_PWD_GRP)),true) - PWD_GRP = pwd_grp - PWD_GRP_DIR = $(BB_SRC_DIR:=/)$(PWD_GRP) - PWD_LIB = libpwd.a - PWD_CSRC=__getpwent.c pwent.c getpwnam.c getpwuid.c putpwent.c getpw.c \ - fgetpwent.c __getgrent.c grent.c getgrnam.c getgrgid.c fgetgrent.c \ - initgroups.c setgroups.c - PWD_OBJS=$(patsubst %.c,$(PWD_GRP)/%.o, $(PWD_CSRC)) - PWD_CFLAGS = -I$(PWD_GRP_DIR) -else - CFLAGS += -DUSE_SYSTEM_PWD_GRP +OBJECTS = $(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o +CFLAGS += $(CROSS_CFLAGS) +ifdef CONFIG_INIT_SCRIPT + CFLAGS += -DINIT_SCRIPT='"$(CONFIG_INIT_SCRIPT)"' endif # Put user-supplied flags at the end, where they @@ -227,15 +183,59 @@ CFLAGS += $(CFLAGS_EXTRA) .EXPORT_ALL_VARIABLES: -all: applet_source_list busybox busybox.links doc +all: do-it-all + +# +# Make "config" the default target if there is no configuration file or +# "depend" the target if there is no top-level dependency information. +ifeq (.config,$(wildcard .config)) +include .config +ifeq (.depend,$(wildcard .depend)) +include .depend +do-it-all: busybox busybox.links doc +else +CONFIGURATION = depend +do-it-all: depend +endif +else +CONFIGURATION = menuconfig +do-it-all: menuconfig +endif + + +SUBDIRS =applets archival archival/libunarchive console-tools editors \ + fileutils findutils init miscutils modutils networking procps \ + pwd_grp shell shellutils sysklogd textutils util-linux libbb + +bbsubdirs: $(patsubst %, _dir_%, $(SUBDIRS)) + +$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/config/MARKER + $(MAKE) CFLAGS="$(CFLAGS)" -C $(patsubst _dir_%, %, $@) + +busybox: config.h dep-files bbsubdirs + $(CC) $(LDFLAGS) -o $@ applets/busybox.o $(shell find $(SUBDIRS) -name \*.a) $(LIBCONFIG_LIB) $(LIBRARIES) + $(STRIPCMD) $(PROG) + +busybox.links: applets/busybox.mkll + - $(SHELL) $^ >$@ + +install: applets/install.sh busybox busybox.links + $(SHELL) $< $(PREFIX) + +install-hardlinks: applets/install.sh busybox busybox.links + $(SHELL) $< $(PREFIX) --hardlinks -applet_source_list: busybox.sh Config.h - (echo -n "APPLET_SOURCES := "; $(SHELL) $^ $(BB_SRC_DIR)) > $@ +# Documentation Targets doc: olddoc # Old Docs... -olddoc: docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html +olddoc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html + +docs/busybox.pod : docs/busybox_header.pod include/usage.h docs/busybox_footer.pod + - ( cat docs/busybox_header.pod; \ + docs/autodocifier.pl include/usage.h; \ + cat docs/busybox_footer.pod ) > docs/busybox.pod docs/BusyBox.txt: docs/busybox.pod @echo @@ -249,16 +249,16 @@ docs/BusyBox.1: docs/busybox.pod - pod2man --center=BusyBox --release="version $(VERSION)" \ $< > $@ -docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html +docs/BusyBox.html: docs/busybox.net/BusyBox.html - mkdir -p docs -@ rm -f docs/BusyBox.html - -@ ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html + -@ ln -s busybox.net/BusyBox.html docs/BusyBox.html -docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod - -@ mkdir -p docs/busybox.lineo.com +docs/busybox.net/BusyBox.html: docs/busybox.pod + -@ mkdir -p docs/busybox.net - pod2html --noindex $< > \ - docs/busybox.lineo.com/BusyBox.html - -@ rm -f pod2html* + docs/busybox.net/BusyBox.html + -@ rm -f pod2htm* # New docs based on DOCBOOK SGML @@ -285,69 +285,105 @@ docs/busybox.pdf: docs/busybox.ps docs/busybox/busyboxdocumentation.html: docs/busybox.sgml - mkdir -p docs - (cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml) + (cd docs/busybox.net; sgmltools -b html ../busybox.sgml) +# The nifty new buildsystem stuff +scripts/mkdep: scripts/mkdep.c + $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c -busybox: $(PWD_LIB) $(OBJECTS) - $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB) - $(STRIP) +scripts/split-include: scripts/split-include.c + $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c -# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h" -# but with VPATH, some or all of those file names are resolved to the -# directories in which they live. -busybox.links: busybox.mkll Config.h applets.h - - $(SHELL) $^ >$@ +dep-files: scripts/mkdep + @if [ ! -f .depend ] ; then \ + rm -f .depend .hdepend; \ + mkdir -p $(TOPDIR)/include/config; \ + scripts/mkdep -I $(TOPDIR)/include -- \ + `find $(TOPDIR) -name \*.c -print` >> .depend; \ + scripts/mkdep -I $(TOPDIR)/include -- \ + `find $(TOPDIR) -name \*.h -print` >> .hdepend; \ + $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" ; \ + fi; + + +depend dep: config.h dep-files + @ echo -e "\n\nNow run 'make' to build BusyBox\n\n" -nfsmount.o cmdedit.o: %.o: %.h -sh.o: cmdedit.h -$(OBJECTS): %.o: %.c Config.h busybox.h applets.h Makefile - $(CC) -I- $(CFLAGS) -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o +CONFIG_SHELL := ${shell if [ -x "$$BASH" ]; then echo $$BASH; \ + else if [ -x /bin/bash ]; then echo /bin/bash; \ + else echo sh; fi ; fi} + +include/config/MARKER: scripts/split-include include/config.h + scripts/split-include include/config.h include/config + @ touch include/config/MARKER + +config.h: + @if [ ! -f include/config.h ] ; then \ + make oldconfig; \ + fi; + +menuconfig: + mkdir -p $(TOPDIR)/include/config + $(MAKE) -C scripts/lxdialog all + $(CONFIG_SHELL) scripts/Menuconfig sysdeps/$(TARGET_OS)/config.in + +config: + mkdir -p $(TOPDIR)/include/config + $(CONFIG_SHELL) scripts/Configure sysdeps/$(TARGET_OS)/config.in + +oldconfig: + mkdir -p $(TOPDIR)/include/config + $(CONFIG_SHELL) scripts/Configure -d sysdeps/$(TARGET_OS)/config.in + + +ifdef CONFIGURATION +..$(CONFIGURATION): + @echo + @echo "You have a bad or nonexistent" .$(CONFIGURATION) ": running 'make" $(CONFIGURATION)"'" + @echo + $(MAKE) $(CONFIGURATION) + @echo + @echo "Successful. Try re-making (ignore the error that follows)" + @echo + exit 1 -$(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile - - mkdir -p $(PWD_GRP) - $(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o +dummy: -libpwd.a: $(PWD_OBJS) - $(AR) $(ARFLAGS) $@ $^ +else -usage.o: usage.h +dummy: -utility.o: loop.h +endif -loop.h: mk_loop_h.sh - @ $(SHELL) $< > $@ +include Rules.mak +# Testing... test tests: # old way of doing it #cd tests && $(MAKE) all # new way of doing it cd tests && ./tester.sh +# Cleanup clean: - - cd tests && $(MAKE) clean + - $(MAKE) -C tests clean + - $(MAKE) -C scripts/lxdialog clean - rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \ - docs/busybox.lineo.com/BusyBox.html + docs/busybox.net/BusyBox.html - rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \ - docs/busybox.pdf docs/busybox.lineo.com/busybox.html - - rm -f multibuild.log Config.h.orig - - rm -rf docs/busybox _install libpwd.a - - rm -f busybox.links loop.h *~ slist.mk core applet_source_list + docs/busybox.pdf docs/busybox.net/busybox.html \ + docs/busybox _install pod2htm* *.gdb *.elf *~ core + - rm -f busybox.links libbb/loop.h .config.old .hdepend + - rm -f scripts/split-include scripts/mkdep .*config.log + - rm -rf include/config include/config.h + - find -name .\*.flags -o -name .depend -exec rm -f {} \; - find -name \*.o -exec rm -f {} \; + - find -name \*.a -exec rm -f {} \; distclean: clean - - rm -f busybox + - rm -f busybox - cd tests && $(MAKE) distclean -install: install.sh busybox busybox.links - $(SHELL) $< $(PREFIX) - -install-hardlinks: install.sh busybox busybox.links - $(SHELL) $< $(PREFIX) --hardlinks - -debug_pristine: - @ echo VPATH=\"$(VPATH)\" - @ echo OBJECTS=\"$(OBJECTS)\" - dist release: distclean doc cd ..; \ rm -rf busybox-$(VERSION); \ @@ -358,11 +394,6 @@ dist release: distclean doc -print \ -exec rm -rf {} \; ; \ \ - find busybox-$(VERSION)/ -type f \ - -name .cvsignore \ - -print \ - -exec rm -f {} \; ; \ - \ find busybox-$(VERSION)/ -type f \ -name .\#* \ -print \ @@ -370,6 +401,11 @@ dist release: distclean doc \ tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/; -.PHONY: tags + + +.PHONY: tags check tags: ctags -R . + +check: busybox + cd testsuite && ./runtest