X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=8c7cb41bea7cd5ef8c66279d90a9dcf5d4c11b9c;hb=c488f87953ff2c4d4fc005c52ec30c5cb6885f72;hp=9841659fe43cfa055aae4cfabe7cc150e9f6afee;hpb=08a1b5095d710c5d905056a9daa14a1acad5590b;p=oweals%2Fbusybox.git diff --git a/Makefile b/Makefile index 9841659fe..8c7cb41be 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ #-------------------------------------------------------------- noconfig_targets := menuconfig config oldconfig randconfig \ defconfig allyesconfig allnoconfig allbareconfig \ - clean distclean \ + clean distclean help \ release tags # the toplevel sourcedir @@ -37,7 +37,6 @@ SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS)) _all: CONFIG_CONFIG_IN = $(top_srcdir)/Config.in -CONFIG_DEFCONFIG = $(top_srcdir)/defconfig ifeq ($(KBUILD_SRC),) @@ -76,7 +75,7 @@ $(if $(wildcard $(KBUILD_OUTPUT)),, \ .PHONY: $(MAKECMDGOALS) $(filter-out _all,$(MAKECMDGOALS)) _all: $(KBUILD_OUTPUT)/Rules.mak $(KBUILD_OUTPUT)/Makefile all_tree - $(MAKE) -C $(KBUILD_OUTPUT) \ + $(Q)$(MAKE) -C $(KBUILD_OUTPUT) \ top_srcdir=$(top_srcdir) \ top_builddir=$(top_builddir) \ KBUILD_SRC=$(top_srcdir) \ @@ -121,15 +120,15 @@ help: @echo @echo 'Configuration:' @echo ' allnoconfig - disable all symbols in .config' - @echo ' allyesconfig - enable (almost) all symbols in .config' - @echo ' allbareconfig - enable all basics without any features' + @echo ' allyesconfig - enable all symbols in .config (see defconfig)' + @echo ' allbareconfig - enable all applets without any sub-features' @echo ' config - text based configurator (of last resort)' - @echo ' defconfig - set .config to defaults' + @echo ' defconfig - set .config to largest generic configuration' @echo ' menuconfig - interactive curses-based configurator' @echo ' oldconfig - resolve any unresolved symbols in .config' @echo @echo 'Installation:' - @echo ' install - install busybox into $prefix' + @echo ' install - install busybox into $(PREFIX)' @echo ' uninstall' @echo @echo 'Development:' @@ -137,6 +136,7 @@ help: @echo ' randconfig - generate a random configuration' @echo ' release - create a distribution tarball' @echo ' sizes - show size of all enabled busybox symbols' + @echo ' objsizes - show size of each .o object built' @echo @@ -159,18 +159,19 @@ all: menuconfig # --------------------------------------------------------------------------- scripts/config/conf: scripts/config/Makefile - $(MAKE) -C scripts/config conf + $(Q)$(MAKE) -C scripts/config conf -@if [ ! -f .config ] ; then \ - cp $(CONFIG_DEFCONFIG) .config; \ + touch .config; \ fi scripts/config/mconf: scripts/config/Makefile - $(MAKE) -C scripts/config ncurses conf mconf + $(Q)$(MAKE) -C scripts/config ncurses conf mconf -@if [ ! -f .config ] ; then \ - cp $(CONFIG_DEFCONFIG) .config; \ + touch .config; \ fi menuconfig: scripts/config/mconf + @[ -f .config ] || make $(MAKEFLAGS) defconfig @./scripts/config/mconf $(CONFIG_CONFIG_IN) config: scripts/config/conf @@ -184,22 +185,28 @@ randconfig: scripts/config/conf allyesconfig: scripts/config/conf @./scripts/config/conf -y $(CONFIG_CONFIG_IN) - sed -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG|STATIC|SELINUX|FEATURE_DEVFS|BUILD_AT_ONCE)).*/# \1 is not set/" .config - echo "CONFIG_FEATURE_SHARED_BUSYBOX=y" >> .config + @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER)=.*/# \1 is not set/" .config @./scripts/config/conf -o $(CONFIG_CONFIG_IN) allnoconfig: scripts/config/conf @./scripts/config/conf -n $(CONFIG_CONFIG_IN) +# defconfig is allyesconfig minus any features that are specialized enough +# or cause enough behavior change that the user really should switch them on +# manually if that's what they want. Sort of "maximum sane config". + defconfig: scripts/config/conf - @./scripts/config/conf -d $(CONFIG_CONFIG_IN) + @./scripts/config/conf -y $(CONFIG_CONFIG_IN) + @$(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 - @sed -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config + @$(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 + @$(SED) -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config - @./scripts/config/conf -o $(CONFIG_CONFIG_IN) + @yes n | ./scripts/config/conf -o $(CONFIG_CONFIG_IN) else # ifneq ($(strip $(HAVE_DOT_CONFIG)),y) @@ -252,6 +259,7 @@ LIBBUSYBOX_SONAME:=$(LD_LIBBUSYBOX).$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL 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) @@ -263,7 +271,6 @@ $(LIBBUSYBOX_SONAME): $(LIBRARY_SRC) else # CONFIG_BUILD_AT_ONCE $(LIBBUSYBOX_SONAME): $(libbusybox-obj) endif # CONFIG_BUILD_AT_ONCE -endif # CONFIG_BUILD_LIBBUSYBOX ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y) LDBUSYBOX:=-L$(top_builddir) -lbusybox @@ -274,34 +281,39 @@ $(LIBBUSYBOX_SONAME): ifndef MAJOR_VERSION $(error MAJOR_VERSION needed for $@ is not defined) endif - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -shared \ - $(CFLAGS_PIC) \ + $(do_link) $(LIB_CFLAGS) $(CFLAGS_COMBINE) \ -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 - $(RM_F) $(DO_INSTALL_LIBS) - for i in $(DO_INSTALL_LIBS); do $(LN_S) -v $(@) $$i ; done - $(STRIPCMD) $@ + @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: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(libraries-y) - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(PROG_CFLAGS) $(LDFLAGS) \ +busybox_unstripped: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(libraries-y) + $(do_link) $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) \ -o $@ -Wl,--start-group \ $(APPLETS_DEFINE) $(APPLET_SRC) \ $(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \ $(LDBUSYBOX) $(LIBRARIES) \ -Wl,--end-group - $(STRIPCMD) $@ + +busybox: busybox_unstripped + $(Q)cp busybox_unstripped busybox + $(do_strip) + +%.bflt: %_unstripped + $(do_elf2flt) busybox.links: $(top_srcdir)/applets/busybox.mkll include/bb_config.h $(top_srcdir)/include/applets.h - - $(SHELL) $^ >$@ + $(Q)-$(SHELL) $^ >$@ install: $(top_srcdir)/applets/install.sh busybox busybox.links - DO_INSTALL_LIBS="$(strip $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS))" \ + $(Q)DO_INSTALL_LIBS="$(strip $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS))" \ $(SHELL) $< $(PREFIX) $(INSTALL_OPTS) ifeq ($(strip $(CONFIG_FEATURE_SUID)),y) @echo @@ -315,11 +327,11 @@ ifeq ($(strip $(CONFIG_FEATURE_SUID)),y) endif uninstall: busybox.links - $(RM_F) $(PREFIX)/bin/busybox - for i in `cat busybox.links` ; do $(RM_F) $(PREFIX)$$i; done + rm -f $(PREFIX)/bin/busybox + for i in `cat busybox.links` ; do rm -f $(PREFIX)$$i; done ifneq ($(strip $(DO_INSTALL_LIBS)),n) for i in $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS); do \ - $(RM_F) $(PREFIX)$$i; \ + rm -f $(PREFIX)$$i; \ done endif @@ -338,122 +350,115 @@ check test: busybox bindir=$(top_builddir) srcdir=$(top_srcdir)/testsuite \ $(top_srcdir)/testsuite/runtest $(CHECK_VERBOSE) -sizes: - -$(RM_F) busybox - $(MAKE) top_srcdir=$(top_srcdir) top_builddir=$(top_builddir) \ - -f $(top_srcdir)/Makefile STRIPCMD=/bin/true - $(NM) --size-sort busybox +.PHONY: sizes +sizes: busybox_unstripped + $(NM) --size-sort $(<) + +.PHONY: objsizes +objsizes: busybox_unstripped + $(SHELL) $(top_srcdir)/scripts/objsizes # Documentation Targets 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 - -mkdir -p docs - - ( cat $(top_srcdir)/docs/busybox_header.pod; \ - $(top_srcdir)/docs/autodocifier.pl $(top_srcdir)/include/usage.h; \ - cat $(top_srcdir)/docs/busybox_footer.pod ) > docs/busybox.pod +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) + $(Q)-mkdir -p docs + $(Q)-( cat $(top_srcdir)/docs/busybox_header.pod ; \ + $(top_srcdir)/docs/autodocifier.pl $(top_srcdir)/include/usage.h ; \ + cat $(top_srcdir)/docs/busybox_footer.pod ; ) > docs/busybox.pod docs/BusyBox.txt: docs/busybox.pod - $(SECHO) - $(SECHO) BusyBox Documentation - $(SECHO) - -mkdir -p docs - -pod2text $< > $@ + $(disp_doc) + $(Q)-mkdir -p docs + $(Q)-pod2text $< > $@ docs/BusyBox.1: docs/busybox.pod - - mkdir -p docs - - pod2man --center=BusyBox --release="version $(VERSION)" \ + $(disp_doc) + $(Q)-mkdir -p docs + $(Q)-pod2man --center=BusyBox --release="version $(VERSION)" \ $< > $@ docs/BusyBox.html: docs/busybox.net/BusyBox.html - - mkdir -p docs - -@ $(RM_F) docs/BusyBox.html - -@ cp docs/busybox.net/BusyBox.html docs/BusyBox.html + $(disp_doc) + $(Q)-mkdir -p docs + $(Q)-rm -f docs/BusyBox.html + $(Q)-cp docs/busybox.net/BusyBox.html docs/BusyBox.html docs/busybox.net/BusyBox.html: docs/busybox.pod - -@ mkdir -p docs/busybox.net - - pod2html --noindex $< > \ + $(Q)-mkdir -p docs/busybox.net + $(Q)-pod2html --noindex $< > \ docs/busybox.net/BusyBox.html - -@ $(RM_F) pod2htm* + $(Q)-rm -f pod2htm* -# The nifty new buildsystem stuff +# The nifty new dependency stuff scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c - $(HOSTCC) $(HOSTCFLAGS) -o $@ $< + $(do_link.h) -DEP_INCLUDES := include/config.h include/bb_config.h include/_usage.h +DEP_INCLUDES := include/bb_config.h ifeq ($(strip $(CONFIG_BBCONFIG)),y) DEP_INCLUDES += include/bbconfigopts.h include/bbconfigopts.h: .config - $(top_srcdir)/scripts/config/mkconfigs > $@ + $(disp_gen) + $(Q)$(top_srcdir)/scripts/config/mkconfigs > $@ endif +scripts/usage: $(top_srcdir)/scripts/usage.c .config + $(do_link.h) -I$(top_srcdir)/include + +DEP_INCLUDES += include/usage_compressed.h +include/usage_compressed.h: .config scripts/usage + $(Q)sh $(top_srcdir)/scripts/usage_compressed "$(top_srcdir)/scripts" > $@ + depend dep: .depend .depend: scripts/bb_mkdep $(DEP_INCLUDES) - @$(RM_F) .depend - @mkdir -p include/config - scripts/bb_mkdep -c include/config.h -c include/bb_config.h \ - -I $(top_srcdir)/include $(top_srcdir) > $@.tmp - mv $@.tmp $@ + $(disp_gen) + $(Q)rm -f .depend + $(Q)mkdir -p include/config + $(Q)scripts/bb_mkdep -I $(top_srcdir)/include $(top_srcdir) > $@.tmp + $(Q)mv $@.tmp $@ -include/config.h: .config +include/bb_config.h: .config @if [ ! -x $(top_builddir)/scripts/config/conf ] ; then \ $(MAKE) -C scripts/config conf; \ fi; @$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN) -include/bb_config.h: include/config.h - @echo -e "#ifndef BB_CONFIG_H\n#define BB_CONFIG_H" > $@ - @sed -e 's/#undef CONFIG_\(.*\)/#define ENABLE_\1 0/' \ - -e 's/#define CONFIG_\(.*\)/#define CONFIG_\1\n#define ENABLE_\1/' \ - < $< >> $@ - @echo "#endif" >> $@ - -# Create macros for usage.h, e.g.: -#if ENABLE_HAVE_DOT_CONFIG -#define USAGE_HAVE_DOT_CONFIG(a) a -#else -#define USAGE_HAVE_DOT_CONFIG(a) -#endif -include/_usage.h: .config - awk '/CONFIG|BB_APPLET/{gsub("#[[:space:]]*|=y|.*CONFIG_|.*BB_APPLET_","");if(!/=/){print("#if ENABLE_"$$1"\n#define USAGE_"$$1"(a) a\n#else\n#define USAGE_"$$1"(a)\n#endif");}}' $(<) > $(@) - clean: - $(MAKE) -C scripts/config $@ - - $(RM_F) docs/busybox.dvi docs/busybox.ps \ + - rm -f docs/busybox.dvi docs/busybox.ps \ docs/busybox.pod docs/busybox.net/busybox.html \ docs/busybox pod2htm* *.gdb *.elf *~ core .*config.log \ docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \ docs/busybox.net/BusyBox.html busybox.links \ - $(DO_INSTALL_LIBS) $(LIBBUSYBOX_SONAME) \ - .config.old busybox - - rm -rf _install testsuite/links - - find . -name .\*.flags -exec $(RM_F) {} \; - - find . -name \*.o -exec $(RM_F) {} \; - - find . -name \*.a -exec $(RM_F) {} \; - - find . -name \*.so -exec $(RM_F) {} \; + libbusybox.so* \ + .config.old busybox busybox_unstripped + - rm -r -f _install testsuite/links + - find . -name .\*.flags -o -name \*.o -o -name \*.om \ + -o -name \*.os -o -name \*.osm -o -name \*.a | xargs rm -f distclean: clean - - $(RM_F) scripts/bb_mkdep - - rm -rf include/config $(DEP_INCLUDES) - - find . -name .depend -exec $(RM_F) {} \; - $(RM_F) .config .config.old .config.cmd + - rm -f scripts/bb_mkdep + - rm -r -f include/config $(DEP_INCLUDES) + - find . -name .depend'*' | xargs rm -f + rm -f .config .config.old .config.cmd release: distclean #doc cd ..; \ - rm -rf $(PROG)-$(VERSION); \ + rm -r -f $(PROG)-$(VERSION); \ cp -a busybox $(PROG)-$(VERSION); \ \ find $(PROG)-$(VERSION)/ -type d \ -name .svn \ -print \ - -exec rm -rf {} \; ; \ + -exec rm -r -f {} \; ; \ \ find $(PROG)-$(VERSION)/ -type f \ -name .\#* \ -print \ - -exec $(RM_F) {} \; ; \ + -exec rm -f {} \; ; \ \ tar -cvzf $(PROG)-$(VERSION).tar.gz $(PROG)-$(VERSION)/;