Add module-test rules.

2001-03-29  Tor Lillqvist  <tml@iki.fi>

	* tests/makefile.msc.in: Add module-test rules.

diff --git a/ChangeLog b/ChangeLog
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b126c80..0e1ad7f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,8 @@
 2001-03-29  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Updates.
-       * tests/makefile.mingw.in: Add module-test rules.
+       * tests/makefile.mingw.in
+       * tests/makefile.msc.in: Add module-test rules.
 
 Mon Mar 26 14:14:53 2001  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index cfbcb72..66539bc 100644 (file)
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -12,7 +12,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 # Nothing much configurable below
 
-INCLUDES = -I..
+INCLUDES = -I .. -I ../gmodule
 DEFINES = -DHAVE_CONFIG_H
 
 TESTS = \
@@ -24,6 +24,7 @@ TESTS = \
        list-test.exe   \
        mainloop-test.exe\
        markup-test.exe \
+       module-test.exe \
        node-test.exe   \
        queue-test.exe  \
        rand-test.exe   \
@@ -38,7 +39,9 @@ TESTS = \
        threadpool-test.exe\
        tree-test.exe   \
        type-test.exe   \
-       unicode-encoding.exe
+       unicode-encoding.exe \
+       libmoduletestplugin_a.dll \
+       libmoduletestplugin_b.dll
 
 all :  $(TESTS)
 
@@ -50,5 +53,11 @@ makefile.msc: makefile.msc.in
        $(CC) $(CFLAGS) -c $<
        $(CC) $(CFLAGS) -Fe$@ $< ..\glib-$(GLIB_VER).lib ..\gmodule\gmodule-$(GLIB_VER).lib ..\gthread\gthread-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
 
+libmoduletestplugin_a.dll : libmoduletestplugin_a.obj
+       $(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS)
+
+libmoduletestplugin_b.dll : libmoduletestplugin_b.obj
+       $(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS)
+
 check: all
        for %p in ($(TESTS)) do %p