X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=97717f431073cf234b42eb89dc340a3596d4ff60;hb=8f7779f8d0def3e9671a30ed146cd4c92beed538;hp=7b7f50e7ccb0ba5d83f7d8d197bca78654562ef5;hpb=3a816ba679da47108dc1d7f15c490b5abfdc8b1f;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index 7b7f50e..97717f4 100644 --- a/Makefile +++ b/Makefile @@ -256,7 +256,7 @@ SRC_DIST_FILES += \ aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \ mk/bootstrap.mk \ mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \ - mk/paths.mk mk/suffix.mk mk/target.mk + mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk dist dist-manifest dist-package :: project-check @@ -324,14 +324,15 @@ ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace" all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils - cd happy && make boot all + $(MAKE) -C happy boot all endif all :: @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(SUBDIRS); do \ if [ -d $$i ]; then \ - $(MAKE) -C $$i boot all; \ + $(MAKE) -C $$i boot; \ + $(MAKE) -C $$i all; \ if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ fi; \ done