diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
| commit | 21248c0f00ee71412dbadc6ebf84011cf974346d (patch) | |
| tree | 7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /Makefile | |
| parent | e5f34ad3b043abf033c1626eb8449b75955d6760 (diff) | |
| parent | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff) | |
Merge branch 'debian/experimental' into feature/srv-records
Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -10,7 +10,7 @@ endif default: startup all .PHONY: headers library clean veryclean all binary program doc test update-po -all headers library clean veryclean binary program doc manpages debiandoc test update-po startup dirs: +all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs: $(MAKE) -C vendor $@ $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ @@ -23,7 +23,7 @@ all headers library clean veryclean binary program doc manpages debiandoc test u $(MAKE) -C po $@ $(MAKE) -C test $@ -all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs +all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs dirs: startup |