X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=88be6ea53c856838d3163ef40ff03be1874f3743;hb=50beb484c091b7eb9fdd4cba436757c12f316b8d;hp=2538bb4598370908861ca62b6daffd2ab8c1cf48;hpb=d19af8f11dadf32893a8d34d51a459b9a35a63bc;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 2538bb45983..88be6ea53c8 100644
--- 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,23 +46,23 @@ 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
 
-$(fx11_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)/mcs/mbas.exe; then f=$(mcs_topdir)/mcs/mbas.exe; else f=$(fx11dir)/mbas.exe; fi; \
+	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)
 
-$(fx20_DATA):
+$(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)
@@ -86,6 +88,8 @@ $(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				;; \
@@ -100,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 {} \;