diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | buildlib/defaults.mak | 2 | ||||
| -rw-r--r-- | buildlib/makefile.in | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..add464cd8 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +# -*- make -*- + +# This is the top level make file for APT, it recurses to each lower +# level make file and runs it with the proper target +.SILENT: + +.PHONY: headers library clean veryclean all binary program doc +all headers library clean veryclean binary program doc: + $(MAKE) -C deity $@ + $(MAKE) -C apt-pkg $@ diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index adbaf2758..05a4392a5 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -36,7 +36,7 @@ BUILD_POSSIBLE = $(BASE) $(BASE)/build endif BUILD:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak)) -BUILD:= $(firstword $(dir $(BUILD))) +BUILD:= $(patsubst %/,%,$(firstword $(dir $(BUILD)))) ifeq ($(words $(BUILD)),0) error-all: diff --git a/buildlib/makefile.in b/buildlib/makefile.in index a2f8300ce..596f33d9d 100644 --- a/buildlib/makefile.in +++ b/buildlib/makefile.in @@ -10,8 +10,8 @@ export BUILD # Chain to the parent make to do the actual building .PHONY: headers library clean veryclean all binary program doc -headers library clean veryclean all binary program doc: - $(MAKE) -C $(SRCDIR) $@ +all headers library clean veryclean binary program doc: + $(MAKE) -C $(SRCDIR) -f Makefile $@ # This makes any missing directories .PHONY: dirs |