diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 16:09:39 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 16:09:39 -0700 |
| commit | 887083d4555a91b093245f47717074557975177a (patch) | |
| tree | d6706f6919c47fe303f7d81642e8cdebbb4f43c4 | |
| parent | c7a3d3b4e2be8221e2f8d1d26b76c4864bdad7f1 (diff) | |
| download | crawl-ref-887083d4555a91b093245f47717074557975177a.tar.gz crawl-ref-887083d4555a91b093245f47717074557975177a.zip | |
makefile: move contrib directory check to contrib/Makefile
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| -rw-r--r-- | crawl-ref/source/contrib/Makefile | 6 | ||||
| -rw-r--r-- | crawl-ref/source/makefile | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/crawl-ref/source/contrib/Makefile b/crawl-ref/source/contrib/Makefile index b460362ad4..8b2d151b04 100644 --- a/crawl-ref/source/contrib/Makefile +++ b/crawl-ref/source/contrib/Makefile @@ -12,7 +12,11 @@ clean distclean: rm -rf $(PREFIX) $(SUBDIRS): - @cd $@; \ + @if [ ! -x $@ ]; then \ + echo "The '$@' folder is missing. Have you run 'git submodule update --init'?"; \ + exit 1; \ + fi + @cd $@ && \ $(MAKE) all prefix=$(PREFIX) && \ $(MAKE) install prefix=$(PREFIX) diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index f6c5a21cec..59166a9fcc 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -608,8 +608,6 @@ DEPENDENCY_MKF := makefile.dep depend: $(DEPENDENCY_MKF) -makefile.dep: .contrib-ok - %.dep: $(OBJECTS:.o=.cc) $(QUIET_DEPEND)fastdep $(DEFINES) $(INCLUDES) $(OBJECTS:.o=.cc) > $@ @@ -704,7 +702,7 @@ endif clean: +$(MAKE) -C $(UTIL) clean +$(MAKE) -C $(RLTILES) -f makefile.unix clean - $(RM) $(GAME) $(GAME).exe $(EXTRA_OBJECTS) $(OBJECTS) $(OBJECTS:.o=.d) *.ixx build.h compflag.h .contrib-ok .contrib-libs + $(RM) $(GAME) $(GAME).exe $(EXTRA_OBJECTS) $(OBJECTS) $(OBJECTS:.o=.d) *.ixx build.h compflag.h .contrib-libs clean-contrib: +$(MAKE) -C contrib clean @@ -713,15 +711,6 @@ distclean: clean clean-contrib clean-rltiles $(RM) -r morgue saves $(RM) scores $(GAME) core *.0* *.lab $(DEPENDENCY_MKF) -.contrib-ok: - @for a in contrib/lua/src/Makefile contrib/sqlite/Makefile contrib/pcre/Makefile; do \ - if [ ! -f $$a ]; then \ - echo "The '$$a' file is missing. Have you run 'git submodule update --init'?"; \ - exit 1; \ - fi \ - done - @touch .contrib-ok - $(GAME): $(GAME_DEPENDS) $(QUIET_LINK)$(CXX) $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) |