Flush

[mono.git] / runtime / Makefile.am

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 7bf5864496b3a8f6b75b93e3cfbe21c117698a1a..88be6ea53c856838d3163ef40ff03be1874f3743 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -6,9 +6,7 @@ SUBDIRS = . net_1_1 net_2_0
 
 mcs_topdir=$(top_srcdir)/../mcs
 
-dist_monobins_DATA = \
-       mcs.exe                                 \
-       mbas.exe                                \
+monobins_DATA = \
        monoresgen.exe                          \
        secutil.exe                             \
        ilasm.exe                               \
@@ -23,27 +21,54 @@ dist_monobins_DATA = \
        chktrust.exe                            \
        soapsuds.exe                            \
        monop.exe                               \
+       mono-find-provides.exe                  \
+       mono-find-requires.exe                  \
        setreg.exe                              \
        cert2spc.exe                            \
        certmgr.exe                             \
        MakeCert.exe                            \
        gacutil.exe                             \
-       gmcs.exe                                \
        sn.exe
 
+monoone_DATA = \
+       mcs.exe                                 \
+       mbas.exe
+
+monotwo_DATA = \
+       gmcs.exe
+
+EXTRA_DIST= $(monobins_DATA) $(monoone_DATA) $(monotwo_DATA)
+
+MAINTAINERCLEANFILES = $(EXTRA_DIST)
+
 #
 # Keep in sync with mono/mono/metadata/Makefile.am
 #
 if PLATFORM_WIN32
 monobinsdir = $(libdir)
+monoonedir = $(libdir)
+monotwodir = $(libdir)
 else
 monobinsdir = $(bindir)
+monoonedir = $(libdir)/mono/1.0/
+monotwodir = $(libdir)/mono/2.0/
 endif
 
-$(dist_monobins_DATA):
+$(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                   ;; \
@@ -63,6 +88,8 @@ $(dist_monobins_DATA):
        setreg.exe)              d=tools/security               ;; \
        sn.exe)                  d=tools/security               ;; \
        monop.exe)               d=tools/monop                  ;; \
+       mono-find-provides.exe)  d=tools/mono-rpm-helpers/mono-find-provides    ;; \
+       mono-find-requires.exe)  d=tools/mono-rpm-helpers/mono-find-requires    ;; \
        browsercaps-updater.exe) d=tools/browsercaps-updater    ;; \
        gacutil.exe)             d=tools/gacutil                ;; \
        gmcs.exe)                d=gmcs                         ;; \
@@ -77,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 {} \;