whitespace between if and (
[oweals/busybox.git] / Makefile
index 39a45c5886cf1313d9af4427d30df09c13871827..7e37ed40d6811e6e57af4703d486313251ac3796 100644 (file)
--- 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
@@ -128,14 +128,18 @@ help:
        @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:'
+       @echo '  bloatcheck             - show size difference between busybox_unstripped'
+       @echo '                           and busybox_old'
        @echo '  check                  - run the test suite for all applets'
+       @echo '  checkhelp              - check for missing help-entries in Config.in'
        @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
 
 
@@ -144,7 +148,7 @@ include $(top_srcdir)/Rules.mak
 ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 # Default target if none was requested explicitly
-all: defconfig menuconfig
+all: menuconfig
 
 # warn if no configuration exists and we are asked to build a non-config target
 .config:
@@ -170,6 +174,7 @@ scripts/config/mconf: scripts/config/Makefile
        fi
 
 menuconfig: scripts/config/mconf
+       @[ -f .config ] || make $(MAKEFLAGS) defconfig
        @./scripts/config/mconf $(CONFIG_CONFIG_IN)
 
 config: scripts/config/conf
@@ -183,7 +188,7 @@ randconfig: scripts/config/conf
 
 allyesconfig: scripts/config/conf
        @./scripts/config/conf -y $(CONFIG_CONFIG_IN)
-       sed -i -r -e "s/^(USING_CROSS_COMPILER)=.*/# \1 is not set/" .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
@@ -195,16 +200,16 @@ allnoconfig: scripts/config/conf
 
 defconfig: scripts/config/conf
        @./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
+       @$(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)
 
@@ -257,6 +262,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)
@@ -268,7 +274,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
@@ -279,33 +284,39 @@ $(LIBBUSYBOX_SONAME):
 ifndef MAJOR_VERSION
        $(error MAJOR_VERSION needed for $@ is not defined)
 endif
-       $(do_link) $(LIB_CFLAGS) $(LIB_LDFLAGS) \
+       $(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
+       @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)
-       $(do_link) $(PROG_CFLAGS) \
+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
+
+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
        $(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
@@ -319,11 +330,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
 
@@ -342,11 +353,20 @@ 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: checkhelp
+checkhelp:
+       $(Q)$(top_srcdir)/scripts/checkhelp.awk \
+               $(wildcard $(patsubst %,%/Config.in,$(SRC_DIRS) ./))
+.PHONY: sizes
+sizes: busybox_unstripped
+       $(NM) --size-sort $(<)
+.PHONY: bloatcheck
+bloatcheck: busybox_old busybox_unstripped
+       @$(top_srcdir)/scripts/bloat-o-meter busybox_old busybox_unstripped
+
+.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
@@ -354,9 +374,9 @@ 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)
        $(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
+       $(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
        $(disp_doc)
@@ -372,18 +392,18 @@ docs/BusyBox.1: docs/busybox.pod
 docs/BusyBox.html: docs/busybox.net/BusyBox.html
        $(disp_doc)
        $(Q)-mkdir -p docs
-       $(Q)-$(RM_F) docs/BusyBox.html
+       $(Q)-rm -f docs/BusyBox.html
        $(Q)-cp docs/busybox.net/BusyBox.html docs/BusyBox.html
 
 docs/busybox.net/BusyBox.html: docs/busybox.pod
        $(Q)-mkdir -p docs/busybox.net
        $(Q)-pod2html --noindex $< > \
            docs/busybox.net/BusyBox.html
-       $(Q)-$(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
-       $(Q)$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
+       $(do_link.h)
 
 DEP_INCLUDES := include/bb_config.h
 
@@ -395,10 +415,17 @@ include/bbconfigopts.h: .config
        $(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)
        $(disp_gen)
-       $(Q)$(RM_F) .depend
+       $(Q)rm -f .depend
        $(Q)mkdir -p include/config
        $(Q)scripts/bb_mkdep -I $(top_srcdir)/include $(top_srcdir) > $@.tmp
        $(Q)mv $@.tmp $@
@@ -411,39 +438,38 @@ include/bb_config.h: .config
 
 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 scripts/usage
+       rm -r -f include/config include/_usage.h include/config.h $(DEP_INCLUDES)
+       find . -name .depend'*' -print0 | xargs -0 rm -f
+       rm -f .hdepend
+       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)/;