From 7c69574c5bec814cc3cb58701d2beccfe6093add Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Aug 2011 12:05:22 +0200 Subject: add 'dirs' target to the 'all' target to ensure that for e.g. the tests all (sub)directories are build which are needed (e.g. obj/ and co) --- buildlib/defaults.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index bf93bd2ee..d4269e05f 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -118,7 +118,7 @@ MKDIRS := $(BIN) # list .PHONY: headers library clean veryclean all binary program doc dirs .PHONY: maintainer-clean dist-clean distclean pristine sanity -all: binary doc +all: dirs binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean headers library clean veryclean program: -- cgit v1.2.3-70-g09d2 From 9edcd9adcecc4f0c2a8e1744c2fbc7c38e3397e6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Aug 2011 14:35:58 +0200 Subject: build test-binaries by default and add a test target to toplevel --- Makefile | 5 +++-- buildlib/defaults.mak | 2 +- test/Makefile | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 test/Makefile (limited to 'buildlib') diff --git a/Makefile b/Makefile index 664caca41..9a47014c3 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,8 @@ endif .PHONY: default default: startup all -.PHONY: headers library clean veryclean all binary program doc -all headers library clean veryclean binary program doc dirs: +.PHONY: headers library clean veryclean all binary program doc test +all headers library clean veryclean binary program doc dirs test: $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ @@ -19,6 +19,7 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C dselect $@ $(MAKE) -C doc $@ $(MAKE) -C po $@ + $(MAKE) -C test $@ # Some very common aliases .PHONY: maintainer-clean dist-clean distclean pristine sanity diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index d4269e05f..edb089160 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -121,7 +121,7 @@ MKDIRS := $(BIN) all: dirs binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean -headers library clean veryclean program: +headers library clean veryclean program test: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/test/Makefile b/test/Makefile new file mode 100644 index 000000000..f918f7d2e --- /dev/null +++ b/test/Makefile @@ -0,0 +1,21 @@ +# -*- make -*- + +# This is the top level test makefile for APT, it recurses to each lower +# level make file and runs it with the proper target +ifndef NOISY +.SILENT: +endif + +.PHONY: headers library clean veryclean all binary program doc +all clean veryclean binary program dirs: + $(MAKE) -C libapt $@ + $(MAKE) -C interactive-helper $@ + +# Some very common aliases +.PHONY: maintainer-clean dist-clean distclean pristine sanity +maintainer-clean dist-clean distclean pristine sanity: veryclean + + +.PHONY: test +test: + ./libapt/run-tests -- cgit v1.2.3-70-g09d2