X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Rules.mak;h=e186af00d7364bd27fe6a32637bbe9e1f087c429;hb=2d2c868aabdccf46a05d1dd0b1f1ab8503d12c98;hp=b38225fbe8fcd03fd308d6037efdee515485c398;hpb=0a14c9f924eaf6a64e78959a190d187d646b3c0c;p=oweals%2Fbusybox.git diff --git a/Rules.mak b/Rules.mak index b38225fbe..e186af00d 100644 --- a/Rules.mak +++ b/Rules.mak @@ -1,6 +1,6 @@ # Rules.make for busybox # -# Copyright (C) 2001-2003 Erik Andersen +# Copyright (C) 1999-2004 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 @@ -19,7 +19,7 @@ #-------------------------------------------------------- PROG := busybox -VERSION := 1.00-pre1 +VERSION := 1.1.0-pre1 BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") @@ -35,7 +35,6 @@ BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") # by asking the CC compiler what arch it compiles things for, so unless # your compiler is broken, you should not need to specify TARGET_ARCH CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) -#CROSS =/usr/i386-linux-uclibc/bin/i386-uclibc- CC = $(CROSS)gcc AR = $(CROSS)ar AS = $(CROSS)as @@ -43,7 +42,7 @@ LD = $(CROSS)ld NM = $(CROSS)nm STRIP = $(CROSS)strip CPP = $(CC) -E -MAKEFILES = $(TOPDIR).config +# MAKEFILES = $(top_builddir)/.config # What OS are you compiling busybox for? This allows you to include # OS specific things, syscall overrides, etc. @@ -53,14 +52,14 @@ TARGET_OS=linux HOSTCC = gcc HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. +# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. LC_ALL:= C # If you want to add some simple compiler switches (like -march=i686), # especially from the command line, use this instead of CFLAGS directly. # For optimization overrides, it's better still to set OPTIMIZATION. CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) - + # If you have a "pristine" source directory, point BB_SRC_DIR to it. # Experimental and incomplete; tell the mailing list # if you do or don't like it so far. @@ -81,13 +80,13 @@ BB_SRC_DIR= #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") WARNINGS=-Wall -Wstrict-prototypes -Wshadow -CFLAGS=-I$(TOPDIR)include -ARFLAGS=-r +CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) +ARFLAGS=cru #-------------------------------------------------------- export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP ifeq ($(strip $(TARGET_ARCH)),) -TARGET_ARCH=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ +TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/g' \ @@ -101,14 +100,26 @@ TARGET_ARCH=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ ) endif -# Pull in the user's uClibc configuration +# Pull in the user's busybox configuration ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) --include $(TOPDIR).config +-include $(top_builddir)/.config endif # A nifty macro to make testing gcc features easier -check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ - then echo "$(1)"; else echo "$(2)"; fi) +check_gcc=$(shell \ + if [ "$(1)" != "" ]; then \ + if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ + then echo "$(1)"; else echo "$(2)"; fi \ + fi) + +# Setup some shortcuts so that silent mode is silent like it should be +ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS)) +export MAKE_IS_SILENT=n +SECHO=@echo +else +export MAKE_IS_SILENT=y +SECHO=-@false +endif #-------------------------------------------------------- # Arch specific compiler optimization stuff should go here. @@ -116,8 +127,7 @@ check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; # for OPTIMIZATION... # use '-Os' optimization if available, else use -O2 -OPTIMIZATION= -OPTIMIZATION=${call check_gcc,-Os,-O2} +OPTIMIZATION:=$(call check_gcc,-Os,-O2) # Some nice architecture specific optimizations ifeq ($(strip $(TARGET_ARCH)),arm) @@ -129,7 +139,7 @@ ifeq ($(strip $(TARGET_ARCH)),i386) OPTIMIZATION+=$(call check_gcc,-falign-functions=0 -falign-jumps=0 -falign-loops=0,\ -malign-functions=0 -malign-jumps=0 -malign-loops=0) endif -OPTIMIZATIONS=$(OPTIMIZATION) -fomit-frame-pointer +OPTIMIZATIONS:=$(OPTIMIZATION) -fomit-frame-pointer # #-------------------------------------------------------- @@ -138,31 +148,31 @@ OPTIMIZATIONS=$(OPTIMIZATION) -fomit-frame-pointer # by itself, instead of following it by the same half-dozen overrides # every time. The stuff below, on the other hand, is probably less # prone to casual user adjustment. -# +# -ifeq ($(strip $(DOLFS)),y) +ifeq ($(strip $(CONFIG_LFS)),y) # For large file summit support CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif -ifeq ($(strip $(DODMALLOC)),y) +ifeq ($(strip $(CONFIG_DMALLOC)),y) # For testing mem leaks with dmalloc CFLAGS+=-DDMALLOC LIBRARIES:=-ldmalloc else - ifeq ($(strip $(DOEFENCE)),y) + ifeq ($(strip $(CONFIG_EFENCE)),y) LIBRARIES:=-lefence endif endif -ifeq ($(strip $(DODEBUG)),y) +ifeq ($(strip $(CONFIG_DEBUG)),y) CFLAGS +=$(WARNINGS) -g -D_GNU_SOURCE LDFLAGS +=-Wl,-warn-common STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging else CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG - LDFLAGS += -s -Wl,-warn-common - STRIPCMD:=$(STRIP) --remove-section=.note --remove-section=.comment + LDFLAGS += -Wl,-warn-common + STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment endif -ifeq ($(strip $(DOSTATIC)),y) +ifeq ($(strip $(CONFIG_STATIC)),y) LDFLAGS += --static endif @@ -190,23 +200,4 @@ endif # have a chance of winning. CFLAGS += $(CFLAGS_EXTRA) -%.o: %.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< - -ifdef _FASTDEP_ALL_SUB_DIRS -fastdep: dummy - $(TOPDIR)scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS_nostdinc) -- $(wildcard *.[chS]) > .depend -ifdef ALL_SUB_DIRS - $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)" -endif - -$(patsubst %,_sfdep_%,$(_FASTDEP_ALL_SUB_DIRS)): - $(MAKE) -C $(patsubst _sfdep_%,%,$@) fastdep -endif - .PHONY: dummy - - - -.EXPORT_ALL_VARIABLES: -