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 #3121 from lambdageek/dev/managed-init_message
[mono.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e9d6ccdcda6014e0362204c0ecd833d88e35fceb..c0672460ea05b19b410a140f5790651cafd6b6cf 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-5,23
+5,15
@@
AM_CFLAGS = $(WERROR_CFLAGS)
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
acceptance-tests llvm
# Keep in sync with SUBDIRS
## 'tools' is not normally built
# Keep in sync with SUBDIRS
## 'tools' is not normally built
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
acceptance-tests llvm
else
else
-if ONLY_MONOTOUCH
-SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
-else
-if ONLY_XAMMAC
-SUBDIRS = $(libgc_dir) eglib/src mono runtime
-else
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests llvm
# Keep in sync with SUBDIRS
## 'tools' is not normally built
# Keep in sync with SUBDIRS
## 'tools' is not normally built
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
-endif
-endif
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
endif
all: update_submodules
endif
all: update_submodules
@@
-33,15
+25,15
@@
update_submodules:
.PHONY: update_submodules
EXTRA_DIST= \
.PHONY: update_submodules
EXTRA_DIST= \
-
README.md
\
-
LICENSE
\
-
autogen.sh
\
-
build-mingw32.sh
\
-
mkinstalldirs
\
-
mono-uninstalled.pc.in
\
-
winconfig.h
\
-
mono-core.spec
\
- external
+
README.md
\
+
LICENSE
\
+
autogen.sh
\
+
mkinstalldirs
\
+
mono-uninstalled.pc.in
\
+
winconfig.h
\
+
code_of_conduct.md
\
+
external
\
+ mcs/class/referencesource
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
@@
-66,7
+58,7
@@
DISTCLEANFILES= mono-uninstalled.pc
mcslib = $(mcs_topdir)/class/lib
monolite = $(mcslib)/monolite
mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
mcslib = $(mcs_topdir)/class/lib
monolite = $(mcslib)/monolite
mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
-monolite_url = http://
storage.bos.xamarin.com/mono-dist-master/latest
/monolite-$(mono_corlib_version)-latest.tar.gz
+monolite_url = http://
download.mono-project.com/monolite
/monolite-$(mono_corlib_version)-latest.tar.gz
.PHONY: get-monolite-latest
get-monolite-latest:
-rm -fr $(mcslib)/monolite-*
.PHONY: get-monolite-latest
get-monolite-latest:
-rm -fr $(mcslib)/monolite-*
@@
-172,3
+164,7
@@
update-llvm-version:
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."
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."
+update-solution-files:
+ make update-csproj
+ make package-inputs
+ (cd msvc/scripts; make genproj.exe; mono genproj.exe)