Fri Jul 19 18:38:38 CEST 2002 Paolo Molaro <lupus@ximian.com>

	* configure.in, Makefile.am, mono.pc.in: add a mono.pc file for use
	with pkg-config.
	* */Makefile.am: makefile overhaul to create a shared libmono library.
	* */*.h: do not include config.h in headers that should be installed.

svn path=/trunk/mono/; revision=5937

diff --git a/ChangeLog b/ChangeLog
index 085f96a37c4ce53af009585e932b1a746f8f9044..0eabce533ae0ce98ecc04938a5c6d70d2ab4f34b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+
+Fri Jul 19 18:38:38 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+       * configure.in, Makefile.am, mono.pc.in: add a mono.pc file for use
+       with pkg-config.
+       * */Makefile.am: makefile overhaul to create a shared libmono library.
+       * */*.h: do not include config.h in headers that should be installed.
+
 2002-07-12  Dick Porter  <dick@ximian.com>
 
        * acconfig.h:

diff --git a/Makefile.am b/Makefile.am
index b4ab7f57021573ad8e2dc5659a95f5c4588c9e90..c3565689bc076387dad0a6ebac0a4da89d5f20d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = mono doc docs runtime scripts man 
+
+EXTRA_DIST= mono.pc.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= mono.pc
+DISTCLEANFILES= mono.pc

diff --git a/configure.in b/configure.in
index 1f1dc59c2acb452b7419a0281cea0c4d806b1c6c..10a401b3f8c19418a8cd8b6ca88754f2519f598a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -518,7 +518,7 @@ arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED=
 esac
 
 if test ${TARGET} = unknown; then
-       CFLAGS="$CFLAGS -DNO_PORT"
+       CPPFLAGS="$CPPFLAGS -DNO_PORT"
        AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
 fi
 
@@ -537,9 +537,11 @@ AM_CONDITIONAL(ARM, test x$TARGET = xARM)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
 
 AC_OUTPUT([
 Makefile
+mono.pc
 mono/Makefile
 mono/utils/Makefile
 mono/metadata/Makefile

diff --git a/mono.pc.in b/mono.pc.in
new file mode 100644 (file)
index 0000000..32e8ada
--- /dev/null
+++ b/mono.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+
+Name: Mono
+Description: Mono Runtime
+Version: @VERSION@
+Requires: glib-2.0 gmodule-2.0
+Libs: -L${libdir} -lmono
+Cflags:

diff --git a/mono/Makefile.am b/mono/Makefile.am
index ca0f9817dcb87a18f1c8fefb7b418ba5e36e3a2f..8a94b95a6929444e74ed1ad6c4ed4e35bf0f4436 100644 (file)
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -1,9 +1,9 @@
 # the handles dir doesn't apply to windows
 if PLATFORM_WIN32
-SUBDIRS = utils io-layer monoburg metadata cil dis \
-       arch monograph os interpreter jit tests benchmark
+SUBDIRS = utils io-layer monoburg os metadata cil dis \
+       arch monograph interpreter jit tests benchmark
 else
-SUBDIRS = utils io-layer monoburg metadata cil dis \
-       arch monograph os interpreter jit tests benchmark handles
+SUBDIRS = utils io-layer monoburg os metadata cil dis \
+       arch monograph interpreter jit tests benchmark handles
 endif
 

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 7cf51142868d63eff9056f097ea318c8c872d65c..3a8cfd9ac80ac4a90d1503b7881aa863cbf38a78 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 bin_PROGRAMS = monodis
 
-lib_LIBRARIES = libmonodis.a
+noinst_LIBRARIES = libmonodis.a
 
 libmonodis_a_SOURCES = \
        get.c           \
@@ -20,9 +20,7 @@ monodis_SOURCES =     \
 
 monodis_LDADD =                        \
        libmonodis.a                    \
-       ../metadata/libmetadata.a       \
-       ../io-layer/libwapi.a           \
-       ../utils/libmonoutils.a         \
+       ../metadata/libmetadata.la      \
        $(GMODULE_LIBS)                 \
        $(GLIB_LIBS) 
 

diff --git a/mono/handles/Makefile.am b/mono/handles/Makefile.am
index ae6b663f1f21083b500a7e70ebb7040d85bb2356..4c57428ebdd1e4c33f0c1a245d6a5a1f732328dc 100644 (file)
--- a/mono/handles/Makefile.am
+++ b/mono/handles/Makefile.am
@@ -7,22 +7,22 @@ INCLUDES =                            \
        $(GLIB_CFLAGS)
 
 hps_LDADD = \
-       ../io-layer/libwapi.a           \
-       ../utils/libmonoutils.a         \
+       ../io-layer/libwapi.la          \
+       ../utils/libmonoutils.la                \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm
 
 scratch_LDADD = \
-       ../io-layer/libwapi.a           \
-       ../utils/libmonoutils.a         \
+       ../io-layer/libwapi.la          \
+       ../utils/libmonoutils.la                \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm
 
 shmdel_LDADD = \
-       ../io-layer/libwapi.a           \
-       ../utils/libmonoutils.a         \
+       ../io-layer/libwapi.la          \
+       ../utils/libmonoutils.la                \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index 96ef3c2642a23920fbeb9bc04a0f2435cddf7933..2271a23be0a3a648f7167babd9666f6e8ae5f100 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -12,11 +12,7 @@ mint_SOURCES =               \
 
 mint_LDADD =                           \
        ../arch/libmonoarch.la          \
-       ../os/libmonoos.a               \
-       ../metadata/libmonoruntime.a    \
-       ../metadata/libmetadata.a       \
-       ../io-layer/libwapi.a           \
-       ../utils/libmonoutils.a         \
+       ../metadata/libmonoruntime.la   \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index 27fb646d076c52fe81db88a35aca41440909d2a2..9ec877d16fa04ab13a6c81f365d742fc5e794fca 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,4 +1,4 @@
-lib_LIBRARIES = libwapi.a
+noinst_LTLIBRARIES = libwapi.la
 
 INCLUDES = \
        $(GLIB_CFLAGS)          \
@@ -20,6 +20,7 @@ OTHER_H = \
        io.h            \
        io-layer.h      \
        macros.h        \
+       mono-mutex.h    \
        mutexes.h       \
        processes.h     \
        semaphores.h    \
@@ -65,7 +66,6 @@ OTHER_SRC = \
        mutexes.h               \
        mutex-private.h         \
        mono-mutex.c            \
-       mono-mutex.h            \
        processes.c             \
        processes.h             \
        process-private.h       \
@@ -106,10 +106,10 @@ WINDOWS_SRC = \
        io-layer-dummy.c
 
 if PLATFORM_WIN32
-libwapi_a_SOURCES = $(WINDOWS_SRC)
+libwapi_la_SOURCES = $(WINDOWS_SRC)
 libwapiinclude_HEADERS = $(WINDOWS_H)
 else
-libwapi_a_SOURCES = $(OTHER_SRC)
+libwapi_la_SOURCES = $(OTHER_SRC)
 libwapiinclude_HEADERS = $(OTHER_H)
 endif
 

diff --git a/mono/jit/Makefile.am b/mono/jit/Makefile.am
index a2d5055ac59a9b6490845e570544d16a77d4109d..65b30666cf23ae7dd16ddda497c8b37c6f74a0da 100644 (file)
--- a/mono/jit/Makefile.am
+++ b/mono/jit/Makefile.am
@@ -5,19 +5,20 @@ INCLUDES =                            \
 
 if X86
 bin_PROGRAMS = mono
-lib_LIBRARIES = libmono.a
+lib_LTLIBRARIES = libmono.la
+
+libmono_la_LIBADD =    \
+       ../metadata/libmonoruntime.la
+
 endif
 
-libmono_a_SOURCES =            \
+libmono_la_SOURCES =           \
        win32-exception.c       \
        win32-exception.h       \
        codegen.h               \
        codegen-x86.c           \
        emit-x86.c              \
-       jit.h                   \
-       regset.h                \
        regset.c                \
-       debug.h                 \
        debug-private.h         \
        debug.c                 \
        debug-stabs.c           \
@@ -31,15 +32,17 @@ libmono_a_SOURCES =         \
        helpers.h               \
        helpers.c
 
+libmonoincludedir = $(includedir)/mono/jit
+libmonoinclude_HEADERS = \
+       jit.h                   \
+       debug.h                 \
+       regset.h
+
 mono_SOURCES = mono.c
 
+#mono_LDFLAGS=-static
 mono_LDADD =                           \
-       libmono.a                       \
-       ../metadata/libmonoruntime.a    \
-       ../metadata/libmetadata.a       \
-       ../io-layer/libwapi.a           \
-       ../utils/libmonoutils.a         \
-       ../os/libmonoos.a               \
+       libmono.la                      \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 9e5e9241ac41ee303e3601f6137c320216ce52f7..df2698de8e51cf4f832ba1762446a7cecc39741d 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,6 +1,6 @@
 noinst_PROGRAMS = pedump
 
-lib_LIBRARIES = libmetadata.a libmonoruntime.a
+noinst_LTLIBRARIES = libmetadata.la libmonoruntime.la
 
 #
 # Keep in sync with mono/runtime/Makefile.am
@@ -10,7 +10,10 @@ assembliesdir = $(libdir)
 INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)    -I$(top_srcdir)/mono \
        -DMONO_ASSEMBLIES=\""$(assembliesdir)"\" -DMONO_CFG_DIR=\""$(sysconfdir)"\"
 
-libmonoruntime_a_SOURCES = \
+libmonoruntime_la_LIBADD = libmetadata.la
+libmetadata_la_LIBADD = ../io-layer/libwapi.la ../utils/libmonoutils.la ../os/libmonoos.la
+
+libmonoruntime_la_SOURCES = \
        reflection.c    \
        object.c        \
        icall.c         \
@@ -21,10 +24,7 @@ libmonoruntime_a_SOURCES = \
        marshal.c       \
        marshal.h       \
        threads.c       \
-       threads.h       \
        threadpool.c    \
-       threadpool.h    \
-       threads-types.h \
        file-io.c       \
        file-io.h       \
        socket-io.c     \
@@ -33,10 +33,7 @@ libmonoruntime_a_SOURCES = \
        exception.h     \
        unicode.c       \
        unicode.h       \
-       appdomain.h     \
        appdomain.c     \
-       debug-helpers.h \
-       debug-helpers.c \
        debug-symfile.h \
        debug-symfile.c \
        profiler.c      \
@@ -50,7 +47,7 @@ libmonoruntime_a_SOURCES = \
        process.c       \
        process.h
 
-libmetadata_a_SOURCES = \
+libmetadata_la_SOURCES = \
        assembly.c      \
        domain.c        \
        opcodes.c       \
@@ -64,14 +61,18 @@ libmetadata_a_SOURCES = \
        rawbuffer.c     \
        loader.c        \
        class.c         \
-       mempool.h       \
        mempool.c       \
-       debug-helpers.h \
        debug-helpers.c
 
 libmetadataincludedir = $(includedir)/mono/metadata
 libmonoruntimeincludedir = $(includedir)/mono/metadata
 
+libmonoruntimeinclude_HEADERS = \
+       appdomain.h     \
+       threadpool.h    \
+       threads-types.h \
+       threads.h
+
 libmetadatainclude_HEADERS = \
        assembly.h      \
        opcodes.h       \
@@ -92,11 +93,13 @@ libmetadatainclude_HEADERS = \
        exception.h     \
        profiler.h      \
        appdomain.h     \
+       debug-helpers.h \
+       mempool.h       \
        rand.h
 
 pedump_SOURCES =               \
-       pedump.c $(libmetadata_a_SOURCES)
+       pedump.c
 
-pedump_LDADD = ../io-layer/libwapi.a ../utils/libmonoutils.a $(GLIB_LIBS) $(GMODULE_LIBS) -lm
+pedump_LDADD = libmetadata.la $(GLIB_LIBS) $(GMODULE_LIBS) -lm
 
 

diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index 5c1feb7e7394a8011808ecd0465ced32e791b4df..8405cd3f943e954520c3fce1beba56c33628c381 100644 (file)
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -7,9 +7,7 @@ INCLUDES =                              \
        $(GLIB_CFLAGS)
 
 monograph_LDADD = \
-       ../metadata/libmetadata.a       \
-       ../io-layer/libwapi.a           \
-       ../utils/libmonoutils.a         \
+       ../metadata/libmetadata.la      \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm

diff --git a/mono/os/Makefile.am b/mono/os/Makefile.am
index a2ea878301ba6d5a6c33e6090a3f40fb33ea0502..01f785127b87973bea1606d55f2f9911cadd89c4 100644 (file)
--- a/mono/os/Makefile.am
+++ b/mono/os/Makefile.am
@@ -1,10 +1,19 @@
+DIST_SUBDIRS = unix win32
+
+INCLUDES = -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libmonoos.la
+
 if PLATFORM_WIN32
-SUBDIRS = win32
+DIR=win32
 else
-SUBDIRS = unix
+DIR=unix
 endif
 
-EXTRA_DIST = util.h
+SUBDIRS = $(DIR)
+
+libmonoos_la_SOURCES = \
+       util.h
+
+libmonoos_la_LIBADD = $(DIR)/libmonoos.la
 
-all:
-       cp */*.a .
\ No newline at end of file

