diff options
author | Adam Borowski <kilobyte@angband.pl> | 2009-11-09 16:03:48 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-09 23:28:55 +0100 |
commit | 193c54187f4d951b8711d2c2bcb21673d106de26 (patch) | |
tree | 5915d07c6a2286fd56216a5fe27fbc135829c7d8 /crawl-ref/source/makefile | |
parent | c35d5364269189d0a0ccfad0b2106a0f054d3842 (diff) | |
download | crawl-ref-193c54187f4d951b8711d2c2bcb21673d106de26.tar.gz crawl-ref-193c54187f4d951b8711d2c2bcb21673d106de26.zip |
Doing distclean together with other things is a losing idea, serialize it.
Diffstat (limited to 'crawl-ref/source/makefile')
-rw-r--r-- | crawl-ref/source/makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 6bd382df00..928031de59 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -745,6 +745,8 @@ $(UTIL)levcomp.tab.cc: $(UTIL)levcomp.ypp $(UTIL)levcomp.lex.cc: $(UTIL)levcomp.lpp $(UTIL)levcomp.tab.cc +@$(MAKE) -C $(UTIL) levcomp.lex.cc +$(UTIL)levcomp.tab.h: $(UTIL)levcomp.tab.cc + else # Pull the level-compiler stuff up from prebuilt/ @@ -872,7 +874,7 @@ art-data.h: art-data.txt util/art-data.pl art-func.h .PHONY: rltile-build rltile-build: .contrib-libs - $(MAKE) -C $(RLTILES) -f makefile.unix all + +$(MAKE) -C $(RLTILES) -f makefile.unix all $(TILEDEFSRCS): rltile-build $(TILEDEFHDRS): rltile-build @@ -890,9 +892,15 @@ clean-rltiles: # # To package, you *must* have lex and yacc to generate the intermediates. -ifdef DOYACC -package-source: distclean prebuildyacc pkgtidy depend removeold vlink \ - pkgtarbz2 pkgzip +package-source: + +$(MAKE) distclean + +$(MAKE) prebuildyacc + +$(MAKE) pkgtidy + +$(MAKE) depend + +$(MAKE) removeold + +$(MAKE) vlink + +$(MAKE) pkgtarbz2 + +$(MAKE) pkgzip pkgtidy: $(RM) $(PKG_TIDY_LIST) @@ -913,5 +921,3 @@ pkgtarbz2: pkgzip: cd ../.. && zip -rq $(SRC_PKG_ZIP) $(PKG_SRC_DIR) \ -x@$(PKG_EXCLUDES) - -endif |