Index: scripts/config/Makefile =================================================================== --- scripts/config/Makefile (revision 14650) +++ scripts/config/Makefile (working copy) @@ -2,8 +2,12 @@ # # Copyright (C) 2002 Erik Andersen +ifndef top_srcdir top_srcdir=../.. +endif +ifndef top_builddir top_builddir=../.. +endif srcdir=$(top_srcdir)/scripts/config include $(top_srcdir)/Rules.mak @@ -50,12 +54,10 @@ MCONF_OBJS = $(patsubst %.c,%.o, $(MCO SHARED_OBJS = $(patsubst %.c,%.o, $(SHARED_SRC)) conf: $(CONF_OBJS) $(SHARED_OBJS) - $(SECHO) " "HOSTCC $@ ; true - $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ + $(do_link.h) mconf: $(MCONF_OBJS) $(SHARED_OBJS) - $(SECHO) " "HOSTCC $@ ; true - $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS) + $(do_link.h) $(LIBS) $(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS) $(compile.h) -I. Index: networking/Makefile.in =================================================================== --- networking/Makefile.in (revision 14650) +++ networking/Makefile.in (working copy) @@ -4,13 +4,9 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -NETWORKING_AR:=networking.a -ifndef $(NETWORKING_DIR) -NETWORKING_DIR:=$(top_builddir)/networking/ -endif -srcdir=$(top_srcdir)/networking +srcdir:=$(top_srcdir)/networking +objdir:=$(top_builddir)/networking -NETWORKING-y:= NETWORKING-$(CONFIG_ARPING) += arping.o NETWORKING-$(CONFIG_DNSD) += dnsd.o NETWORKING-$(CONFIG_ETHER_WAKE) += ether-wake.o @@ -44,8 +40,11 @@ NETWORKING-$(CONFIG_WGET) += wge NETWORKING-$(CONFIG_ZCIP) += zcip.o NETWORKING-y:=$(sort $(NETWORKING-y)) -ifneq ($(strip $(NETWORKING-y)),) -libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR) + +needcrypt-y:= +needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y +ifeq ($(needcrypt-y),y) + LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) endif NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y)) @@ -56,15 +55,9 @@ APPLET_SRC-a+=$(NETWORKING_SRC-a) LIBRARY_DEFINE-y+= -I$(top_srcdir)/networking LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking -needcrypt-y:= -needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y - -ifeq ($(needcrypt-y),y) - LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) -endif +networking_OBJ:= $(patsubst %,$(objdir)/%,$(NETWORKING-y)) -$(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) - $(do_ar) +$(networking_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/networking.a: $(networking_OBJ) +libraries-y:=$(libraries-y) $(objdir)/networking.a -$(NETWORKING_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: networking/libiproute/Makefile.in =================================================================== --- networking/libiproute/Makefile.in (revision 14650) +++ networking/libiproute/Makefile.in (working copy) @@ -3,81 +3,71 @@ # Copyright (C) 1999-2004 by Erik Andersen # # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -# -LIBIPROUTE_AR:=libiproute.a -ifndef $(LIBIPROUTE_DIR) -LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute -endif -srcdir=$(top_srcdir)/networking/libiproute +srcdir:=$(top_srcdir)/networking/libiproute +objdir:=$(top_builddir)/networking/libiproute -LIBIPROUTE-y:= LIBIPROUTE-$(CONFIG_IP) += \ - ip_parse_common_args.o \ - ipaddress.o \ - iplink.o \ - iproute.o \ - iptunnel.o \ - libnetlink.o \ - ll_addr.o \ - ll_map.o \ - ll_proto.o \ - ll_types.o \ - rt_names.o \ - rtm_map.o \ - utils.o + ip_parse_common_args \ + ipaddress \ + iplink \ + iproute \ + iptunnel \ + libnetlink \ + ll_addr \ + ll_map \ + ll_proto \ + ll_types \ + rt_names \ + rtm_map \ + utils LIBIPROUTE-$(CONFIG_IPADDR) += \ - ip_parse_common_args.o \ - ipaddress.o \ - libnetlink.o \ - ll_addr.o \ - ll_map.o \ - ll_types.o \ - rt_names.o \ - utils.o + ip_parse_common_args \ + ipaddress \ + libnetlink \ + ll_addr \ + ll_map \ + ll_types \ + rt_names \ + utils LIBIPROUTE-$(CONFIG_IPLINK) += \ - ip_parse_common_args.o \ - ipaddress.o \ - iplink.o \ - libnetlink.o \ - ll_addr.o \ - ll_map.o \ - ll_types.o \ - rt_names.o \ - utils.o + ip_parse_common_args \ + ipaddress \ + iplink \ + libnetlink \ + ll_addr \ + ll_map \ + ll_types \ + rt_names \ + utils LIBIPROUTE-$(CONFIG_IPROUTE) += \ - ip_parse_common_args.o \ - iproute.o \ - libnetlink.o \ - ll_map.o \ - rt_names.o \ - rtm_map.o \ - utils.o + ip_parse_common_args \ + iproute \ + libnetlink \ + ll_map \ + rt_names \ + rtm_map \ + utils LIBIPROUTE-$(CONFIG_IPTUNNEL) += \ - ip_parse_common_args.o \ - iptunnel.o \ - rt_names.o \ - utils.o + ip_parse_common_args \ + iptunnel \ + rt_names \ + utils LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y)) -LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBIPROUTE-y))) +LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBIPROUTE-y)) LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c) LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y) LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a) -LIBIPROUTE-obj:=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR) - -ifneq ($(strip $(LIBIPROUTE-y)),) -libraries-y+=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR) -endif +networking_libiproute_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBIPROUTE-y)) -$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)/%,$(LIBIPROUTE-y)) - $(do_ar) +$(networking_libiproute_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c +$(objdir)/libiproute.a: $(networking_libiproute_OBJ$(os)) +libraries-y:=$(libraries-y) $(objdir)/libiproute.a -$(LIBIPROUTE_DIR)/%.o: $(srcdir)/%.c - $(compile.c) Index: archival/Makefile.in =================================================================== --- archival/Makefile.in (revision 14650) +++ archival/Makefile.in (working copy) @@ -4,14 +4,9 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -ARCHIVAL_AR:=archival.a -ifndef $(ARCHIVAL_DIR) -ARCHIVAL_DIR:=$(top_builddir)/archival/ -endif -srcdir=$(top_srcdir)/archival +srcdir:=$(top_srcdir)/archival +objdir:=$(top_builddir)/archival -ARCHIVAL-y:= -ARCHIVAL-$(CONFIG_APT_GET) += ARCHIVAL-$(CONFIG_AR) += ar.o ARCHIVAL-$(CONFIG_BUNZIP2) += bunzip2.o ARCHIVAL-$(CONFIG_UNLZMA) += unlzma.o @@ -26,17 +21,14 @@ ARCHIVAL-$(CONFIG_TAR) += tar.o ARCHIVAL-$(CONFIG_UNCOMPRESS) += uncompress.o ARCHIVAL-$(CONFIG_UNZIP) += unzip.o -ifneq ($(strip $(ARCHIVAL-y)),) -libraries-y+=$(ARCHIVAL_DIR)$(ARCHIVAL_AR) -endif - ARCHIVAL_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(ARCHIVAL-y)) ARCHIVAL_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(ARCHIVAL_SRC-y) APPLET_SRC-a+=$(ARCHIVAL_SRC-a) -$(ARCHIVAL_DIR)$(ARCHIVAL_AR): $(patsubst %,$(ARCHIVAL_DIR)%, $(ARCHIVAL-y)) - $(do_ar) +archival_OBJ:= $(patsubst %,$(objdir)/%,$(ARCHIVAL-y)) + +$(archival_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/archival.a: $(archival_OBJ) +libraries-y:=$(libraries-y) $(objdir)/archival.a -$(ARCHIVAL_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: archival/libunarchive/Makefile.in =================================================================== --- archival/libunarchive/Makefile.in (revision 14650) +++ archival/libunarchive/Makefile.in (working copy) @@ -4,80 +4,74 @@ # # Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -LIBUNARCHIVE_AR:=libunarchive.a -ifndef $(LIBUNARCHIVE_DIR) -LIBUNARCHIVE_DIR:=$(top_builddir)/archival/libunarchive -endif -srcdir=$(top_srcdir)/archival/libunarchive - -LIBUNARCHIVE-obj:=$(LIBUNARCHIVE_DIR)/$(LIBUNARCHIVE_AR) - -libraries-y+=$(LIBUNARCHIVE-obj) +srcdir:=$(top_srcdir)/archival/libunarchive +objdir:=$(top_builddir)/archival/libunarchive LIBUNARCHIVE-y:= \ \ - data_skip.o \ - data_extract_all.o \ - data_extract_to_stdout.o \ - data_extract_to_buffer.o \ + data_skip \ + data_extract_all \ + data_extract_to_stdout \ + data_extract_to_buffer \ \ - filter_accept_all.o \ - filter_accept_list.o \ - filter_accept_reject_list.o \ + filter_accept_all \ + filter_accept_list \ + filter_accept_reject_list \ \ - header_skip.o \ - header_list.o \ - header_verbose_list.o \ + header_skip \ + header_list \ + header_verbose_list \ \ - archive_xread_all.o \ - archive_xread_all_eof.o \ + archive_xread_all \ + archive_xread_all_eof \ \ - seek_by_char.o \ - seek_by_jump.o \ + seek_by_char \ + seek_by_jump \ \ - data_align.o \ - find_list_entry.o \ - open_transformer.o \ - init_handle.o + data_align \ + find_list_entry \ + open_transformer \ + init_handle -GUNZIP_FILES:= check_header_gzip.o decompress_unzip.o +GUNZIP_FILES:= check_header_gzip decompress_unzip DPKG_FILES:= \ - get_header_ar.o \ - unpack_ar_archive.o \ - get_header_tar.o \ - filter_accept_list_reassign.o + get_header_ar \ + unpack_ar_archive \ + get_header_tar \ + filter_accept_list_reassign -LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar.o unpack_ar_archive.o -LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2.o -LIBUNARCHIVE-$(CONFIG_UNLZMA) += decompress_unlzma.o -LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio.o +LIBUNARCHIVE-$(CONFIG_AR) += get_header_ar unpack_ar_archive +LIBUNARCHIVE-$(CONFIG_BUNZIP2) += decompress_bunzip2 +LIBUNARCHIVE-$(CONFIG_UNLZMA) += decompress_unlzma +LIBUNARCHIVE-$(CONFIG_CPIO) += get_header_cpio LIBUNARCHIVE-$(CONFIG_DPKG) += $(DPKG_FILES) LIBUNARCHIVE-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) -LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o -LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o -LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o +LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz +LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2 get_header_tar_bz2 +LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma get_header_tar_lzma LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) -LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o -LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o -LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o -LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o -LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o -LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o -LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o -LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o -LIBUNARCHIVE-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o +LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress +LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio +LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio +LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar +LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2 get_header_tar_bz2 +LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma get_header_tar_lzma +LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz +LIBUNARCHIVE-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress +LIBUNARCHIVE-$(CONFIG_UNCOMPRESS) += decompress_uncompress LIBUNARCHIVE-$(CONFIG_UNZIP) += $(GUNZIP_FILES) LIBUNARCHIVE-y:=$(sort $(LIBUNARCHIVE-y)) -LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBUNARCHIVE-y))) +LIBUNARCHIVE_SRC-y:=$(patsubst %,$(srcdir)/%.c,$(LIBUNARCHIVE-y)) LIBUNARCHIVE_SRC-a:=$(wildcard $(srcdir)/*.c) LIBRARY_SRC-y+=$(LIBUNARCHIVE_SRC-y) LIBRARY_SRC-a+=$(LIBUNARCHIVE_SRC-a) -$(LIBUNARCHIVE_DIR)/$(LIBUNARCHIVE_AR): $(patsubst %,$(LIBUNARCHIVE_DIR)/%,$(LIBUNARCHIVE-y)) - $(do_ar) +archival_libunarchive_OBJ$(os):=$(patsubst %,$(objdir)/%$(os),$(LIBUNARCHIVE-y)) + +$(archival_libunarchive_OBJ$(os)): $(objdir)/%$(os): $(srcdir)/%.c +$(objdir)/libunarchive.a: $(archival_libunarchive_OBJ$(os)) +libraries-y:=$(libraries-y) $(objdir)/libunarchive.a -$(LIBUNARCHIVE_DIR)/%.o: $(srcdir)/%.c - $(compile.c) Index: sysklogd/Makefile.in =================================================================== --- sysklogd/Makefile.in (revision 14650) +++ sysklogd/Makefile.in (working copy) @@ -4,29 +4,23 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -SYSKLOGD_AR:=sysklogd.a -ifndef $(SYSKLOGD_DIR) -SYSKLOGD_DIR:=$(top_builddir)/sysklogd/ -endif -srcdir=$(top_srcdir)/sysklogd +srcdir:=$(top_srcdir)/sysklogd +objdir:=$(top_builddir)/sysklogd -SYSKLOGD-y:= SYSKLOGD-$(CONFIG_KLOGD) += klogd.o SYSKLOGD-$(CONFIG_LOGGER) += logger.o SYSKLOGD-$(CONFIG_LOGREAD) += logread.o SYSKLOGD-$(CONFIG_SYSLOGD) += syslogd.o -ifneq ($(strip $(SYSKLOGD-y)),) -libraries-y+=$(SYSKLOGD_DIR)$(SYSKLOGD_AR) -endif SYSKLOGD_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(SYSKLOGD-y)) SYSKLOGD_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(SYSKLOGD_SRC-y) APPLET_SRC-a+=$(SYSKLOGD_SRC-a) -$(SYSKLOGD_DIR)$(SYSKLOGD_AR): $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y)) - $(do_ar) +sysklogd_OBJ:= $(patsubst %,$(objdir)/%,$(SYSKLOGD-y)) + +$(sysklogd_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/sysklogd.a: $(sysklogd_OBJ) +libraries-y:=$(libraries-y) $(objdir)/sysklogd.a -$(SYSKLOGD_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: modutils/Makefile.in =================================================================== --- modutils/Makefile.in (revision 14650) +++ modutils/Makefile.in (working copy) @@ -4,29 +4,22 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -MODUTILS_AR:=modutils.a -ifndef $(MODUTILS_DIR) -MODUTILS_DIR:=$(top_builddir)/modutils/ -endif -srcdir=$(top_srcdir)/modutils +srcdir:=$(top_srcdir)/modutils +objdir:=$(top_builddir)/modutils -MODUTILS-y:= MODUTILS-$(CONFIG_INSMOD) += insmod.o MODUTILS-$(CONFIG_LSMOD) += lsmod.o MODUTILS-$(CONFIG_MODPROBE) += modprobe.o MODUTILS-$(CONFIG_RMMOD) += rmmod.o -ifneq ($(strip $(MODUTILS-y)),) -libraries-y+=$(MODUTILS_DIR)$(MODUTILS_AR) -endif - MODUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(MODUTILS-y)) MODUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(MODUTILS_SRC-y) APPLET_SRC-a+=$(MODUTILS_SRC-a) -$(MODUTILS_DIR)$(MODUTILS_AR): $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y)) - $(do_ar) +modutils_OBJ:= $(patsubst %,$(objdir)/%,$(MODUTILS-y)) + +$(modutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/modutils.a: $(modutils_OBJ) +libraries-y:=$(libraries-y) $(objdir)/modutils.a -$(MODUTILS_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: console-tools/Makefile.in =================================================================== --- console-tools/Makefile.in (revision 14650) +++ console-tools/Makefile.in (working copy) @@ -4,34 +4,29 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -CONSOLETOOLS_AR:=console-tools.a -ifndef $(CONSOLETOOLS_DIR) -CONSOLETOOLS_DIR:=$(top_builddir)/console-tools/ -endif -srcdir=$(top_srcdir)/console-tools +srcdir:=$(top_srcdir)/console-tools +objdir:=$(top_builddir)/console-tools -CONSOLETOOLS-y:= CONSOLETOOLS-$(CONFIG_CHVT) += chvt.o -CONSOLETOOLS-$(CONFIG_CLEAR) += clear.o +CONSOLETOOLS-$(CONFIG_CLEAR) += clear.o CONSOLETOOLS-$(CONFIG_DEALLOCVT) += deallocvt.o -CONSOLETOOLS-$(CONFIG_DUMPKMAP) += dumpkmap.o +CONSOLETOOLS-$(CONFIG_DUMPKMAP) += dumpkmap.o CONSOLETOOLS-$(CONFIG_SETCONSOLE) += setconsole.o -CONSOLETOOLS-$(CONFIG_LOADFONT) += loadfont.o -CONSOLETOOLS-$(CONFIG_LOADKMAP) += loadkmap.o -CONSOLETOOLS-$(CONFIG_OPENVT) += openvt.o -CONSOLETOOLS-$(CONFIG_RESET) += reset.o +CONSOLETOOLS-$(CONFIG_LOADFONT) += loadfont.o +CONSOLETOOLS-$(CONFIG_LOADKMAP) += loadkmap.o +CONSOLETOOLS-$(CONFIG_OPENVT) += openvt.o +CONSOLETOOLS-$(CONFIG_RESET) += reset.o CONSOLETOOLS-$(CONFIG_SETKEYCODES) += setkeycodes.o -ifneq ($(strip $(CONSOLETOOLS-y)),) -libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR) -endif + CONSOLETOOLS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(CONSOLETOOLS-y)) CONSOLETOOLS_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(CONSOLETOOLS_SRC-y) APPLET_SRC-a+=$(CONSOLETOOLS_SRC-a) -$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR): $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS-y)) - $(do_ar) +console-tools_OBJ:= $(patsubst %,$(objdir)/%,$(CONSOLETOOLS-y)) + +$(console-tools_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/console-tools.a: $(console-tools_OBJ) +libraries-y:=$(libraries-y) $(objdir)/console-tools.a -$(CONSOLETOOLS_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: Rules.mak =================================================================== --- Rules.mak (revision 14650) +++ Rules.mak (working copy) @@ -10,6 +10,10 @@ ifeq ($(filter $(noconfig_targets),$(MAK -include $(top_builddir)/.config endif +ifeq ($(HAVE_DOT_CONFIG),y) +rules-mak-rules:=0 +endif + #-------------------------------------------------------- PROG := busybox MAJOR_VERSION :=1 @@ -30,8 +34,9 @@ BUILDTIME := $(shell TZ=UTC date -u "+%Y # If you are running a cross compiler, you will want to set 'CROSS' # to something more interesting... Target architecture is determined # 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 +# your compiler is broken, you should not need to specify __TARGET_ARCH CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) +#") CC = $(CROSS)gcc AR = $(CROSS)ar AS = $(CROSS)as @@ -40,7 +45,18 @@ NM = $(CROSS)nm STRIP = $(CROSS)strip CPP = $(CC) -E SED ?= sed +AWK ?= awk + + +ifdef PACKAGE_BE_VERBOSE +PACKAGE_BE_VERBOSE := $(shell echo $(PACKAGE_BE_VERBOSE) | $(SED) "s/[[:alpha:]]*//g") +endif +# for make V=3 and above make $(shell) invocations verbose +ifeq ($(if $(strip $(PACKAGE_BE_VERBOSE)),$(shell test $(PACKAGE_BE_VERBOSE) -gt 2 ; echo $$?),1),0) + SHELL+=-x + MKDEP_ARGS:=-w +endif # What OS are you compiling busybox for? This allows you to include # OS specific things, syscall overrides, etc. @@ -53,10 +69,21 @@ HOSTCFLAGS= -Wall -Wstrict-prototypes -O # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. LC_ALL:= C +# initialize flags here +CFLAGS:= +CFLAGS_COMBINE:= +CFLAGS_PIC:= +LD_FLAGS:= +LIB_LDFLAGS:= +PROG_LDFLAGS:= +PROG_CFLAGS:= +OPTIMIZATIONS:= + # 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. +# For optimization overrides, it's better still to set OPTIMIZATIONS. CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) +#") # To compile vs some other alternative libc, you may need to use/adjust # the following lines to meet your needs... @@ -73,20 +100,50 @@ CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") WARNINGS=-Wall -Wstrict-prototypes -Wshadow -CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) +CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include ARFLAGS=cru + +# Get the CC MAJOR/MINOR version # gcc centric. Perhaps fiddle with findstring gcc,$(CC) for the rest -# get the CC MAJOR/MINOR version CC_MAJOR:=$(shell printf "%02d" $(shell echo __GNUC__ | $(CC) -E -xc - | tail -n 1)) CC_MINOR:=$(shell printf "%02d" $(shell echo __GNUC_MINOR__ | $(CC) -E -xc - | tail -n 1)) +# Note: spaces are significant here! +# Check if CC version is equal to given MAJOR,MINOR. Returns empty if false. +define cc_eq +$(shell [ $(CC_MAJOR) -eq $(1) -a $(CC_MINOR) -eq $(2) ] && echo y) +endef +# Check if CC version is greater or equal than given MAJOR,MINOR +define cc_ge +$(shell [ $(CC_MAJOR) -ge $(1) -a $(CC_MINOR) -ge $(2) ] && echo y) +endef +# Check if CC version is less or equal than given MAJOR,MINOR +define cc_le +$(shell [ $(CC_MAJOR) -le $(1) -a $(CC_MINOR) -le $(2) ] && echo y) +endef + +# Workaround bugs in make-3.80 for eval in conditionals +define is_eq +$(shell [ $(1) = $(2) ] 2> /dev/null && echo y) +endef +define is_neq +$(shell [ $(1) != $(2) ] 2> /dev/null && echo y) +endef + #-------------------------------------------------------- export VERSION BUILDTIME HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP -ifeq ($(strip $(TARGET_ARCH)),) -TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ + +# TARGET_ARCH and TARGET_MACH will be passed verbatim to CC with recent +# versions of make, so we use __TARGET_ARCH here. +# Current builtin rules looks like that: +# COMPILE.s = $(AS) $(ASFLAGS) $(TARGET_MACH) +# COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c + +ifeq ($(strip $(__TARGET_ARCH)),) +__TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/g' \ @@ -100,71 +157,60 @@ TARGET_ARCH:=$(shell $(CC) -dumpmachine ) endif -# A nifty macro to make testing gcc features easier -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) - -# A not very robust macro to check for available ld flags -check_ld=$(shell \ - if [ "x$(1)" != "x" ]; then \ - $(LD) --help | grep -q "\$(1)" && echo "-Wl,$(1)" ; \ - fi) - -CFLAGS+=$(call check_gcc,-funsigned-char,) - -CFLAGS+=$(call check_gcc,-mmax-stack-frame=256,) +CFLAGS+=$(call check_gcc,CFLAGS,-funsigned-char,) +CFLAGS+=$(call check_gcc,CFLAGS,-mmax-stack-frame=256,) #-------------------------------------------------------- # Arch specific compiler optimization stuff should go here. # Unless you want to override the defaults, do not set anything -# for OPTIMIZATION... +# for OPTIMIZATIONS... # use '-Os' optimization if available, else use -O2 -OPTIMIZATION:=$(call check_gcc,-Os,-O2) +OPTIMIZATIONS+=$(call check_gcc,OPTIMIZATIONS,-Os,-O2) -ifeq ($(CONFIG_BUILD_AT_ONCE),y) # gcc 2.95 exits with 0 for "unrecognized option" -ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 3 ] ; echo $$?)),0) - CFLAGS_COMBINE:=$(call check_gcc,--combine,) -endif -OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,) +CFLAGS_COMBINE+=$(if $(call is_eq,$(CONFIG_BUILD_AT_ONCE),y),\ + $(if $(call cc_ge,3,0),\ + $(call check_gcc,CFLAGS_COMBINE,--combine,))) + +OPTIMIZATIONS+=$(if $(call is_eq,$(CONFIG_BUILD_AT_ONCE),y),\ + $(call check_gcc,OPTIMIZATIONS,-funit-at-a-time,)) + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25795 -#PROG_CFLAGS+=$(call check_gcc,-fwhole-program,) -endif # CONFIG_BUILD_AT_ONCE +#PROG_CFLAGS+=$(if $(call is_eq,$(CONFIG_BUILD_AT_ONCE),y),\ +# $(call check_gcc,PROG_CFLAGS,-fwhole-program,)) -LIB_LDFLAGS:=$(call check_ld,--enable-new-dtags,) -#LIB_LDFLAGS+=$(call check_ld,--reduce-memory-overheads,) -#LIB_LDFLAGS+=$(call check_ld,--as-needed,) -#LIB_LDFLAGS+=$(call check_ld,--warn-shared-textrel,) +LIB_LDFLAGS+=$(call check_ld,LIB_LDFLAGS,--enable-new-dtags,) +#LIB_LDFLAGS+=$(call check_ld,LIB_LDFLAGS,--reduce-memory-overheads,) +#LIB_LDFLAGS+=$(call check_ld,LIB_LDFLAGS,--as-needed,) +#LIB_LDFLAGS+=$(call check_ld,LIB_LDFLAGS,--warn-shared-textrel,) +PROG_LDFLAGS+=$(call check_ld,PROG_LDFLAGS,--gc-sections,) # Some nice architecture specific optimizations -ifeq ($(strip $(TARGET_ARCH)),arm) - OPTIMIZATION+=-fstrict-aliasing -endif -ifeq ($(strip $(TARGET_ARCH)),i386) - OPTIMIZATION+=$(call check_gcc,-march=i386,) +ifeq ($(__TARGET_ARCH),arm) + OPTIMIZATIONS+=-fstrict-aliasing +endif # arm + +OPTIMIZATIONS+=$(if $(call is_eq,$(__TARGET_ARCH),i386),\ + $(call check_gcc,OPTIMIZATIONS,-march=i386,)) + # gcc-4.0 and older seem to benefit from these -#ifneq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0) - OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=2,) - OPTIMIZATION+=$(call check_gcc,-falign-functions=1 -falign-jumps=1 -falign-loops=1,\ - -malign-functions=0 -malign-jumps=0 -malign-loops=0) -#endif # gcc-4.0 and older +OPTIMIZATIONS+=$(if $(call cc_le,4,0),\ + $(call check_gcc,OPTIMIZATIONS,-mpreferred-stack-boundary=2,)\ + $(call check_gcc,OPTIMIZATIONS,-falign-functions=1 -falign-jumps=1 -falign-loops=1,\ + -malign-functions=0 -malign-jumps=0 -malign-loops=0)) # gcc-4.1 and beyond seem to benefit from these -ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0) - # turn off flags which hurt -Os - OPTIMIZATION+=$(call check_gcc,-fno-tree-loop-optimize,) - OPTIMIZATION+=$(call check_gcc,-fno-tree-dominator-opts,) - OPTIMIZATION+=$(call check_gcc,-fno-strength-reduce,) +# turn off flags which hurt -Os +OPTIMIZATIONS+=$(if $(call cc_ge,4,1),\ + $(call check_gcc,OPTIMIZATIONS,-fno-tree-loop-optimize,)\ + $(call check_gcc,OPTIMIZATIONS,-fno-tree-dominator-opts,)\ + $(call check_gcc,OPTIMIZATIONS,-fno-strength-reduce,)\ +\ + $(call check_gcc,OPTIMIZATIONS,-fno-branch-count-reg,)) - OPTIMIZATION+=$(call check_gcc,-fno-branch-count-reg,) -endif # gcc-4.1 and beyond -endif -OPTIMIZATIONS:=$(OPTIMIZATION) $(call check_gcc,-fomit-frame-pointer,) +OPTIMIZATIONS+=$(call check_gcc,OPTIMIZATIONS,-fomit-frame-pointer,) # #-------------------------------------------------------- @@ -175,41 +221,38 @@ OPTIMIZATIONS:=$(OPTIMIZATION) $(call ch # prone to casual user adjustment. # -ifeq ($(strip $(CONFIG_LFS)),y) +ifeq ($(CONFIG_LFS),y) # For large file summit support CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif -ifeq ($(strip $(CONFIG_DMALLOC)),y) +ifeq ($(CONFIG_DMALLOC),y) # For testing mem leaks with dmalloc - CFLAGS+=-DDMALLOC + CFLAGS+=-DDMALLOC -DDMALLOC_FUNC_CHECK LIBRARIES:=-ldmalloc else - ifeq ($(strip $(CONFIG_EFENCE)),y) + ifeq ($(CONFIG_EFENCE),y) LIBRARIES:=-lefence endif endif -ifeq ($(strip $(CONFIG_DEBUG)),y) + +LDFLAGS+=$(if $(call is_eq,$(CONFIG_DEBUG),y),$(call check_ld,LDFLAGS,--warn-common,)$(call check_ld,LDFLAGS,--sort-common,)) +ifeq ($(CONFIG_DEBUG),y) CFLAGS +=$(WARNINGS) -g -D_GNU_SOURCE - LDFLAGS += $(call check_ld,--warn-common,) else CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG - LDFLAGS += $(call check_ld,--warn-common,) - LDFLAGS += $(call check_ld,--sort-common,) endif STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment -ifeq ($(strip $(CONFIG_STATIC)),y) - PROG_CFLAGS += $(call check_gcc,-static,) -endif -CFLAGS_SHARED += $(call check_gcc,-shared,) -LIB_CFLAGS+=$(CFLAGS_SHARED) +PROG_CFLAGS+=$(if $(call is_eq,$(CONFIG_STATIC),y),\ + $(call check_gcc,PROG_CFLAGS,-static,)) -ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) - CFLAGS_PIC:= $(call check_gcc,-fPIC,) - LIB_CFLAGS+=$(CFLAGS_PIC) -endif +CFLAGS_SHARED+=$(call check_gcc,CFLAGS_SHARED,-shared,) +LIB_CFLAGS+=$(CFLAGS_SHARED) +CFLAGS_PIC+=$(if $(call is_eq,$(CONFIG_BUILD_LIBBUSYBOX),y),\ + $(call check_gcc,CFLAGS_PIC,-fPIC,)) +LIB_CFLAGS+=$(CFLAGS_PIC) -ifeq ($(strip $(CONFIG_SELINUX)),y) +ifeq ($(CONFIG_SELINUX),y) LIBRARIES += -lselinux endif @@ -217,14 +260,6 @@ ifeq ($(strip $(PREFIX)),) PREFIX:=`pwd`/_install endif -# Additional complications due to support for pristine source dir. -# Include files in the build directory should take precedence over -# the copy in top_srcdir, both during the compilation phase and the -# shell script that finds the list of object files. -# Work in progress by . - - -OBJECTS:=$(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o CFLAGS += $(CROSS_CFLAGS) ifdef BB_INIT_SCRIPT CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"' @@ -246,59 +281,117 @@ ifeq ($(strip $(CONFIG_INSTALL_APPLET_DO INSTALL_OPTS= endif + +#------------------------------------------------------------ +# object extensions + +# object potentially used in shared object +ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) +# single-object extension +os:=.os +# multi-object extension +om:=.osm +else +os:=.o +om:=.om +endif + #------------------------------------------------------------ # Make the output nice and tight -MAKEFLAGS += --no-print-directory + +# for make V=2 and above, do print directory +ifneq ($(shell test -n "$(strip $(PACKAGE_BE_VERBOSE))" && test $(PACKAGE_BE_VERBOSE) -gt 1 ; echo $$?),0) + MAKEFLAGS += --no-print-directory +endif + +export MAKEOVERRIDES export MAKE_IS_SILENT=n ifneq ($(findstring s,$(MAKEFLAGS)),) export MAKE_IS_SILENT=y -SECHO := @-false DISP := sil Q := @ else ifneq ($(V)$(VERBOSE),) -SECHO := @-false DISP := ver Q := else -SECHO := @echo DISP := pur Q := @ endif endif -show_objs = $(subst $(top_builddir)/,,$(subst ../,,$@)) -pur_disp_compile.c = echo " "CC $(show_objs) -pur_disp_compile.h = echo " "HOSTCC $(show_objs) -pur_disp_strip = echo " "STRIP $(show_objs) -pur_disp_link = echo " "LINK $(show_objs) -pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs) -sil_disp_compile.c = true -sil_disp_compile.h = true -sil_disp_strip = true -sil_disp_link = true -sil_disp_ar = true -ver_disp_compile.c = echo $(cmd_compile.c) -ver_disp_compile.h = echo $(cmd_compile.h) -ver_disp_strip = echo $(cmd_strip) -ver_disp_link = echo $(cmd_link) -ver_disp_ar = echo $(cmd_ar) +define show_objs + $(subst $(top_builddir)/,,$(subst ../,,$@)) +endef +pur_disp_compile.c = @echo " "CC $(show_objs) ; +pur_disp_compile.h = @echo " "HOSTCC $(show_objs) ; +pur_disp_strip = @echo " "STRIP $(show_objs) ; +pur_disp_link = @echo " "LINK $(show_objs) ; +pur_disp_link.h = @echo " "HOSTLINK $(show_objs) ; +pur_disp_ar = @echo " "AR $(ARFLAGS) $(show_objs) ; +pur_disp_gen = @echo " "GEN $@ ; +pur_disp_doc = @echo " "DOC $(subst docs/,,$@) ; +pur_disp_bin = @echo " "BIN $(show_objs) ; +sil_disp_compile.c = @ +sil_disp_compile.h = @ +sil_disp_strip = @ +sil_disp_link = @ +sil_disp_link.h = @ +sil_disp_ar = @ +sil_disp_gen = @ +sil_disp_doc = @ +sil_disp_bin = @ +ver_disp_compile.c = +ver_disp_compile.h = +ver_disp_strip = +ver_disp_link = +ver_disp_link.h = +ver_disp_ar = +ver_disp_gen = +ver_disp_doc = +ver_disp_bin = disp_compile.c = $($(DISP)_disp_compile.c) disp_compile.h = $($(DISP)_disp_compile.h) disp_strip = $($(DISP)_disp_strip) disp_link = $($(DISP)_disp_link) +disp_link.h = $($(DISP)_disp_link.h) disp_ar = $($(DISP)_disp_ar) -disp_gen = $(SECHO) " "GEN $@ ; true -disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true -cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< +disp_gen = $($(DISP)_disp_gen) +disp_doc = $($(DISP)_disp_doc) +disp_bin = $($(DISP)_disp_bin) +# CFLAGS-dir == $(CFLAGS-$(notdir $(@D))) +# CFLAGS-dir-file.o == $(CFLAGS-$(notdir $(@D))-$(notdir $(@F))) +# CFLAGS-dir-file.c == $(CFLAGS-$(notdir $( /dev/null 2>&1 && echo y),$(2),$(if $(3),$(3))),$(if $(3),$(3))) +endef + +define check_ld +$(if $(2),$(if $(shell $(LD) $(2) -o /dev/null -b binary /dev/null > /dev/null 2>&1 && echo y),$(shell echo \-Wl,$(2)),$(if $(3),$(3))),$(if $(3),$(3))) +endef + +####################################################################### +# make-3.79.1 doesn't support order-only prerequisites.. +ifeq ($(MAKE_VERSION),3.79.1) +|: $(^) ; endif +####################################################################### -# All object directories. -OBJ_DIRS := $(DIRS) -all_tree := $(patsubst %,$(top_builddir)/%,$(OBJ_DIRS) scripts scripts/config include) -all_tree: $(all_tree) + + +# Handle building out of tree +ifneq ($(top_builddir),$(top_srcdir)) +all_tree := $(patsubst %,$(top_builddir)/%,$(DIRS) scripts scripts/config include include/config) $(all_tree): @mkdir -p "$@" -ifneq ($(KBUILD_OUTPUT),) -# Invoke a second make in the output directory, passing relevant variables -# Check that the output directory actually exists -saved-output := $(KBUILD_OUTPUT) -KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd) -$(if $(wildcard $(KBUILD_OUTPUT)),, \ - $(error output directory "$(saved-output)" does not exist)) +saved-output := $(PACKAGE_OUTPUTDIR) -.PHONY: $(MAKECMDGOALS) +$(if $(wildcard $(PACKAGE_OUTPUTDIR)),, \ + $(error output directory "$(saved-output)" does not exist)) -$(filter-out _all,$(MAKECMDGOALS)) _all: $(KBUILD_OUTPUT)/Rules.mak $(KBUILD_OUTPUT)/Makefile all_tree - $(Q)$(MAKE) -C $(KBUILD_OUTPUT) \ - top_srcdir=$(top_srcdir) \ - top_builddir=$(top_builddir) \ - KBUILD_SRC=$(top_srcdir) \ - -f $(CURDIR)/Makefile $@ +.PHONY: $(filter $(noconfig_targets),$(MAKECMDGOALS)) -$(KBUILD_OUTPUT)/Rules.mak: +$(PACKAGE_OUTPUTDIR)/Rules.mak: @echo > $@ @echo top_srcdir=$(top_srcdir) >> $@ - @echo top_builddir=$(KBUILD_OUTPUT) >> $@ - @echo include $(top_srcdir)/Rules.mak >> $@ + @echo top_builddir=$(PACKAGE_OUTPUTDIR) >> $@ + @echo include $$\(top_srcdir\)/Rules.mak >> $@ -$(KBUILD_OUTPUT)/Makefile: +$(PACKAGE_OUTPUTDIR)/Makefile: @echo > $@ @echo top_srcdir=$(top_srcdir) >> $@ - @echo top_builddir=$(KBUILD_OUTPUT) >> $@ - @echo KBUILD_SRC='$$(top_srcdir)' >> $@ - @echo include '$$(KBUILD_SRC)'/Makefile >> $@ + @echo top_builddir=$(PACKAGE_OUTPUTDIR) >> $@ + @echo PACKAGE_SOURCEDIR='$$(top_srcdir)' >> $@ + @echo include '$$(PACKAGE_SOURCEDIR)'/Makefile >> $@ -# Leave processing to above invocation of make -skip-makefile := 1 -endif # ifneq ($(KBUILD_OUTPUT),) -endif # ifeq ($(KBUILD_SRC),) -ifeq ($(skip-makefile),) +buildtree := $(all_tree) $(PACKAGE_OUTPUTDIR)/Rules.mak $(PACKAGE_OUTPUTDIR)/Makefile # We only need a copy of the Makefile for the config targets and reuse # the rest from the source directory, i.e. we do not cp ALL_MAKEFILES. -scripts/config/Makefile: $(top_srcdir)/scripts/config/Makefile - cp $< $@ +scripts/config/Makefile: $(top_srcdir)/scripts/config/Makefile | $(buildtree) + @cp $(top_srcdir)/scripts/config/Makefile $@ -_all: all +else +all_tree := include/config +$(all_tree): + @mkdir -p "$@" +buildtree := $(all_tree) +endif # ifneq ($(PACKAGE_OUTPUTDIR),$(top_srcdir)) help: @echo 'Cleaning:' @@ -137,37 +151,44 @@ help: @echo ' release - create a distribution tarball' @echo ' sizes - show size of all enabled busybox symbols' @echo + @echo 'Make flags:' + @echo ' V= - print verbose make output (default: unset)' + @echo ' 0 print CC invocations' + @echo ' 1' + @echo ' 2 also print when make enters a directory' + @echo ' 3 also verbosely print shell invocations' - -include $(top_srcdir)/Rules.mak +-include $(top_srcdir)/Rules.mak ifneq ($(strip $(HAVE_DOT_CONFIG)),y) - # Default target if none was requested explicitly -all: menuconfig +all: defconfig menuconfig ; +ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) # warn if no configuration exists and we are asked to build a non-config target .config: @echo "" @echo "No $(top_builddir)/$@ found!" - @echo "Please refer to 'make help', section Configuration." + @echo "Please refer to 'make help', section Configuration." @echo "" @exit 1 +else +# Avoid implicit rule to kick in by using an empty command +.config: $(buildtree) ; +endif +endif # ifneq ($(strip $(HAVE_DOT_CONFIG)),y) + # configuration # --------------------------------------------------------------------------- +CONFIG_CONFIG_IN = $(top_srcdir)/Config.in + scripts/config/conf: scripts/config/Makefile $(Q)$(MAKE) -C scripts/config conf - -@if [ ! -f .config ] ; then \ - touch .config; \ - fi scripts/config/mconf: scripts/config/Makefile $(Q)$(MAKE) -C scripts/config ncurses conf mconf - -@if [ ! -f .config ] ; then \ - touch .config; \ - fi menuconfig: scripts/config/mconf @[ -f .config ] || make $(MAKEFLAGS) defconfig @@ -199,7 +220,6 @@ defconfig: scripts/config/conf @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config @./scripts/config/conf -o $(CONFIG_CONFIG_IN) - allbareconfig: scripts/config/conf @./scripts/config/conf -y $(CONFIG_CONFIG_IN) @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG|STATIC|SELINUX|DEVFSD|NC_GAPING_SECURITY_HOLE|BUILD_AT_ONCE)).*/# \1 is not set/" .config @@ -207,19 +227,28 @@ allbareconfig: scripts/config/conf @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config @yes n | ./scripts/config/conf -o $(CONFIG_CONFIG_IN) -else # ifneq ($(strip $(HAVE_DOT_CONFIG)),y) - -all: busybox busybox.links doc +ifeq ($(strip $(HAVE_DOT_CONFIG)),y) -# In this section, we need .config +# Load all Config.in -include $(top_builddir)/.config.cmd -include $(patsubst %,%/Makefile.in, $(SRC_DIRS)) -endif # ifneq ($(strip $(HAVE_DOT_CONFIG)),y) +endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y) --include $(top_builddir)/.config +include $(patsubst %,%/Makefile.in,$(SRC_DIRS)) + +ifeq ($(strip $(HAVE_DOT_CONFIG)),y) +# Finally pull in the dependencies (headers and other includes) of the +# individual object files -include $(top_builddir)/.depend +$(top_builddir)/applets/applets.o: $(top_builddir)/.config +# Everything is set. + +all: busybox busybox.links doc ; + +# Two modes of operation: legacy and IMA +# Legacy mode builds each object through an individual invocation of CC +# IMA compiles all sources at once (aka IPO aka IPA etc.) ifeq ($(strip $(CONFIG_BUILD_AT_ONCE)),y) libraries-y:= @@ -240,17 +269,15 @@ else # CONFIG_BUILD_AT_ONCE # This was the old way the binary was built. libbusybox-obj:=archival/libunarchive/libunarchive.a \ networking/libiproute/libiproute.a \ - libpwdgrp/libpwdgrp.a \ - coreutils/libcoreutils/libcoreutils.a \ + libpwdgrp/libpwdgrp.a coreutils/libcoreutils/libcoreutils.a \ libbb/libbb.a libbusybox-obj:=$(patsubst %,$(top_builddir)/%,$(libbusybox-obj)) - ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y) # linking against libbusybox, so don't build the .a already contained in the .so libraries-y:=$(filter-out $(libbusybox-obj),$(libraries-y)) endif # CONFIG_FEATURE_SHARED_BUSYBOX -endif # CONFIG_BUILD_AT_ONCE +endif # CONFIG_BUILD_AT_ONCE ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) LD_LIBBUSYBOX:=libbusybox.so @@ -259,17 +286,21 @@ DO_INSTALL_LIBS:=$(LD_LIBBUSYBOX) \ $(LD_LIBBUSYBOX).$(MAJOR_VERSION) \ $(LD_LIBBUSYBOX).$(MAJOR_VERSION).$(MINOR_VERSION) +endif # CONFIG_BUILD_LIBBUSYBOX + ifeq ($(strip $(CONFIG_BUILD_AT_ONCE)),y) ifneq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y) -# --combine but not linking against libbusybox, so compile all +# --combine but not linking against libbusybox, so compile lib*.c BUSYBOX_SRC := $(LIBRARY_SRC) BUSYBOX_DEFINE:= $(LIBRARY_DEFINE) endif # !CONFIG_FEATURE_SHARED_BUSYBOX $(LIBBUSYBOX_SONAME): $(LIBRARY_SRC) else # CONFIG_BUILD_AT_ONCE $(LIBBUSYBOX_SONAME): $(libbusybox-obj) +AR_INTRO:=-Wl,--whole-archive +AR_EXTRO:=-Wl,--no-whole-archive endif # CONFIG_BUILD_AT_ONCE -endif # CONFIG_BUILD_LIBBUSYBOX + ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y) LDBUSYBOX:=-L$(top_builddir) -lbusybox @@ -284,20 +315,23 @@ endif -Wl,-soname=$(LD_LIBBUSYBOX).$(MAJOR_VERSION) \ -Wl,-z,combreloc $(LIB_LDFLAGS) \ -o $(@) \ - -Wl,--start-group -Wl,--whole-archive \ - $(LIBRARY_DEFINE) $(^) \ - -Wl,--no-whole-archive -Wl,--end-group + -Wl,--start-group \ + $(LIBRARY_DEFINE) $(AR_INTRO) $(^) $(AR_EXTRO) \ + -Wl,--end-group @rm -f $(DO_INSTALL_LIBS) @for i in $(DO_INSTALL_LIBS); do ln -s $(@) $$i ; done $(do_strip) endif # ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) -busybox_unstripped: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(libraries-y) +busybox_unstripped: $(top_builddir)/.depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(APPLET_SRC) $(libraries-y) $(do_link) $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) \ - -o $@ -Wl,--start-group \ + $(foreach f,$(^:.o=.c),$(CFLAGS-$(notdir $(patsubst %/$,%,$(dir $(f))))-$(notdir $(f)))) \ + $(CFLAGS-$(@)) \ + -o $@ -Wl,--start-group \ $(APPLETS_DEFINE) $(APPLET_SRC) \ - $(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \ + $(BUSYBOX_DEFINE) $(BUSYBOX_SRC) \ + $(libraries-y) \ $(LDBUSYBOX) $(LIBRARIES) \ -Wl,--end-group @@ -331,17 +365,6 @@ ifneq ($(strip $(DO_INSTALL_LIBS)),n) done endif -# see if we are in verbose mode -KBUILD_VERBOSE := -ifdef V - ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE := $(V) - endif -endif -ifneq ($(strip $(KBUILD_VERBOSE)),) - CHECK_VERBOSE := -v -# ARFLAGS+=v -endif check test: busybox bindir=$(top_builddir) srcdir=$(top_srcdir)/testsuite \ $(top_srcdir)/testsuite/runtest $(CHECK_VERBOSE) @@ -350,7 +373,7 @@ sizes: busybox_unstripped $(NM) --size-sort $(<) # 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 ; docs/busybox.pod : $(top_srcdir)/docs/busybox_header.pod $(top_srcdir)/include/usage.h $(top_srcdir)/docs/busybox_footer.pod $(top_srcdir)/docs/autodocifier.pl $(disp_doc) @@ -384,7 +407,7 @@ docs/busybox.net/BusyBox.html: docs/busy # The nifty new dependency stuff scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) -o $@ $< + $(do_link.h) DEP_INCLUDES := include/bb_config.h @@ -396,22 +419,21 @@ include/bbconfigopts.h: .config $(Q)$(top_srcdir)/scripts/config/mkconfigs > $@ endif -depend dep: .depend -.depend: scripts/bb_mkdep $(DEP_INCLUDES) +depend dep: $(top_builddir)/.depend ; +$(top_builddir)/.depend: $(buildtree) scripts/bb_mkdep $(DEP_INCLUDES) $(disp_gen) $(Q)rm -f .depend - $(Q)mkdir -p include/config - $(Q)scripts/bb_mkdep -I $(top_srcdir)/include $(top_srcdir) > $@.tmp + $(Q)scripts/bb_mkdep $(MKDEP_ARGS) \ + -I $(top_srcdir)/include $(top_srcdir) > $@.tmp $(Q)mv $@.tmp $@ include/bb_config.h: .config - @if [ ! -x $(top_builddir)/scripts/config/conf ] ; then \ - $(MAKE) -C scripts/config conf; \ - fi; + $(disp_gen) @$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN) +endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y) + clean: - - $(MAKE) -C scripts/config $@ - rm -f docs/busybox.dvi docs/busybox.ps \ docs/busybox.pod docs/busybox.net/busybox.html \ docs/busybox pod2htm* *.gdb *.elf *~ core .*config.log \ @@ -424,9 +446,10 @@ clean: -o -name \*.os -o -name \*.osm -o -name \*.a | xargs rm -f distclean: clean + - $(MAKE) -C scripts/config clean - rm -f scripts/bb_mkdep - rm -r -f include/config $(DEP_INCLUDES) - - find . -name .depend'*' | xargs rm -f + - find . -name .depend'*' | xargs rm -f rm -f .config .config.old .config.cmd release: distclean #doc @@ -449,8 +472,10 @@ release: distclean #doc tags: ctags -R . +# keep these in sync with noconfig_targets above! +.PHONY: dummy subdirs check test depend dep buildtree \ + menuconfig config oldconfig randconfig \ + defconfig allyesconfig allnoconfig allbareconfig \ + clean distclean \ + release tags -endif # ifeq ($(skip-makefile),) - -.PHONY: dummy subdirs release distclean clean config oldconfig \ - menuconfig tags check test depend dep buildtree Index: loginutils/Makefile.in =================================================================== --- loginutils/Makefile.in (revision 14650) +++ loginutils/Makefile.in (working copy) @@ -4,13 +4,9 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -LOGINUTILS_AR:=loginutils.a -ifndef LOGINUTILS_DIR -LOGINUTILS_DIR:=$(top_builddir)/loginutils/ -endif -srcdir=$(top_srcdir)/loginutils +srcdir:=$(top_srcdir)/loginutils +objdir:=$(top_builddir)/loginutils -LOGINUTILS-y:= LOGINUTILS-$(CONFIG_ADDGROUP) += addgroup.o LOGINUTILS-$(CONFIG_ADDUSER) += adduser.o LOGINUTILS-$(CONFIG_GETTY) += getty.o @@ -22,9 +18,6 @@ LOGINUTILS-$(CONFIG_VLOCK) += vlock.o LOGINUTILS-$(CONFIG_DELUSER) += deluser.o LOGINUTILS-$(CONFIG_DELGROUP) += delgroup.o -ifneq ($(strip $(LOGINUTILS-y)),) -libraries-y+=$(LOGINUTILS_DIR)$(LOGINUTILS_AR) -endif LOGINUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(LOGINUTILS-y)) LOGINUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) @@ -37,14 +30,13 @@ needcrypt-$(CONFIG_PASSWD) := y needcrypt-$(CONFIG_SU) := y needcrypt-$(CONFIG_SULOGIN) := y needcrypt-$(CONFIG_VLOCK) := y - - ifeq ($(needcrypt-y),y) LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) endif -$(LOGINUTILS_DIR)$(LOGINUTILS_AR): $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y)) - $(do_ar) +loginutils_OBJ:= $(patsubst %,$(objdir)/%,$(LOGINUTILS-y)) + +$(loginutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/loginutils.a: $(loginutils_OBJ) +libraries-y:=$(libraries-y) $(objdir)/loginutils.a -$(LOGINUTILS_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: libpwdgrp/Makefile.in =================================================================== --- libpwdgrp/Makefile.in (revision 14650) +++ libpwdgrp/Makefile.in (working copy) @@ -4,33 +4,28 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -LIBPWDGRP_AR:=libpwdgrp.a -ifndef $(LIBPWDGRP_DIR) -LIBPWDGRP_DIR:=$(top_builddir)/libpwdgrp -endif -srcdir=$(top_srcdir)/libpwdgrp - -LIBPWDGRP-obj:=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR) - -libraries-y+=$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR) +srcdir:=$(top_srcdir)/libpwdgrp +objdir:=$(top_builddir)/libpwdgrp LIBPWDGRP_MSRC0:=$(srcdir)/pwd_grp.c -LIBPWDGRP_MOBJ0-$(CONFIG_USE_BB_PWD_GRP):= fgetpwent_r.o fgetgrent_r.o \ - fgetpwent.o fgetgrent.o getpwnam_r.o getgrnam_r.o getpwuid_r.o \ - getgrgid_r.o getpwuid.o getgrgid.o getpwnam.o getgrnam.o getpw.o \ - getpwent_r.o getgrent_r.o getpwent.o getgrent.o \ - initgroups.o putpwent.o putgrent.o -LIBPWDGRP_MOBJS0=$(patsubst %,$(LIBPWDGRP_DIR)/%, $(LIBPWDGRP_MOBJ0-y)) +LIBPWDGRP_M0-$(CONFIG_USE_BB_PWD_GRP):= fgetpwent_r fgetgrent_r \ + fgetpwent fgetgrent getpwnam_r getgrnam_r getpwuid_r \ + getgrgid_r getpwuid getgrgid getpwnam getgrnam getpw \ + getpwent_r getgrent_r getpwent getgrent \ + initgroups putpwent putgrent +LIBPWDGRP_MOBJ0=$(patsubst %,$(objdir)/%$(om),$(LIBPWDGRP_M0-y)) +$(LIBPWDGRP_MOBJ0): $(LIBPWDGRP_MSRC0) LIBPWDGRP_MSRC1:=$(srcdir)/pwd_grp.c -LIBPWDGRP_MOBJ1-$(CONFIG_USE_BB_PWD_GRP):= __parsepwent.o __parsegrent.o \ - __pgsreader.o fgetspent_r.o fgetspent.o sgetspent_r.o getspnam_r.o \ - getspnam.o getspent_r.o getspent.o sgetspent.o \ - putspent.o __parsespent.o # getspuid_r.o getspuid.o -LIBPWDGRP_MOBJS1=$(patsubst %,$(LIBPWDGRP_DIR)/%, $(LIBPWDGRP_MOBJ1-y)) +LIBPWDGRP_M1-$(CONFIG_USE_BB_PWD_GRP):= __parsepwent __parsegrent \ + __pgsreader fgetspent_r fgetspent sgetspent_r getspnam_r \ + getspnam getspent_r getspent sgetspent \ + putspent __parsespent # getspuid_r getspuid +LIBPWDGRP_MOBJ1=$(patsubst %,$(objdir)/%$(om),$(LIBPWDGRP_M1-y)) +$(LIBPWDGRP_MOBJ1): $(LIBPWDGRP_MSRC1) -LIBPWDGRP_DEFINE0-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS0)))) -LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBPWDGRP_MOBJS1)))) +LIBPWDGRP_DEFINE0-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M0-y)) +LIBPWDGRP_DEFINE1-y:=$(patsubst %,-DL_%,$(LIBPWDGRP_M1-y)) LIBPWDGRP_SRC-y:=$(LIBPWDGRP_MSRC0) @@ -40,12 +35,15 @@ LIBRARY_SRC-a+=$(LIBPWDGRP_SRC-y) LIBRARY_DEFINE-y+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) LIBRARY_DEFINE-a+=$(LIBPWDGRP_DEFINE0-y) $(LIBPWDGRP_DEFINE1-y) +libpwdgrp_MOBJ$(os):=$(LIBPWDGRP_MOBJ0) $(LIBPWDGRP_MOBJ1) -$(LIBPWDGRP_DIR)/$(LIBPWDGRP_AR): $(LIBPWDGRP_MOBJS0) $(LIBPWDGRP_MOBJS1) - $(do_ar) +ifeq ($(om),.osm) +# XXX FIXME: +# also create a pattern for the non-shared case +$(LIBPWDGRP_MOBJ0:.osm=.om): $(LIBPWDGRP_MSRC0) +$(LIBPWDGRP_MOBJ1:.osm=.om): $(LIBPWDGRP_MSRC1) +endif -$(LIBPWDGRP_MOBJS0): $(LIBPWDGRP_MSRC0) - $(compile.c) -DL_$(notdir $*) +$(objdir)/libpwdgrp.a: $(libpwdgrp_MOBJ$(os)) +libraries-y:=$(libraries-y) $(objdir)/libpwdgrp.a -$(LIBPWDGRP_MOBJS1): $(LIBPWDGRP_MSRC1) - $(compile.c) -DL_$(notdir $*) Index: findutils/Makefile.in =================================================================== --- findutils/Makefile.in (revision 14650) +++ findutils/Makefile.in (working copy) @@ -4,28 +4,21 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -FINDUTILS_AR:=findutils.a -ifndef $(FINDUTILS_DIR) -FINDUTILS_DIR:=$(top_builddir)/findutils/ -endif -srcdir=$(top_srcdir)/findutils +srcdir:=$(top_srcdir)/findutils +objdir:=$(top_builddir)/findutils -FINDUTILS-y:= FINDUTILS-$(CONFIG_FIND) += find.o FINDUTILS-$(CONFIG_GREP) += grep.o FINDUTILS-$(CONFIG_XARGS) += xargs.o -ifneq ($(strip $(FINDUTILS-y)),) -libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR) -endif - FINDUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(FINDUTILS-y)) FINDUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(FINDUTILS_SRC-y) APPLET_SRC-a+=$(FINDUTILS_SRC-a) -$(FINDUTILS_DIR)$(FINDUTILS_AR): $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y)) - $(do_ar) +findutils_OBJ:= $(patsubst %,$(objdir)/%,$(FINDUTILS-y)) + +$(findutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/findutils.a: $(findutils_OBJ) +libraries-y:=$(libraries-y) $(objdir)/findutils.a -$(FINDUTILS_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: init/Makefile.in =================================================================== --- init/Makefile.in (revision 14650) +++ init/Makefile.in (working copy) @@ -4,13 +4,9 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -INIT_AR:=init.a -ifndef $(INIT_DIR) -INIT_DIR:=$(top_builddir)/init/ -endif -srcdir=$(top_srcdir)/init +srcdir:=$(top_srcdir)/init +objdir:=$(top_builddir)/init -INIT-y:= INIT-$(CONFIG_HALT) += halt.o INIT-$(CONFIG_INIT) += init.o INIT-$(CONFIG_MESG) += mesg.o @@ -27,17 +23,14 @@ endif INIT-$(CONFIG_INIT_SHARED) += init_shared.o -ifneq ($(strip $(INIT-y)),) -libraries-y+=$(INIT_DIR)$(INIT_AR) -endif - INIT_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(INIT-y)) INIT_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(INIT_SRC-y) APPLET_SRC-a+=$(INIT_SRC-a) -$(INIT_DIR)$(INIT_AR): $(patsubst %,$(INIT_DIR)%, $(INIT-y)) - $(do_ar) +init_OBJ:= $(patsubst %,$(objdir)/%,$(INIT-y)) + +$(init_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/init.a: $(init_OBJ) +libraries-y:=$(libraries-y) $(objdir)/init.a -$(INIT_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: procps/Makefile.in =================================================================== --- procps/Makefile.in (revision 14650) +++ procps/Makefile.in (working copy) @@ -4,13 +4,9 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -PROCPS_AR:=procps.a -ifndef $(PROCPS_DIR) -PROCPS_DIR:=$(top_builddir)/procps/ -endif -srcdir=$(top_srcdir)/procps +srcdir:=$(top_srcdir)/procps +objdir:=$(top_builddir)/procps -PROCPS-y:= PROCPS-$(CONFIG_FREE) += free.o PROCPS-$(CONFIG_KILL) += kill.o PROCPS-$(CONFIG_PIDOF) += pidof.o @@ -21,17 +17,15 @@ PROCPS-$(CONFIG_TOP) += top.o PROCPS-$(CONFIG_UPTIME) += uptime.o PROCPS-$(CONFIG_FUSER) += fuser.o -ifneq ($(strip $(PROCPS-y)),) -libraries-y+=$(PROCPS_DIR)$(PROCPS_AR) -endif PROCPS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(PROCPS-y)) PROCPS_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(PROCPS_SRC-y) APPLET_SRC-a+=$(PROCPS_SRC-a) -$(PROCPS_DIR)$(PROCPS_AR): $(patsubst %,$(PROCPS_DIR)%, $(PROCPS-y)) - $(do_ar) +procps_OBJ:= $(patsubst %,$(objdir)/%,$(PROCPS-y)) + +$(procps_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/procps.a: $(procps_OBJ) +libraries-y:=$(libraries-y) $(objdir)/procps.a -$(PROCPS_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: applets/Makefile.in =================================================================== --- applets/Makefile.in (revision 14650) +++ applets/Makefile.in (working copy) @@ -4,23 +4,17 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -APPLETS_AR:=applets.a -ifndef $(APPLETS_DIR) -APPLETS_DIR:=$(top_builddir)/applets/ -endif -srcdir=$(top_srcdir)/applets +srcdir:=$(top_srcdir)/applets +objdir:=$(top_builddir)/applets -APPLET_SRC:= $(patsubst %,$(srcdir)/%,applets.c busybox.c version.c) -APPLET_OBJ:= $(patsubst $(srcdir)/%.c,$(APPLETS_DIR)%.o, $(APPLET_SRC)) +APPLETS_SRC:= $(patsubst %,$(srcdir)/%,applets.c busybox.c version.c) -APPLET_SRC-y+=$(APPLET_SRC) -APPLET_SRC-a+=$(APPLET_SRC) +APPLET_SRC-y+=$(APPLETS_SRC) +APPLET_SRC-a+=$(APPLETS_SRC) -libraries-y+=$(APPLETS_DIR)$(APPLETS_AR) +applets_OBJ:=$(patsubst $(srcdir)/%.c,$(objdir)/%.o,$(APPLETS_SRC)) -$(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ) - $(do_ar) +$(applets_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/applets.a: $(applets_OBJ) +libraries-y:=$(libraries-y) $(objdir)/applets.a -$(APPLET_OBJ): $(top_builddir)/.config -$(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: editors/Makefile.in =================================================================== --- editors/Makefile.in (revision 14650) +++ editors/Makefile.in (working copy) @@ -4,36 +4,29 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -EDITOR_AR:=editors.a -ifndef $(EDITOR_DIR) -EDITOR_DIR:=$(top_builddir)/editors/ -endif -srcdir=$(top_srcdir)/editors +srcdir:=$(top_srcdir)/editors +objdir:=$(top_builddir)/editors -EDITOR-y:= -EDITOR-$(CONFIG_AWK) += awk.o -EDITOR-$(CONFIG_PATCH) += patch.o -EDITOR-$(CONFIG_SED) += sed.o -EDITOR-$(CONFIG_VI) += vi.o +EDITORS-$(CONFIG_AWK) += awk.o +EDITORS-$(CONFIG_PATCH) += patch.o +EDITORS-$(CONFIG_SED) += sed.o +EDITORS-$(CONFIG_VI) += vi.o -ifneq ($(strip $(EDITOR-y)),) -libraries-y+=$(EDITOR_DIR)$(EDITOR_AR) +needlibm-y:= +needlibm-$(CONFIG_FEATURE_AWK_MATH) := y + +ifeq ($(needlibm-y),y) + LIBRARIES := $(filter-out -lm,$(LIBRARIES)) -lm endif -EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITOR-y)) +EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITORS-y)) EDITOR_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(EDITOR_SRC-y) APPLET_SRC-a+=$(EDITOR_SRC-a) -needlibm-y:= -needlibm-$(CONFIG_FEATURE_AWK_MATH) := y - -ifeq ($(needlibm-y),y) - LIBRARIES := -lm $(filter-out -lm,$(LIBRARIES)) -endif +editors_OBJ:= $(patsubst %,$(objdir)/%,$(EDITORS-y)) -$(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y)) - $(do_ar) +$(editors_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/editors.a: $(editors_OBJ) +libraries-y:=$(libraries-y) $(objdir)/editors.a -$(EDITOR_DIR)%.o: $(srcdir)/%.c - $(compile.c) Index: util-linux/Makefile.in =================================================================== --- util-linux/Makefile.in (revision 14650) +++ util-linux/Makefile.in (working copy) @@ -4,64 +4,52 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -UTILLINUX_AR:=util-linux.a -ifndef $(UTILLINUX_DIR) -UTILLINUX_DIR:=$(top_builddir)/util-linux/ -endif -srcdir=$(top_srcdir)/util-linux - -UTILLINUX-y:= -UTILLINUX-$(CONFIG_DMESG) +=dmesg.o -UTILLINUX-$(CONFIG_FBSET) +=fbset.o -UTILLINUX-$(CONFIG_FDFLUSH) +=freeramdisk.o -UTILLINUX-$(CONFIG_FDFORMAT) +=fdformat.o -UTILLINUX-$(CONFIG_FDISK) +=fdisk.o -UTILLINUX-$(CONFIG_FREERAMDISK) +=freeramdisk.o -UTILLINUX-$(CONFIG_FSCK_MINIX) +=fsck_minix.o -UTILLINUX-$(CONFIG_GETOPT) +=getopt.o -UTILLINUX-$(CONFIG_HEXDUMP) +=hexdump.o -UTILLINUX-$(CONFIG_HWCLOCK) +=hwclock.o -UTILLINUX-$(CONFIG_IPCRM) +=ipcrm.o -UTILLINUX-$(CONFIG_IPCS) +=ipcs.o -UTILLINUX-$(CONFIG_LOSETUP) +=losetup.o -UTILLINUX-$(CONFIG_MDEV) +=mdev.o -UTILLINUX-$(CONFIG_MKFS_MINIX) +=mkfs_minix.o -UTILLINUX-$(CONFIG_MKSWAP) +=mkswap.o -UTILLINUX-$(CONFIG_MORE) +=more.o -UTILLINUX-$(CONFIG_MOUNT) +=mount.o -UTILLINUX-$(CONFIG_FEATURE_MOUNT_NFS) +=nfsmount.o -UTILLINUX-$(CONFIG_PIVOT_ROOT) +=pivot_root.o -UTILLINUX-$(CONFIG_RDATE) +=rdate.o -UTILLINUX-$(CONFIG_READPROFILE) +=readprofile.o -UTILLINUX-$(CONFIG_SETARCH) +=setarch.o -UTILLINUX-$(CONFIG_SWAPONOFF) +=swaponoff.o -UTILLINUX-$(CONFIG_SWITCH_ROOT) +=switch_root.o -UTILLINUX-$(CONFIG_UMOUNT) +=umount.o +srcdir:=$(top_srcdir)/util-linux +objdir:=$(top_builddir)/util-linux -UTILLINUX-y:=$(sort $(UTILLINUX-y)) +UTIL-LINUX-$(CONFIG_DMESG) +=dmesg.o +UTIL-LINUX-$(CONFIG_FBSET) +=fbset.o +UTIL-LINUX-$(CONFIG_FDFLUSH) +=freeramdisk.o +UTIL-LINUX-$(CONFIG_FDFORMAT) +=fdformat.o +UTIL-LINUX-$(CONFIG_FDISK) +=fdisk.o +UTIL-LINUX-$(CONFIG_FREERAMDISK) +=freeramdisk.o +UTIL-LINUX-$(CONFIG_FSCK_MINIX) +=fsck_minix.o +UTIL-LINUX-$(CONFIG_GETOPT) +=getopt.o +UTIL-LINUX-$(CONFIG_HEXDUMP) +=hexdump.o +UTIL-LINUX-$(CONFIG_HWCLOCK) +=hwclock.o +UTIL-LINUX-$(CONFIG_IPCRM) +=ipcrm.o +UTIL-LINUX-$(CONFIG_IPCS) +=ipcs.o +UTIL-LINUX-$(CONFIG_LOSETUP) +=losetup.o +UTIL-LINUX-$(CONFIG_MDEV) +=mdev.o +UTIL-LINUX-$(CONFIG_MKFS_MINIX) +=mkfs_minix.o +UTIL-LINUX-$(CONFIG_MKSWAP) +=mkswap.o +UTIL-LINUX-$(CONFIG_MORE) +=more.o +UTIL-LINUX-$(CONFIG_MOUNT) +=mount.o +UTIL-LINUX-$(CONFIG_FEATURE_MOUNT_NFS) +=nfsmount.o +UTIL-LINUX-$(CONFIG_PIVOT_ROOT) +=pivot_root.o +UTIL-LINUX-$(CONFIG_RDATE) +=rdate.o +UTIL-LINUX-$(CONFIG_READPROFILE) +=readprofile.o +UTIL-LINUX-$(CONFIG_SETARCH) +=setarch.o +UTIL-LINUX-$(CONFIG_SWAPONOFF) +=swaponoff.o +UTIL-LINUX-$(CONFIG_SWITCH_ROOT) +=switch_root.o +UTIL-LINUX-$(CONFIG_UMOUNT) +=umount.o -ifneq ($(strip $(UTILLINUX-y)),) -libraries-y+=$(UTILLINUX_DIR)$(UTILLINUX_AR) -endif +UTIL-LINUX-y:=$(sort $(UTIL-LINUX-y)) -UTILLINUX_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(UTILLINUX-y)) +UTILLINUX_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(UTIL-LINUX-y)) UTILLINUX_SRC-a:=$(wildcard $(srcdir)/*.c) APPLET_SRC-y+=$(UTILLINUX_SRC-y) APPLET_SRC-a+=$(UTILLINUX_SRC-a) -$(UTILLINUX_DIR)$(UTILLINUX_AR): $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y)) - $(do_ar) - -$(UTILLINUX_DIR)%.o: $(srcdir)/%.c - $(compile.c) - ifneq ($(strip $(CONFIG_LFS)),y) ifeq ($(strip $(FDISK_SUPPORT_LARGE_DISKS)),y) - -$(UTILLINUX_DIR)fdisk.o: $(srcdir)/fdisk.c - $(CC) $(CFLAGS) \ - -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ - $(EXTRA_CFLAGS) -c -o $@ $< - +CFLAGS-util-linux-fdisk.c := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif endif + +util-linux_OBJ:= $(patsubst %,$(objdir)/%,$(UTIL-LINUX-y)) + +$(util-linux_OBJ): $(objdir)/%.o: $(srcdir)/%.c +$(objdir)/util-linux.a: $(util-linux_OBJ) +libraries-y:=$(libraries-y) $(objdir)/util-linux.a + Index: util-linux/Config.in =================================================================== --- util-linux/Config.in (revision 14650) +++ util-linux/Config.in (working copy) @@ -288,6 +288,16 @@ config CONFIG_MKSWAP Once you have created swap space using 'mkswap' you need to enable the swap space using the 'swapon' utility. +config CONFIG_FEATURE_MKSWAP_V0 + bool " version 0 support" + default n + depends on CONFIG_MKSWAP +# depends on CONFIG_MKSWAP && CONFIG_DEPRECATED + help + Enable support for the old v0 style. + If your kernel is older than 2.1.117, then v0 support is the + only option. + config CONFIG_MORE bool "more" default n