Added missing semicolons

[mono.git] / runtime / Makefile.am

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index f87937e962ce44f8749808119162e6d988ca144a..6965d95cd90ac44cb415bd786a99fed7e88bfa55 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -2,11 +2,13 @@
 # being compiled on windows.
 #
 
+mcs_topdir=$(top_srcdir)/../mcs
+
 assemblies_DATA =      \
        Accessibility.dll                                       \
        ByteFX.Data.dll                                         \
        Commons.Xml.Relaxng.dll                                 \
-       corlib.dll                                              \
+       mscorlib.dll                                            \
        Cscompmgd.dll                                           \
        I18N.CJK.dll                                            \
        I18N.dll                                                \
@@ -18,19 +20,15 @@ assemblies_DATA =   \
        Microsoft.VisualBasic.dll                               \
        Microsoft.VisualC.dll                                   \
        Microsoft.Vsa.dll                                       \
-       Mono.Cairo.dll                                  \
+       Mono.Cairo.dll                  \
        Mono.CSharp.Debugger.dll                                \
-       Mono.Data.DB2Client.dll                                 \
-       Mono.Data.MySql.dll                                     \
-       Mono.Data.PostgreSqlClient.dll                          \
        Mono.Data.SqliteClient.dll                              \
        Mono.Data.SybaseClient.dll                              \
        Mono.Data.TdsClient.dll                                 \
        Mono.Data.Tds.dll                                       \
-       Mono.Directory.LDAP.dll                                 \
+       Novell.Directory.Ldap.dll                                       \
        Mono.GetOptions.dll                                     \
        Mono.Http.dll                                           \
-       Mono.PEToolkit.dll                                      \
        Mono.Posix.dll                                          \
        Mono.Security.dll                                       \
        Mono.Security.Win32.dll                                 \
@@ -58,7 +56,7 @@ assemblies_DATA =     \
        System.Windows.Forms.dll                                \
        System.Xml.dll
 
-monobins_DATA = mcs.exe mbas.exe monoresgen.exe secutil.exe ilasm.exe cilc.exe xsd.exe wsdl.exe genxs.exe
+monobins_DATA = mcs.exe mbas.exe monoresgen.exe secutil.exe ilasm.exe cilc.exe xsd.exe wsdl.exe genxs.exe al.exe disco.exe sqlsharp.exe signcode.exe chktrust.exe soapsuds.exe monop.exe setreg.exe cert2spc.exe certmgr.exe MakeCert.exe
 
 EXTRA_DIST = $(monobins_DATA) $(assemblies_DATA)
 
@@ -69,18 +67,40 @@ assembliesdir = $(libdir)
 monobinsdir = $(bindir)
 
 $(assemblies_DATA):
-       -cp $(top_srcdir)/../mcs/class/lib/$@ . || cp $(assembliesdir)/$@ . 
+       @f=$(mcs_topdir)/class/lib/$@; \
+       if test -f $$f; then :; else f=$(assembliesdir)/$@; fi ; \
+       echo "cp -f $$f $(srcdir)"; \
+       cp -f $$f $(srcdir)
 
 $(monobins_DATA):
-       -cp $(top_srcdir)/../mcs/mcs/mcs.exe . || cp $(monobinsdir)/mcs.exe . 
-       -cp $(top_srcdir)/../mcs/mbas/mbas.exe . || cp $(monobinsdir)/mbas.exe .
-       -cp $(top_srcdir)/../mcs/tools/security/secutil.exe . || cp $(monobinsdir)/secutil.exe . 
-       -cp $(top_srcdir)/../mcs/monoresgen/monoresgen.exe . || cp $(monobinsdir)/monoresgen.exe . 
-       -cp $(top_srcdir)/../mcs/ilasm/ilasm.exe . || cp $(monobinsdir)/ilasm.exe .
-       -cp $(top_srcdir)/../mcs/tools/cilc/cilc.exe . || cp $(monobinsdir)/cilc.exe .
-       -cp $(top_srcdir)/../mcs/tools/mono-xsd/xsd.exe . || cp $(monobinsdir)/xsd.exe .
-       -cp $(top_srcdir)/../mcs/tools/wsdl/wsdl.exe . || cp $(monobinsdir)/wsdl.exe .
-        
+       @case "$@" in \
+       mcs.exe)                 d=mcs                          ;; \
+       mbas.exe)                d=mbas                         ;; \
+       secutil.exe)             d=tools/security               ;; \
+       monoresgen.exe)          d=monoresgen                   ;; \
+       ilasm.exe)               d=ilasm                        ;; \
+       cilc.exe)                d=tools/cilc                   ;; \
+       xsd.exe)                 d=tools/mono-xsd               ;; \
+       wsdl.exe)                d=tools/wsdl                   ;; \
+       genxs.exe)               d=tools/genxs                  ;; \
+       al.exe)                  d=tools/al                     ;; \
+       disco.exe)               d=tools/disco                  ;; \
+       soapsuds.exe)            d=tools/soapsuds               ;; \
+       sqlsharp.exe)            d=tools/SqlSharp               ;; \
+       chktrust.exe)            d=tools/security               ;; \
+       signcode.exe)            d=tools/security               ;; \
+       MakeCert.exe)            d=tools/security               ;; \
+       cert2spc.exe)            d=tools/security               ;; \
+       certmgr.exe)             d=tools/security               ;; \
+       setreg.exe)              d=tools/security               ;; \
+       monop.exe)               d=tools/monop                  ;; \
+       browsercaps-updater.exe) d=tools/browsercaps-updater    ;; \
+       esac; \
+       f=$(mcs_topdir)/$$d/$@; \
+       if test -f $$f; then :; else f=$(monobinsdir)/$@; fi ; \
+       echo "cp -f $$f $(srcdir)"; \
+       cp -f $$f $(srcdir)
+
 dist-hook:
        for i in $(monobins_DATA) $(assemblies_DATA); do        \
                if test ! -s $(srcdir)/$$i; then echo $$i is empty && exit 1; fi        \