diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | mono/Makefile.am | 2 | ||||
| -rw-r--r-- | mono/metadata/Makefile.am | 4 | ||||
| -rw-r--r-- | mono/metadata/image.c | 8 | ||||
| -rw-r--r-- | mono/wrapper/Makefile.am | 4 | ||||
| -rw-r--r-- | runtime/Makefile.am | 18 |
8 files changed, 46 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index c8b41e60678..c2194dffd08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-08-20 Miguel de Icaza <miguel@ximian.com> + + * mono/Makefile.am (SUBDIRS): Remove `test' from here to allow us + to pass make distcheck + + * mono/wrapper/Makefile.am (EXTRA_DIST): Include genwrapper.pl + + * configure.in, Makefile.am, runtime/Makefile.am (dist-hook, + install-data-hook): Added mechanism to distribute and install the + dll files. + 2001-08-20 Dietmar Maurer <dietmar@ximian.com> * mono/tests/stream.cs: new tests for the Stream class diff --git a/Makefile.am b/Makefile.am index 25862e829f7..f8d5ea84f6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = libffi mono doc +SUBDIRS = libffi mono doc runtime diff --git a/configure.in b/configure.in index 16f7684f955..3df24b068d6 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(README) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono, 0.5) +AM_INIT_AUTOMAKE(mono, 0.6) AM_MAINTAINER_MODE AC_PROG_CC @@ -44,5 +44,6 @@ mono/cli/Makefile mono/interpreter/Makefile mono/tests/Makefile mono/wrapper/Makefile +runtime/Makefile doc/Makefile ]) diff --git a/mono/Makefile.am b/mono/Makefile.am index 4728b5fa679..ce9de43f09b 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am @@ -1 +1 @@ -SUBDIRS = metadata cil cli dis interpreter wrapper tests +SUBDIRS = metadata cil cli dis interpreter wrapper diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index d7b8ccb8e51..73f778e992f 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -2,7 +2,9 @@ noinst_PROGRAMS = pedump lib_LIBRARIES = libmetadata.a -#assembliesdir = $(libdir)/$(VERSION)/assemblies +# +# Keep in sync with mono/runtime/Makefile.am +# assembliesdir = $(libdir) INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) \ diff --git a/mono/metadata/image.c b/mono/metadata/image.c index eb0bf8866b4..f526958f82f 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -186,7 +186,13 @@ load_cli_header (MonoImage *image, MonoCLIImageInfo *iinfo) (iinfo->cli_cli_header.ch_ridmap.rva != 0) || (iinfo->cli_cli_header.ch_debug_map.rva != 0) || (iinfo->cli_cli_header.ch_ip_map.rva != 0)){ - g_warning ("Some fields in the CLI header which should have been zero are not zero"); + + /* + * No need to scare people who are testing this, I am just + * labelling this as a LAMESPEC + */ + /* g_warning ("Some fields in the CLI header which should have been zero are not zero"); */ + } return TRUE; diff --git a/mono/wrapper/Makefile.am b/mono/wrapper/Makefile.am index 1ca825cfc57..e9af1c43eb2 100644 --- a/mono/wrapper/Makefile.am +++ b/mono/wrapper/Makefile.am @@ -14,7 +14,9 @@ noinst_HEADERS = wrapper.h: genwrapper.pl - ./genwrapper.pl >wrapper.h + $(srcdir)/genwrapper.pl >wrapper.h BUILT_SOURCES = wrapper.h CLEANFILES += $(BUILT_SOURCES) + +EXTRA_DIST = genwrapper.pl
\ No newline at end of file diff --git a/runtime/Makefile.am b/runtime/Makefile.am new file mode 100644 index 00000000000..7f438031a0a --- /dev/null +++ b/runtime/Makefile.am @@ -0,0 +1,18 @@ +# +# This is just used to copy and install the DLL files that are currently +# being compiled on windows. +# + +# +# Keep in sync with mono/mono/metadata/Makefile.am +# +assembliesdir = $(libdir) + +install-data-hook: + -cp $(srcdir)/*.dll $(assembliesdir) + +dist-hook: + -cp $(srcdir)/*.dll $(distdir) + +copy_dlls: + cp /nt/mono/mcs/class/*/*.dll .
\ No newline at end of file |