diff --git a/mono/os/unix/Makefile.am b/mono/os/unix/Makefile.am
index 244d475f22f5797c050e4b59372111efaa23f571..abdcab61738dd5379f4485f220a2dc71d28e5536 100644 (file)
--- a/mono/os/unix/Makefile.am
+++ b/mono/os/unix/Makefile.am
@@ -1,6 +1,6 @@
 
 INCLUDES = -I$(top_srcdir)
 
-noinst_LIBRARIES = libmonoos.a
+noinst_LTLIBRARIES = libmonoos.la
 
-libmonoos_a_SOURCES = util.c
+libmonoos_la_SOURCES = util.c

diff --git a/mono/os/win32/Makefile.am b/mono/os/win32/Makefile.am
index ed7118780322e55b0f17077738823700a530527d..aff89782fc7c0824e541ccb92ca5661f20f89797 100644 (file)
--- a/mono/os/win32/Makefile.am
+++ b/mono/os/win32/Makefile.am
@@ -3,6 +3,6 @@ INCLUDES =                              \
        $(GMODULE_CFLAGS)               \
        $(GLIB_CFLAGS)
 
-noinst_LIBRARIES = libmonoos.a
+noinst_LTLIBRARIES = libmonoos.la
 
-libmonoos_a_SOURCES = util.c
+libmonoos_la_SOURCES = util.c

diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index 4d84e3cb635a844ffd324b1aadb6a790c0ff6832..ceaf6edee5c9505f7acb450aa1d24ef57a399406 100644 (file)
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -1,18 +1,18 @@
-lib_LIBRARIES = libmonoutils.a
+noinst_LTLIBRARIES = libmonoutils.la
 
 INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)    -I$(top_srcdir)/mono 
 
-libmonoutils_a_SOURCES = \
+libmonoutils_la_SOURCES = \
        mono-hash.c     \
-       mono-hash.h     \
-       monobitset.h    \
        monobitset.c    \
        strtod.h        \
        strtod.c
 
 libmonoutilsincludedir = $(includedir)/mono/utils
 
-libmonoutilsinclude_HEADERS = 
+libmonoutilsinclude_HEADERS = \
+       monobitset.h    \
+       mono-hash.h
 
 EXTRA_DIST = ChangeLog