diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | runtime/Makefile.am | 9 |
3 files changed, 2 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 68269d7e917..19f0cfbd799 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,19 +10,11 @@ SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scr ## 'tools' is not normally built DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs 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) # 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 -endif all: update_submodules diff --git a/configure.ac b/configure.ac index 9dc1c37d022..717c24d85ca 100644 --- a/configure.ac +++ b/configure.ac @@ -3493,8 +3493,8 @@ esac AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes]) AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no]) -AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no,only If you want to build the MonoTouch assemblies (defaults to no)], [], [with_monotouch=no]) -AC_ARG_WITH(xammac, [ --with-xammac=yes,no,only If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no]) +AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=no]) +AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no]) OPROFILE=no AC_ARG_WITH(oprofile,[ --with-oprofile=no,<oprofile install dir> Enable oprofile support (defaults to no)],[ @@ -3597,8 +3597,6 @@ AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes]) AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"]) AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"]) AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"]) -AM_CONDITIONAL(ONLY_MONOTOUCH, [test "x$with_monotouch" = "xonly"]) -AM_CONDITIONAL(ONLY_XAMMAC, [test "x$with_xammac" = "xonly"]) AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes) AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno) diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 82756c7419d..f3b3893d1be 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -25,12 +25,6 @@ $(symlinks): SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config -if ONLY_MONOTOUCH -build_profiles = monotouch -else -if ONLY_XAMMAC -build_profiles = xammac -else build_profiles = if INSTALL_4_5 @@ -52,9 +46,6 @@ endif test_profiles = $(build_profiles) -endif -endif - if BUILD_MCS MAKE_FLAGS=$(if $(V),,--no-print-directory -s) |