diff options
| author | Duncan Mak <duncan@mono-cvs.ximian.com> | 2004-05-01 09:46:50 +0400 |
|---|---|---|
| committer | Duncan Mak <duncan@mono-cvs.ximian.com> | 2004-05-01 09:46:50 +0400 |
| commit | 138f7a9b67aaf37623434b00dc729fc941d92e34 (patch) | |
| tree | 9973d604911e95cd0fc2b075ce98cf8232d78cd5 /runtime | |
| parent | 2eed3abb0fbad410c6a0535372cf851c6b031c0b (diff) | |
* runtime/net_1_1/Makefile.am:
* runtime/net_2_0/Makefile.am (gac_assemblies_list): Add NUnit
dlls here.
(non_gac_assemblies): Removed, every thing is migrated over to gac_assemblies.
(EXTRA_DIST): Include only gac_assemblies.
(dist_assemblies_DATA): It's referring to $(non_gac_assemblies)
and that is no gone now. So remove as well.
($(non_gac_assemblies)): Bye bye.
svn path=/trunk/mono/; revision=26497
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 15 | ||||
| -rw-r--r-- | runtime/net_2_0/Makefile.am | 15 |
2 files changed, 6 insertions, 24 deletions
diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index 3df2c00cd2d..89af78b28be 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -41,6 +41,8 @@ gac_assemblies_list = \ Mono.Security.Win32 \ Novell.Directory.Ldap \ Npgsql \ + NUnit.Util.dll \ + NUnit.Framework.dll \ PEAPI \ System.Configuration.Install \ System.Data \ @@ -64,14 +66,10 @@ gac_assemblies_list = \ gac_assemblies = $(gac_assemblies_list:=.dll) -non_gac_assemblies = \ - NUnit.Util.dll \ - NUnit.Framework.dll - corlibdir = $(libdir) dist_corlib_DATA = mscorlib.dll -EXTRA_DIST = $(gac_assemblies) $(non_gac_assemblies) +EXTRA_DIST = $(gac_assemblies) CLEANFILES = $(EXTRA_DIST) @@ -79,13 +77,6 @@ CLEANFILES = $(EXTRA_DIST) # Keep in sync with mono/mono/metadata/Makefile.am # assembliesdir = $(libdir) -dist_assemblies_DATA = $(non_gac_assemblies) - -$(non_gac_assemblies): - @f=$(mcs_topdir)/class/lib/$(PROFILE)/$@; \ - if test -f $$f; then :; else f=$(assembliesdir)/$@; fi ; \ - echo "cp -f $$f $(srcdir)"; \ - cp -f $$f $(srcdir) mscorlib.dll $(gac_assemblies): cp -f $(mcs_topdir)/class/lib/$(PROFILE)/$@ $(srcdir) diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index e8f78359476..8623d82a057 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -41,6 +41,8 @@ gac_assemblies_list = \ Mono.Security.Win32 \ Novell.Directory.Ldap \ Npgsql \ + NUnit.Util.dll \ + NUnit.Framework.dll \ PEAPI \ System.Configuration.Install \ System.Data \ @@ -64,27 +66,16 @@ gac_assemblies_list = \ gac_assemblies = $(gac_assemblies_list:=.dll) -non_gac_assemblies = \ - NUnit.Util.dll \ - NUnit.Framework.dll - corlibdir = $(libdir)/net_2_0 dist_corlib_DATA = mscorlib.dll -EXTRA_DIST = $(gac_assemblies) $(non_gac_assemblies) +EXTRA_DIST = $(gac_assemblies) CLEANFILES = $(EXTRA_DIST) # # Keep in sync with mono/mono/metadata/Makefile.am # assembliesdir = $(libdir) -dist_assemblies_DATA = $(non_gac_assemblies) - -$(non_gac_assemblies): - @f=$(mcs_topdir)/class/lib/$(PROFILE)/$@; \ - if test -f $$f; then :; else f=$(assembliesdir)/$@; fi ; \ - echo "cp -f $$f $(srcdir)"; \ - cp -f $$f $(srcdir) mscorlib.dll $(gac_assemblies): cp -f $(mcs_topdir)/class/lib/$(PROFILE)/$@ $(srcdir) |