diff options
author | Peter Williams <peterw@mono-cvs.ximian.com> | 2003-07-16 09:08:19 +0400 |
---|---|---|
committer | Peter Williams <peterw@mono-cvs.ximian.com> | 2003-07-16 09:08:19 +0400 |
commit | accc28dd648ec7b8a8ece85564efd9614059710f (patch) | |
tree | 0b24e6512d12f6b82203832d04bf9d7a5db01038 /mcs/class/System.Data/Makefile | |
parent | f900a2765ff70d5b483cac03127cf17e42053260 (diff) |
2003-07-16 Peter Williams <peter@newton.cx>
A whole passel of build system changes. Doc updates:
* build/README.makefiles: Doc updates.
* build/profiles/net_1_0.make: Doc changes.
* INSTALL.txt: A few more touchups.
Better defaults:
* build/config-default.make (prefix): Default install prefix
should be /usr/local.
* build/profiles/bootstrap.make: This profile ...
* build/profiles/default.make: ... is now the default.
* build/profiles/atomic.make: And the default is now this.
Fixes for pre-build checks:
* Makefile: Do the platform and (new) profile checks
before the build, which took some infrastructure changes.
* build/rules.make: Allow a Makefile to specify its own all/install/etc
targets.
* build/profiles/default.make (profile-check): Add a blank
target here.
* build/profiles/atomic.make: Check for a full MCS install to
build against.
HP/UX fixes with help from Bernie Solomon:
* build/config-default.make (ECHO_ESCAPE): HP/UX 'echo'
doesn't need a -e parameter to interpret escape codes. Test for
that and define a configuration parameter.
* build/library.make ($(makefrag)): Use $(ECHO_ESCAPE)
instead of assuming that 'echo -e' will interpret escape
codes.
* build/executable.make ($(makefrag)): Here too.
A make distcheck fix:
* Makefile: Inherit the current prefix so that the build can
find the right System.Xml.dll.
And Windows build fixes with the invaluable help of Sebastian
Pouliot (in various subdirectories).
class/Mono.Data.SqliteClient:
2003-07-16 Peter Williams <peter@newton.cx>
* Makefile (LIB_MCS_FLAGS): Add /r:System.dll here. Why wasn't
this necessary with MCS? (csc.exe needs it.)
class/System:
2003-07-16 Peter Williams <peter@newton.cx>
* Makefile (SCARY_LIB): Flip around since what was bootstrap
is now default.
class/System/Test/System.Net:
2003-07-16 Peter Williams <peter@newton.cx>
* IPAddressTest.cs: #if NET_1_1 for some IPv6 tests that
rely on some NET_1_1-only features.
class/System/Test/System.Net.Sockets:
2003-07-16 Peter Williams <peter@newton.cx>
* TcpListenerTest.cs: Initialize outSock to null to
prevent an mcs compile error.
class/System.Data:
2003-07-16 Peter Williams <peter@newton.cx>
* Makefile: Flip around for the new default build
profile. (In a separate commit)
class/System.Windows.Forms:
2003-07-16 Peter Williams <peter@newton.cx>
* System.Windows.Forms.dll.sources: Don't build with two
AssemblyInfo.cs files.
class/corlib:
2003-07-16 Peter Williams <peter@newton.cx>
* Makefile ($(test_makefrag)): Use $(ECHO_ESCAPE) for HP/UX
portability fixes.
(all-local): Don't build $(cmplib) by default, it's not something
most people need, and the build is broken on Windows right now anyway.
ilasm:
2003-07-16 Peter Williams <peter@newton.cx>
* Makefile (ILParser.cs): Move this from parser/ so we avoid
slash direction issues on the Windows build.
* .cvsignore: Add ILParser.cs here.
ilasm/parser:
2003-07-16 Peter Williams <peter@newton.cx>
* .cvsignore: ILParser.cs has been moved.
tools:
2003-07-16 Peter Williams <peter@newton.cx>
* Makefile (DIST_ONLY_SUBDIRS): Don't build SqlSharp, it's
very old and doesn't build on Windows.
svn path=/trunk/mcs/; revision=16292
Diffstat (limited to 'mcs/class/System.Data/Makefile')
-rw-r--r-- | mcs/class/System.Data/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile index 96b3e564d01..b8fe63d6752 100644 --- a/mcs/class/System.Data/Makefile +++ b/mcs/class/System.Data/Makefile @@ -4,10 +4,10 @@ include ../../build/rules.make # I have *no idea* why I need to do this. -ifeq ($(PROFILE),bootstrap) -system = $(topdir)/class/lib/System.dll -else +ifeq ($(PROFILE),atomic) system = System.dll +else +system = $(topdir)/class/lib/System.dll endif LIBRARY = System.Data.dll |