projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1122 from PoppermostProductions/master
[mono.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 30f8cdef0f477fde761d3e515ed5b9faf9aa343e..da8953cdf2617c7cdd7ca2944b0c38e15a539af2 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,5
+1,7
@@
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
+AM_CFLAGS = $(WERROR_CFLAGS)
+
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
@@
-48,7
+50,9
@@
GIT_DIR ?= $(srcdir)/.git
dist-hook:
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
dist-hook:
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
- rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d`
+ rm -rf `find $(top_distdir)/external -path '*\.git'`
+ cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
+ cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
# Disable this for now because it is very slow and causes wrench to timeout:
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
# Disable this for now because it is very slow and causes wrench to timeout:
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
@@
-160,9
+164,9
@@
package-inputs:
done
echo "</root>" >> msvc/scripts/order.xml
done
echo "</root>" >> msvc/scripts/order.xml
-# Update llvm version in configure.
in
to the output of $LLVM_DIR/bin/llvm-config --version
+# Update llvm version in configure.
ac
to the output of $LLVM_DIR/bin/llvm-config --version
update-llvm-version:
if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
update-llvm-version:
if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
- REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.
in > tmp && mv tmp configure.in
&& echo "Version set to $$REV."
+ REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.
ac > tmp && mv tmp configure.ac
&& echo "Version set to $$REV."