diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2008-04-14 14:59:57 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2008-04-14 14:59:57 +0400 |
| commit | c19c6de90d9bf086546e1fa07198c12b03299fb4 (patch) | |
| tree | 9e1bdb509d532a1fd34a820e7281898048046ff2 /mcs/class/Mono.Web | |
| parent | 5af4970c72d3ba447f713365b4952f4029194982 (diff) | |
* Makefile (VALID_PROFILE): New. Prepare to be invoked in other profiles.
svn path=/trunk/mcs/; revision=100626
Diffstat (limited to 'mcs/class/Mono.Web')
| -rw-r--r-- | mcs/class/Mono.Web/Assembly/AssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | mcs/class/Mono.Web/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/Mono.Web/Makefile | 12 |
3 files changed, 21 insertions, 0 deletions
diff --git a/mcs/class/Mono.Web/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Web/Assembly/AssemblyInfo.cs index dcbe6efa420..dd61b1bc449 100644 --- a/mcs/class/Mono.Web/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Web/Assembly/AssemblyInfo.cs @@ -28,6 +28,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if NET_2_0 + using System; using System.Reflection; using System.Resources; @@ -58,3 +60,5 @@ using System.Web.UI; [assembly: TagPrefix("System.Web.UI.WebControls", "asp")] [assembly: AssemblyDelaySign(true)] [assembly: AssemblyKeyFile("../mono.pub")] + +#endif diff --git a/mcs/class/Mono.Web/ChangeLog b/mcs/class/Mono.Web/ChangeLog index e426af0a22c..d2bfcfdd9e5 100644 --- a/mcs/class/Mono.Web/ChangeLog +++ b/mcs/class/Mono.Web/ChangeLog @@ -1,3 +1,8 @@ +2008-04-14 Raja R Harinath <harinath@hurrynot.org> + + * Makefile (VALID_PROFILE): New. Prepare to be invoked in other + profiles. + 2008-03-01 Marek Habersack <mhabersack@novell.com> * Mono.Web.dll.sources: added diff --git a/mcs/class/Mono.Web/Makefile b/mcs/class/Mono.Web/Makefile index e0c9afbda3c..e1f565ca1e8 100644 --- a/mcs/class/Mono.Web/Makefile +++ b/mcs/class/Mono.Web/Makefile @@ -3,12 +3,24 @@ SUBDIRS = include ../../build/rules.make LIBRARY = Mono.Web.dll + +NO_TEST = yes + +# This is a .NET 2.0 only assembly +VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0, $(PROFILE)) +ifdef VALID_PROFILE + LIB_MCS_FLAGS = -r:$(corlib) \ -r:System.dll \ -r:System.Xml.dll \ -r:System.Web.dll \ -r:System.Configuration.dll +else +LIBRARY_NAME = dummy-Mono.Web.dll +NO_INSTALL = yes +NO_SIGN_ASSEMBLY = yes NO_TEST = yes +endif include ../../build/library.make |