lash: make -c work; crush buffer overrun and free of non-malloced ptr

[oweals/busybox.git] / Makefile.custom

diff --git a/Makefile.custom b/Makefile.custom
index 5682a4b75ea75ea5ed895ced7e697003d127cbe9..0cc40a667926155cac235a11dae2e28a75b7960c 100644 (file)
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -5,10 +5,16 @@
 %.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
 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 +38,30 @@ ifneq ($(strip $(DO_INSTALL_LIBS)),n)
        done
 endif
 
-check test: busybox
+check test: busybox busybox.links
        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) ./))
+       $(SHELL) $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)
+
+.PHONY: release
+release: distclean
+       cd ..; \
+       rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
+       cp -a 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
@@ -56,6 +79,10 @@ baseline: busybox_unstripped
 objsizes: busybox_unstripped
        $(srctree)/scripts/objsizes
 
+.PHONY: bigdata
+bigdata: busybox_unstripped
+       nm --size-sort busybox_unstripped | grep -vi ' [tr] ' | tail -20
+
 # Documentation Targets
 .PHONY: doc
 doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
@@ -96,11 +123,22 @@ 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)