2004-05-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>

[mono.git] / runtime / Makefile.am

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 204b044f122941bae85cbd020966e529d7d00a22..0f16329c61b12a5367d42ae22b5e970443468634 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -21,6 +21,8 @@ monobins_DATA = \
        chktrust.exe                            \
        soapsuds.exe                            \
        monop.exe                               \
+       mono-find-provides.exe                  \
+       mono-find-requires.exe                  \
        setreg.exe                              \
        cert2spc.exe                            \
        certmgr.exe                             \
@@ -28,14 +30,14 @@ monobins_DATA = \
        gacutil.exe                             \
        sn.exe
 
-fx11_DATA = \
+monoone_DATA = \
        mcs.exe                                 \
        mbas.exe
 
-fx20_DATA = \
+monotwo_DATA = \
        gmcs.exe
 
-EXTRA_DIST= $(monobins_DATA) $(fx11_DATA) $(fx20_DATA)
+EXTRA_DIST= $(monobins_DATA) $(monoone_DATA) $(monotwo_DATA)
 
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
@@ -44,18 +46,29 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 #
 if PLATFORM_WIN32
 monobinsdir = $(libdir)
-fx11dir = $(libdir)
-fx20dir = $(libdir)
+monoonedir = $(libdir)
+monotwodir = $(libdir)
 else
 monobinsdir = $(bindir)
-fx11dir = $(libdir)/mono/1.1/
-fx20dir = $(libdir)/mono/2.0/
+monoonedir = $(libdir)/mono/1.0/
+monotwodir = $(libdir)/mono/2.0/
 endif
 
+$(monoone_DATA):
+       if test -f $(mcs_topdir)/mcs/mcs.exe; then f=$(mcs_topdir)/mcs/mcs.exe; else f=$(fx11dir)/mcs.exe; fi; \
+       echo "cp -f $$f $(srcdir)"; \
+       cp -f $$f $(srcdir)
+       if test -f $(mcs_topdir)/mbas/mbas.exe; then f=$(mcs_topdir)/mbas/mbas.exe; else f=$(fx11dir)/mbas.exe; fi; \
+       echo "cp -f $$f $(srcdir)"; \
+       cp -f $$f $(srcdir)
+
+$(monotwo_DATA):
+       if test -f $(mcs_topdir)/gmcs/gmcs.exe; then f=$(mcs_topdir)/gmcs/gmcs.exe; else f=$(fx20dir)/gmcs.exe; fi; \
+       echo "cp -f $$f $(srcdir)"; \
+       cp -f $$f $(srcdir)
+
 $(monobins_DATA):
        @case "$@" in \
-       mcs.exe)                 d=mcs                          ;; \
-       mbas.exe)                d=mbas                         ;; \
        monoresgen.exe)          d=monoresgen                   ;; \
        ilasm.exe)               d=ilasm                        ;; \
        cilc.exe)                d=tools/cilc                   ;; \
@@ -75,12 +88,14 @@ $(monobins_DATA):
        setreg.exe)              d=tools/security               ;; \
        sn.exe)                  d=tools/security               ;; \
        monop.exe)               d=tools/monop                  ;; \
+       mono-find-provides.exe)  d=tools/mono-find-provides     ;; \
+       mono-find-requires.exe)  d=tools/mono-find-requires     ;; \
        browsercaps-updater.exe) d=tools/browsercaps-updater    ;; \
        gacutil.exe)             d=tools/gacutil                ;; \
        gmcs.exe)                d=gmcs                         ;; \
        esac; \
        f=$(mcs_topdir)/$$d/$@; \
-       if test -f $$f; then :; else f=$(monobinsdir)/$@; fi ; \
+mcs    if test -f $$f; then :; else f=$(monobinsdir)/$@; fi ; \
        echo "cp -f $$f $(srcdir)"; \
        cp -f $$f $(srcdir)
 
@@ -89,3 +104,7 @@ copy_dlls:
 
 push_dlls:
        scp -o "Protocol 1" *.dll *.exe snapshot@mono-cvs.ximian.com:dlls
+
+cleanassemblies:
+       find -name \*.dll -exec rm -vf {} \;
+       find -name \*.exe -exec rm -vf {} \;