X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=469539095f0533df6bd5bc9bd77106e623651abd;hb=caffb6eff0e33a80da630963f21346c21186da39;hp=753c52f1b89d9487f5180c0cd398cb62fe9be3c1;hpb=3becdfc31635bec63b6cbefde148d9bd3f3678a1;p=oweals%2Fbusybox.git

diff --git a/Makefile b/Makefile
index 753c52f1b..469539095 100644
--- a/Makefile
+++ b/Makefile
@@ -19,121 +19,194 @@
 #
 
 PROG      := busybox
-VERSION   := 0.43
+VERSION   := 0.47
 BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
 export VERSION
 
+# If you want a static binary, turn this on.
+DOSTATIC = false
+
 # Set the following to `true' to make a debuggable build.
 # Leave this set to `false' for production use.
 # eg: `make DODEBUG=true tests'
+# Do not enable this for production builds...
 DODEBUG = false
 
-# If you want a static binary, turn this on.
-DOSTATIC = false
-
-# This will choke on a non-debian system
-ARCH =`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'`
-
-CC = gcc
-
-GCCMAJVERSION = $(shell $(CC) --version | sed -n "s/^[^0-9]*\([0-9]\)\.\([0-9].*\)[\.].*/\1/p")
-GCCMINVERSION = $(shell $(CC) --version | sed -n "s/^[^0-9]*\([0-9]\)\.\([0-9].*\)[\.].*/\2/p")
-
-
-GCCSUPPORTSOPTSIZE = $(shell			\
-if ( test $(GCCMAJVERSION) -eq 2 ) ; then	\
-    if ( test $(GCCMINVERSION) -ge 66 ) ; then	\
-	echo "true";				\
-    else					\
-	echo "false";				\
-    fi;						\
-else						\
-    if ( test $(GCCMAJVERSION) -gt 2 ) ; then	\
-	echo "true";				\
-    else					\
-	echo "false";				\
-    fi;						\
-fi; )
-
-
-ifeq ($(GCCSUPPORTSOPTSIZE), true)
-    OPTIMIZATION = -Os
-else
-    OPTIMIZATION = -O2
+# This enables compiling with dmalloc ( http://dmalloc.com/ )
+# which is an excellent public domain mem leak and malloc problem
+# detector.  To enable dmalloc, before running busybox you will
+# want to first set up your environment.
+# eg: `export DMALLOC_OPTIONS=debug=0x14f47d83,inter=100,log=logfile`
+# Do not enable this for production builds...
+DODMALLOC = false
+
+# If you want large file summit support, turn this on.
+# This has no effect if you don't have a kernel with lfs
+# support, and a system with libc-2.1.3 or later.
+# Some of the programs that can benefit from lfs support
+# are dd, gzip, mount, tar, and mkfs_minix.
+# LFS allows you to use the above programs for files
+# larger than 2GB!
+DOLFS = false
+
+
+# If you are running a cross compiler, you may want to set this
+# to something more interesting...
+CROSS = #powerpc-linux-
+CC = $(CROSS)gcc
+STRIPTOOL = $(CROSS)strip
+
+# To compile vs an alternative libc, you may need to use/adjust
+# the following lines to meet your needs.  This is how I make
+# busybox compile with uC-Libc...
+#LIBCDIR=/home/andersen/CVS/uC-libc
+#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
+#CFLAGS+=-nostdinc -fno-builtin -I$(LIBCDIR)/include -I$(GCCINCDIR)
+#LDFLAGS+=-nostdlib
+#LIBRARIES = $(LIBCDIR)/libc.a
+
+#--------------------------------------------------------
+
+# use '-Os' optimization if available, else use -O2
+OPTIMIZATION = $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
+    then echo "-Os"; else echo "-O2" ; fi)
+
+WARNINGS = -Wall
+
+ifeq ($(DOLFS),true)
+    # For large file summit support
+    CFLAGS+=-D_FILE_OFFSET_BITS=64
 endif
-
-# Allow alternative stripping tools to be used...
-ifndef $(STRIPTOOL)
-    STRIPTOOL = strip
+ifeq ($(DODMALLOC),true)
+    # For testing mem leaks with dmalloc
+    CFLAGS+=-DDMALLOC
+    LIBRARIES = -ldmalloc
+    # Force debug=true, since this is useless when not debugging...
+    DODEBUG = true
 endif
-
-
 # -D_GNU_SOURCE is needed because environ is used in init.c
 ifeq ($(DODEBUG),true)
-    CFLAGS += -Wall -g -D_GNU_SOURCE
-    LDFLAGS = 
+    CFLAGS += $(WARNINGS) -g -D_GNU_SOURCE
+    LDFLAGS += 
     STRIP   =
 else
-    CFLAGS  += -Wall $(OPTIMIZATION) -fomit-frame-pointer -fno-builtin -D_GNU_SOURCE
-    LDFLAGS  = -s
+    CFLAGS  += $(WARNINGS) $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
+    LDFLAGS  += -s
     STRIP    = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
