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

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 9a69707a93b..88be6ea53c8 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -6,25 +6,69 @@ SUBDIRS = . net_1_1 net_2_0
 
 mcs_topdir=$(top_srcdir)/../mcs
 
-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 gacutil.exe gmcs.exe
+monobins_DATA = \
+	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				\
+	mono-find-provides.exe			\
+	mono-find-requires.exe 			\
+	setreg.exe				\
+	cert2spc.exe				\
+	certmgr.exe				\
+	MakeCert.exe				\
+	gacutil.exe				\
+	sn.exe
 
-EXTRA_DIST = $(monobins_DATA)
+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
 #
-assembliesdir = $(libdir)
 if PLATFORM_WIN32
 monobinsdir = $(libdir)
+monoonedir = $(libdir)
+monotwodir = $(libdir)
 else
 monobinsdir = $(bindir)
+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                         ;; \
-	secutil.exe)             d=tools/security               ;; \
 	monoresgen.exe)          d=monoresgen                   ;; \
 	ilasm.exe)               d=ilasm                        ;; \
 	cilc.exe)                d=tools/cilc                   ;; \
@@ -40,25 +84,27 @@ $(monobins_DATA):
 	MakeCert.exe)            d=tools/security               ;; \
 	cert2spc.exe)            d=tools/security               ;; \
 	certmgr.exe)             d=tools/security               ;; \
+	secutil.exe)             d=tools/security               ;; \
 	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				;; \
-	sn.exe)                  d=tools/sn                     ;; \
 	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	\
-	done
-
 copy_dlls:
 	cp /nt/mono/mcs/class/*/*.dll .
 
 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 {} \;