ash: some beautification work, no code changes

[oweals/busybox.git] / Makefile.custom

diff --git a/Makefile.custom b/Makefile.custom
index 5682a4b75ea75ea5ed895ced7e697003d127cbe9..140ff45c25b22f723c7ec1f18e842eaeb99d3e55 100644 (file)
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -2,13 +2,27 @@
 # Build system
 # ==========================================================================
 
-%.bflt: %_unstripped
-       $(CROSS_COMPILE)elf2flt $(ELF2FLTFLAGS) $< -o $@
-
-busybox.links: $(srctree)/applets/busybox.mkll $(srctree)/include/applets.h
+busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h $(srctree)/include/applets.h
        $(Q)-$(SHELL) $^ >$@
 
 .PHONY: install
+ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y)
+INSTALL_OPTS:= --symlinks
+endif
+ifeq ($(CONFIG_INSTALL_APPLET_HARDLINKS),y)
+INSTALL_OPTS:= --hardlinks
+endif
+ifeq ($(CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS),y)
+ifeq ($(CONFIG_INSTALL_SH_APPLET_SYMLINK),y)
+INSTALL_OPTS:= --sw-sh-sym
+endif
+ifeq ($(CONFIG_INSTALL_SH_APPLET_HARDLINK),y)
+INSTALL_OPTS:= --sw-sh-hard
+endif
+ifeq ($(CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER),y)
+INSTALL_OPTS:= --scriptwrapper
+endif
+endif
 install: $(srctree)/applets/install.sh busybox busybox.links
        $(Q)DO_INSTALL_LIBS="$(strip $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS))" \
                $(SHELL) $< $(CONFIG_PREFIX) $(INSTALL_OPTS)
@@ -32,13 +46,35 @@ ifneq ($(strip $(DO_INSTALL_LIBS)),n)
        done
 endif
 
-check test: busybox
-       bindir=$(objtree) srcdir=$(srctree)/testsuite SED="$(SED)" \
-       $(SHELL) $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:1=),-v)
-
-### checkhelp:
-###    $(Q)$(srctree)/scripts/checkhelp.awk \
-###            $(wildcard $(patsubst %,%/Config.in,$(SRC_DIRS) ./))
+# Not very elegant: copies testsuite to objdir...
+# (cp -pPR is POSIX-compliant (cp -dpR or cp -a would not be))
+.PHONY: check
+.PHONY: test
+check test: busybox busybox.links
+       test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
+       bindir=$(objtree) srcdir=$(srctree)/testsuite \
+       $(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)"
+
+.PHONY: release
+release: distclean
+       cd ..; \
+       rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
+       cp -pPR busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
+       find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
+               -name .svn \
+               -print \
+               -exec rm -r -f {} \; ; \
+       find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
+               -name .\#* \
+               -print \
+               -exec rm -f {} \; ; \
+       tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \
+               busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ ; }
+
+.PHONY: checkhelp
+checkhelp:
+       $(Q)$(srctree)/scripts/checkhelp.awk \
+               $(patsubst %,$(srctree)/%,$(wildcard $(patsubst %,%/Config.in,$(busybox-dirs) ./)))
 
 .PHONY: sizes
 sizes: busybox_unstripped
@@ -47,6 +83,7 @@ sizes: busybox_unstripped
 .PHONY: bloatcheck
 bloatcheck: busybox_old busybox_unstripped
        @$(srctree)/scripts/bloat-o-meter busybox_old busybox_unstripped
+       @$(CROSS_COMPILE)size busybox_old busybox_unstripped
 
 .PHONY: baseline
 baseline: busybox_unstripped
@@ -56,10 +93,22 @@ baseline: busybox_unstripped
 objsizes: busybox_unstripped
        $(srctree)/scripts/objsizes
 
+.PHONY: stksizes
+stksizes: busybox_unstripped
+       $(CROSS_COMPILE)objdump -d busybox_unstripped | $(srctree)/scripts/checkstack.pl $(ARCH) | uniq
+
+.PHONY: bigdata
+bigdata: busybox_unstripped
+       $(CROSS_COMPILE)nm --size-sort busybox_unstripped | grep -vi ' [trw] '
+
 # Documentation Targets
 .PHONY: doc
 doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
 
+# FIXME: Doesn't belong here
+disp_doc = \
+  @$(if $(quiet),echo "  DOC     $(@F)")
+
 docs/busybox.pod: $(srctree)/docs/busybox_header.pod \
                $(srctree)/include/usage.h \
                $(srctree)/docs/busybox_footer.pod \
@@ -96,12 +145,25 @@ docs/busybox.net/BusyBox.html: docs/busybox.pod
 # documentation, cross-reference
 # Modern distributions already ship synopsis packages (e.g. debian)
 # If you have an old distribution go to http://synopsis.fresco.org/
-syn_tgt := $(wildcard $(patsubst %,%/*.c,$(SRC_DIRS)))
-syn     := $(patsubst %.c, %.syn, $(syn_tgt))
+syn_tgt = $(wildcard $(patsubst %,%/*.c,$(busybox-alldirs)))
+syn     = $(patsubst %.c, %.syn, $(syn_tgt))
+
+comma:= ,
+brace_open:= (
+brace_close:= )
+
+SYN_CPPFLAGS := $(strip $(CPPFLAGS) $(EXTRA_CPPFLAGS))
+SYN_CPPFLAGS := $(subst $(brace_open),\$(brace_open),$(SYN_CPPFLAGS))
+SYN_CPPFLAGS := $(subst $(brace_close),\$(brace_close),$(SYN_CPPFLAGS))
+#SYN_CPPFLAGS := $(subst ",\",$(SYN_CPPFLAGS))
+#")
+#SYN_CPPFLAGS := [$(patsubst %,'%'$(comma),$(SYN_CPPFLAGS))'']
 
 %.syn: %.c
-       synopsis -p C -l Comments.SSDFilter,Comments.Previous $(INCS) -Wp,verbose,debug,preprocess,cppflags="'$(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) $(APPLETS_DEFINE) $(BUSYBOX_DEFINE)'" -o $@ $<
+       synopsis -p C -l Comments.SSDFilter,Comments.Previous -Wp,preprocess=True,cppflags="'$(SYN_CPPFLAGS)'" -o $@ $<
 
 .PHONY: html
 html: $(syn)
        synopsis -f HTML -Wf,title="'BusyBox Documentation'" -o $@ $^
+
+-include $(srctree)/Makefile.local