-    #Only staticly link when _not_ debugging 
-    ifeq ($(DOSTATIC),true)
-	LDFLAGS += --static
-    endif
+endif
+ifeq ($(DOSTATIC),true)
+    LDFLAGS += --static
+    #
+    #use '-ffunction-sections -fdata-sections' and '--gc-sections' (if they 
+    # work) to try and strip out any unused junk.  Doesn't do much for me, 
+    # but you may want to give it a shot...
+    #
+    #ifeq ($(shell $(CC) -ffunction-sections -fdata-sections -S \
+    #	-o /dev/null -xc /dev/null 2>/dev/null && $(LD) \
+    #			--gc-sections -v >/dev/null && echo 1),1)
+    #	CFLAGS += -ffunction-sections -fdata-sections
+    #	LDFLAGS += --gc-sections
+    #endif
 endif
 
 ifndef $(PREFIX)
     PREFIX = `pwd`/_install
 endif
 
-LIBRARIES =
-OBJECTS   = $(shell ./busybox.sh) busybox.o messages.o utility.o
+OBJECTS   = $(shell ./busybox.sh) busybox.o messages.o usage.o utility.o
 CFLAGS    += -DBB_VER='"$(VERSION)"'
 CFLAGS    += -DBB_BT='"$(BUILDTIME)"'
 ifdef BB_INIT_SCRIPT
     CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
 endif
 
-all: busybox busybox.links docs
-.PHONY: all
 
-busybox: $(OBJECTS)
+all: busybox busybox.links doc
+
+doc: olddoc
+
+# Old Docs...
+olddoc: docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+
+docs/BusyBox.txt: docs/busybox.pod
+	@echo
+	@echo BusyBox Documentation
+	@echo
+	- pod2text docs/busybox.pod > docs/BusyBox.txt
+
+docs/BusyBox.1: docs/busybox.pod
+	- pod2man --center=BusyBox --release="version $(VERSION)" docs/busybox.pod > docs/BusyBox.1
+
+docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
+	- rm -f docs/BusyBox.html
+	- ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
+
+docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod
+	- pod2html --noindex docs/busybox.pod > docs/busybox.lineo.com/BusyBox.html
+	- rm -f pod2html*
+
+
+# New docs based on DOCBOOK SGML
+newdoc: docs/busybox.txt docs/busybox.pdf docs/busybox/busyboxdocumentation.html
+
+docs/busybox.txt: docs/busybox.sgml
+	@echo
+	@echo BusyBox Documentation
+	@echo
+	(cd docs; sgmltools -b txt busybox.sgml)
+
+docs/busybox.dvi: docs/busybox.sgml
+	(cd docs; sgmltools -b dvi busybox.sgml)
+
+docs/busybox.ps: docs/busybox.sgml
+	(cd docs; sgmltools -b ps busybox.sgml)
+
+docs/busybox.pdf: docs/busybox.ps
+	(cd docs; ps2pdf busybox.ps)
+
+docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
+	(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
+
+
+
+busybox: $(OBJECTS) 
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
 	$(STRIP)
 
-busybox.links: busybox.def.h
+busybox.links: Config.h
 	- ./busybox.mkll | sort >$@
 
-.PHONY: docs
-docs:	docs/busybox.pod
-	$(MAKE) -C docs clean all 
+nfsmount.o cmdedit.o: %.o: %.h
+$(OBJECTS): %.o: Config.h internal.h  %.c Makefile
 
-regexp.o nfsmount.o: %.o: %.h
-$(OBJECTS): %.o: busybox.def.h internal.h  %.c
+utility.o: loop.h
+
+loop.h:
+	@./mk_loop_h.sh
 
-.PHONY: test tests
 test tests:
 	cd tests && $(MAKE) all
 
-.PHONY: clean
 clean:
+	cd tests && $(MAKE) clean
+	- rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
+	    docs/busybox.lineo.com/BusyBox.html
+	- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
+	    docs/busybox.pdf docs/busybox.lineo.com/busybox.html
+	- rm -rf docs/busybox _install
 	- rm -f busybox.links *~ *.o core
-	- rm -rf _install
-	- cd tests && $(MAKE) clean
 
-.PHONY: distclean
 distclean: clean
 	- rm -f busybox
 	- cd tests && $(MAKE) distclean
 
-.PHONY: install
 install: busybox busybox.links
 	./install.sh $(PREFIX)
 
-.PHONY: dist release
-dist release: distclean
-	$(MAKE) -C docs clean all 
+install-hardlinks: busybox busybox.links
+	./install.sh $(PREFIX) --hardlinks
+
+dist release: distclean doc
 	cd ..;					\
 	rm -rf busybox-$(VERSION);		\
 	cp -a busybox busybox-$(VERSION);	\
@@ -148,4 +221,13 @@ dist release: distclean
 				 -print		\
 		| xargs rm -f;			\
 						\
+	find busybox-$(VERSION)/ -type f	\
+				 -name .\#*	\
+				 -print		\
+		| xargs rm -f;			\
+						\
 	tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)/;
+
+.PHONY: tags
+tags:
+	ctags -R .