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

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index ed137cbe17b..88be6ea53c8 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -1,65 +1,110 @@
-#
 # This is just used to copy and install the DLL files that are currently
 # being compiled on windows.
 #
 
-assemblies_DATA =	\
-	Accessibility.dll					\
-	corlib.dll						\
-	Cscompmgd.dll						\
-	I18N.CJK.dll						\
-	I18N.dll						\
-	I18N.MidEast.dll					\
-	I18N.Other.dll						\
-	I18N.Rare.dll						\
-	I18N.West.dll						\
-	Microsoft.VisualBasic.dll				\
-	Mono.CSharp.Debugger.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.GetOptions.dll					\
-	Mono.PEToolkit.dll					\
-	NUnitCore_mono.dll					\
-	System.Configuration.Install.dll			\
-	System.Data.dll						\
-	System.dll						\
-	System.Drawing.dll					\
-	System.EnterpriseServices.dll				\
-	System.Runtime.Remoting.dll				\
-	System.Runtime.Serialization.Formatters.Soap.dll	\
-	System.Web.dll						\
-	System.Web.Services.dll					\
-	System.Windows.Forms.dll				\
-	System.Xml.dll
+SUBDIRS = . net_1_1 net_2_0
+
+mcs_topdir=$(top_srcdir)/../mcs
+
+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
+
+monoone_DATA = \
+	mcs.exe					\
+	mbas.exe
 
-monobins_DATA = mcs.exe monoresgen.exe
+monotwo_DATA = \
+	gmcs.exe
 
-EXTRA_DIST = $(monobins_DATA) $(assemblies_DATA)
+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
 
-$(assemblies_DATA):
-	cp $(top_srcdir)/../mcs/class/lib/$@ . || cp $(assembliesdir)/$@ . 
+$(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)
 
-$(monobins_DATA):
-	cp $(top_srcdir)/../mcs/mcs/mcs.exe . || cp $(monobinsdir)/$@ . 
-	cp $(top_srcdir)/../mcs/monoresgen/monoresgen.exe . || cp $(monobinsdir)/$@ . 
+$(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)
 
-dist-hook:
-	for i in $(monobins_DATA) $(assemblies_DATA); do	\
-		if test ! -s $(srcdir)/$$i; then echo $$i is empty && exit 1; fi	\
-	done
+$(monobins_DATA):
+	@case "$@" in \
+	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               ;; \
+	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				;; \
+	esac; \
+	f=$(mcs_topdir)/$$d/$@; \
+	if test -f $$f; then :; else f=$(monobinsdir)/$@; fi ; \
+	echo "cp -f $$f $(srcdir)"; \
+	cp -f $$f $(srcdir)
 
 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 {} \;