diff options
Diffstat (limited to 'automake')
| -rw-r--r-- | automake/host.am | 3 | ||||
| -rw-r--r-- | automake/local.am | 6 | ||||
| -rw-r--r-- | automake/subdirs.am | 23 |
3 files changed, 2 insertions, 30 deletions
diff --git a/automake/host.am b/automake/host.am index 7367d006a0..f999b83776 100644 --- a/automake/host.am +++ b/automake/host.am @@ -3,6 +3,3 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am diff --git a/automake/local.am b/automake/local.am index 4de51e5197..8068b4c61c 100644 --- a/automake/local.am +++ b/automake/local.am @@ -1,5 +1,3 @@ -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am - PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools + +all-local: $(TMPINSTALL_FILES) diff --git a/automake/subdirs.am b/automake/subdirs.am index 7ebc65a35b..37617e0759 100644 --- a/automake/subdirs.am +++ b/automake/subdirs.am @@ -5,26 +5,3 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -preinstall-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -## This trick allows "-k" to keep its natural meaning when running a -## recursive rule. - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -preinstall: preinstall-recursive -.PHONY: preinstall-recursive |