X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=8afd6986328e50025cbfcc7f342432ec8c72bbf8;hb=37ba6bfb6d7ff7287ecda14bb4906fa6de1e78c9;hp=7a8337003f7c7e6030e99d270f8c0aeed075067a;hpb=674b08a6b8ce0b3b1c26d9f326fb2e59bd8dc1e8;p=oweals%2Fbusybox.git

diff --git a/Makefile b/Makefile
index 7a8337003..8afd69863 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ all: busybox busybox.links doc
 # In this section, we need .config
 -include .config.cmd
 include $(patsubst %,%/Makefile.in, $(DIRS))
+-include $(TOPDIR).depend
 
 busybox: .depend include/config.h $(libraries-y)
 	$(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group
@@ -66,10 +67,7 @@ install-hardlinks: applets/install.sh busybox busybox.links
 
 
 # Documentation Targets
-doc: olddoc
-
-# Old Docs...
-olddoc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
 
 docs/busybox.pod : docs/busybox_header.pod include/usage.h docs/busybox_footer.pod
 	- ( cat docs/busybox_header.pod; \
@@ -99,33 +97,6 @@ docs/busybox.net/BusyBox.html: docs/busybox.pod
 	    docs/busybox.net/BusyBox.html
 	-@ rm -f pod2htm*
 
-
-# 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
-	- mkdir -p docs
-	(cd docs; sgmltools -b txt busybox.sgml)
-
-docs/busybox.dvi: docs/busybox.sgml
-	- mkdir -p docs
-	(cd docs; sgmltools -b dvi busybox.sgml)
-
-docs/busybox.ps: docs/busybox.sgml
-	- mkdir -p docs
-	(cd docs; sgmltools -b ps busybox.sgml)
-
-docs/busybox.pdf: docs/busybox.ps
-	- mkdir -p docs
-	(cd docs; ps2pdf busybox.ps)
-
-docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
-	- mkdir -p docs
-	(cd docs/busybox.net; sgmltools -b html ../busybox.sgml)
-
 # The nifty new buildsystem stuff
 scripts/mkdep: scripts/mkdep.c
 	$(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
@@ -138,9 +109,9 @@ scripts/split-include: scripts/split-include.c
 	mkdir -p include/config;
 	$(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
 	scripts/mkdep -I include -- \
-		`find . -name \*.c -print` >> .depend;
+		`find -name \*.c -print | sed -e "s,^./,,"` >> .depend;
 	scripts/mkdep -I include -- \
-		`find . -name \*.h -print` >> .hdepend;
+		`find -name \*.h -print | sed -e "s,^./,,"` >> .hdepend;
 
 depend dep: include/config.h .depend
 
@@ -206,18 +177,12 @@ allnoconfig: scripts/config/conf
 defconfig: scripts/config/conf
 	@./scripts/config/conf -d $(CONFIG_CONFIG_IN)
 
-test tests: busybox
-	# Note that 'tests' is depricated.  Use 'make check' instead
-	# To use the nice new testsuite....
-	cd tests && ./tester.sh
-
 check: busybox
 	cd testsuite && ./runtest
 
 clean:
-	- $(MAKE) -C tests clean
-	- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
-	    docs/busybox.pdf docs/busybox.pod docs/busybox.net/busybox.html \
+	- 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 libbb/loop.h \
@@ -258,6 +223,6 @@ tags:
 endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \
-	menuconfig tags check test tests depend
+	menuconfig tags check test depend