merge -r 58060:58217

[mono.git] / scripts / Makefile.am

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a6b6f6fa1e777c2b269697dae3379dcc99877faa..7ddb6fa1780b3479a8d56fb302a197b556ee8b10 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,4 @@
-bin_SCRIPTS = $(scripts_1_0) $(scripts_2_0) gmcs mono-service $(scripts_rpmhelpers)
+bin_SCRIPTS = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) mono-service $(scripts_rpmhelpers)
 
 scripts_1_0 = \
        al                      \
@@ -12,7 +12,6 @@ scripts_1_0 = \
        gacutil                 \
        genxs                   \
        ilasm                   \
-       makecert                \
        macpack                 \
        mbas                    \
        mcs                     \
@@ -20,6 +19,7 @@ scripts_1_0 = \
        mkbundle                \
        monop                   \
        mono-shlib-cop          \
+       mozroots                \
        nunit-console           \
        permview                \
        prj2make                \
@@ -27,26 +27,33 @@ scripts_1_0 = \
        secutil                 \
        setreg                  \
        signcode                \
-       sn                      \
        soapsuds                \
        sqlsharp                \
        wsdl                    \
        xsd
 
+scripts_1_0_umask = \
+       makecert                \
+       sn
+
 scripts_2_0 = \
+       gmcs                    \
+       ilasm2                  \
        monop2                  \
-       wsdl2
+       wsdl2                   \
+       xbuild
 
 scripts_rpmhelpers = mono-find-provides mono-find-requires
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= mono-nunit.pc
 
-CLEANFILES = $(scripts_1_0) $(scripts_2_0) gmcs mono-service
+CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) gmcs mono-service
 DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
 
 EXTRA_DIST =                   \
        script.in              \
+       script_umask.in        \
        mono-service.in        \
        mono-nunit.pc.in       \
        mono-find-provides.in  \
@@ -84,8 +91,8 @@ $(scripts_1_0): script.in Makefile
        $(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script.in > $@.tmp
        mv $@.tmp $@
 
-gmcs: script.in Makefile
-       $(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/script.in > $@.tmp
+$(scripts_1_0_umask): script_umask.in Makefile
+       $(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script_umask.in > $@.tmp
        mv $@.tmp $@
 
 $(scripts_2_0): script.in Makefile