diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2012-12-11 02:15:16 +0400 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2012-12-11 03:09:25 +0400 |
| commit | c99f71cd84ecaf1679d6293da19e04768cbed1f3 (patch) | |
| tree | aaa9980c3d3e82919eaa07ba082728d42a77a10d /mcs | |
| parent | b0e9fb6f6f4791e9c7684c2e9af17f9929ff6564 (diff) | |
Introduce hooks for parallel build scripts.
* configure.in: Add new configure option that allows a parallel set of
build scripts to contribute to the current one.
* mono/mini/Makefile.am: Include the parallel build scripts when generating
Makefiles.
* mcs/build/gensources.sh:
* mcs/build/library.make: Probe for parallel source lists when building the
class libs.
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/build/gensources.sh | 5 | ||||
| -rw-r--r-- | mcs/build/library.make | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mcs/build/gensources.sh b/mcs/build/gensources.sh index 61639e54a29..816b8296f6c 100644 --- a/mcs/build/gensources.sh +++ b/mcs/build/gensources.sh @@ -3,6 +3,7 @@ outfile=$1 incfile=$2 excfile=$3 +extfile=$4 process_includes_1() { sed -e '/^[ \t]*$/d' -e '/^[ \t]*#/d' $1 > $2 @@ -31,6 +32,10 @@ rm -f $outfile.makefrag process_includes $incfile $outfile.inc +if test x$extfile != x -a -f $extfile; then + cat $extfile >> $outfile.inc +fi + sort -u $outfile.inc > $outfile.inc_s rm -f $outfile.inc diff --git a/mcs/build/library.make b/mcs/build/library.make index 768149e9d10..95ecee0ce64 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -17,11 +17,15 @@ PROFILE_excludes = $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources) sourcefile = $(depsdir)/$(PROFILE)_$(LIBRARY).sources library_CLEAN_FILES += $(sourcefile) +ifdef EXTENSION_MODULE +EXTENSION_include=$(topdir)/../../mono-extensions/mcs/$(thisdir)/$(PROFILE)_$(LIBRARY).sources +endif + # Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's # We don't include it in the dependencies since it isn't always created $(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh @echo Creating the per profile list $@ ... - $(SHELL) $(topdir)/build/gensources.sh $@ $(PROFILE_sources) $(PROFILE_excludes) + $(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)' '$(EXTENSION_include)' endif PLATFORM_excludes := $(wildcard $(LIBRARY).$(PLATFORM)-excludes) |