changed depndencies to build glib-genmarshal first and statically linked

2001-05-24  Hans Breuer  <hans@breuer.org>

	* makefile.msc.in : changed depndencies to build glib-genmarshal
	first and statically linked with glib, which makes it independent
	from the installed glib version. Added new object files to build.

	* gobject.def : updated

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index e36b0e9..90889ec 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-24  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc.in : changed depndencies to build glib-genmarshal
+       first and statically linked with glib, which makes it independent
+       from the installed glib version. Added new object files to build.
+
+       * gobject.def : updated
+
 Thu May 24 08:52:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gobject.[ch] (g_value_set_object): gpointer, not

diff --git a/gobject/gobject.def b/gobject/gobject.def
index cd61b8f..c5371c7 100644 (file)
--- a/gobject/gobject.def
+++ b/gobject/gobject.def
@@ -11,6 +11,7 @@ EXPORTS
        g_bsearch_array_remove
        g_bsearch_array_remove_node
        g_cclosure_marshal_STRING__OBJECT_POINTER
+       g_cclosure_marshal_VOID__BOOLEAN
        g_cclosure_marshal_VOID__INT
        g_cclosure_marshal_VOID__POINTER
        g_cclosure_marshal_VOID__UINT

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index e12652a..8832268 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -16,8 +16,10 @@ INCLUDES = -I .. -I .
 DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime -DG_ENABLE_DEBUG
 
 all :                          \
+       glib-genmarshal.exe \
+       gmarshal.h \
+       gmarshal.c \
        gobject-$(GLIB_VER).dll \
-       glib-genmarshal.exe
 
 gobject_OBJECTS =              \
        gboxed.obj              \
@@ -32,7 +34,9 @@ gobject_OBJECTS =             \
        gtypemodule.obj         \
        gtypeplugin.obj         \
        gvalue.obj              \
-       gvaluetypes.obj
+       gvaluearray.obj         \
+       gvaluetypes.obj \
+       gvaluetransform.obj
 
 gmarshal.h : gmarshal.list glib-genmarshal.exe
        echo #ifndef __G_MARSHAL_H__ > xgen-gmh
@@ -51,5 +55,6 @@ makefile.msc: makefile.msc.in
 gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
        $(CC) $(CFLAGS) -LD -Fegobject-$(GLIB_VER).dll $(gobject_OBJECTS) ..\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gobject.def
 
-glib-genmarshal.exe : glib-genmarshal.c
-       $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER).lib
+# link glib's static version to avoid installing 
+glib-genmarshal.exe : glib-genmarshal.c ..\glib-$(GLIB_VER)s.lib
+       $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER)s.lib user32.lib advapi32.lib $(INTL_LIBS)