projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings in runghc
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b48cdca
..
d0b081d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-131,8
+131,6
@@
stage1 : $(GCC_LIB_DEP) check-all
$(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \
done
$(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \
done
- $(MAKE) -C ghc stage=1 boot
- $(MAKE) -C ghc stage=1
$(MAKE) -C rts boot
$(MAKE) -C rts
$(MAKE) -C libraries all
$(MAKE) -C rts boot
$(MAKE) -C rts
$(MAKE) -C libraries all
@@
-151,14
+149,10
@@
stage2 : check-all
ifeq "$(HADDOCK_DOCS)" "YES"
$(MAKE) -C compiler stage=2 doc
endif
ifeq "$(HADDOCK_DOCS)" "YES"
$(MAKE) -C compiler stage=2 doc
endif
- $(MAKE) -C ghc stage=2 boot
- $(MAKE) -C ghc stage=2
stage3 : check-all
$(MAKE) -C compiler stage=3 boot
$(MAKE) -C compiler stage=3
stage3 : check-all
$(MAKE) -C compiler stage=3 boot
$(MAKE) -C compiler stage=3
- $(MAKE) -C ghc stage=3 boot
- $(MAKE) -C ghc stage=3
bootstrap : bootstrap2
bootstrap : bootstrap2
@@
-395,7
+389,9
@@
endif
$(RM) -f $(BIN_DIST_NAME)
ln -s . $(BIN_DIST_NAME)
$(RM) -f $(BIN_DIST_NAME)
ln -s . $(BIN_DIST_NAME)
- tar cf $(BIN_DIST_TAR) -T $(BIN_DIST_LIST)
+# h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
+# tree then we want to include the real file, not a symlink to it
+ tar hcf $(BIN_DIST_TAR) -T $(BIN_DIST_LIST)
cd $(BIN_DIST_PREP_DIR) && tar rf $(BIN_DIST_TAR) $(BIN_DIST_NAME)
bzip2 < $(BIN_DIST_TAR) > $(BIN_DIST_TAR_BZ2)
tar tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion)
cd $(BIN_DIST_PREP_DIR) && tar rf $(BIN_DIST_TAR) $(BIN_DIST_NAME)
bzip2 < $(BIN_DIST_TAR) > $(BIN_DIST_TAR_BZ2)
tar tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion)
@@
-601,7
+597,7
@@
DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
docs/users_guide/ug-book.xml extra-gcc-opts
# don't clean config.mk: it's needed when cleaning stuff later on
docs/users_guide/ug-book.xml extra-gcc-opts
# don't clean config.mk: it's needed when cleaning stuff later on
-LATE_DIST_CLEAN_FILES += mk/config.mk
+LATE_DIST_CLEAN_FILES += mk/config.mk mk/are-validating.mk
# VERSION is shipped in a source dist
MAINTAINER_CLEAN_FILES += VERSION
# VERSION is shipped in a source dist
MAINTAINER_CLEAN_FILES += VERSION
@@
-610,6
+606,9
@@
extraclean::
$(RM) -rf autom4te.cache
clean distclean ::
$(RM) -rf autom4te.cache
clean distclean ::
+ $(RM) -rf inplace-datadir
+
+clean distclean ::
$(MAKE) -C bindisttest $@
if test -d testsuite; then $(MAKE) -C testsuite $@; fi
$(MAKE) -C bindisttest $@
if test -d testsuite; then $(MAKE) -C testsuite $@; fi