summaryrefslogtreecommitdiff
path: root/tests/makefile.msc.in
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2001-09-25 06:03:23 +0000
committerTor Lillqvist <tml@src.gnome.org>2001-09-25 06:03:23 +0000
commit1c8de25a5ebc658c6b427e6c8d212c0f5ce49a2a (patch)
tree8b94c07c2e16b40b7f9db2491d063f695a1b3379 /tests/makefile.msc.in
parent50d0ad98034e764808c774f6ad496cf9f129dd16 (diff)
downloadglib-1c8de25a5ebc658c6b427e6c8d212c0f5ce49a2a.tar.gz
More Win32 automake macros. For .def files: GLIB_DEF, GMODULE_DEF,
2001-09-25 Tor Lillqvist <tml@iki.fi> * configure.in: More Win32 automake macros. For .def files: GLIB_DEF, GMODULE_DEF, GOBJECT_DEF and GTHREAD_DEF. For .exp files: TESTGMODULE_EXP (for programs that need to export symbols, just testgmodule here). A new conditional, MS_LIB_AVAILABLE to test whether the Microsoft librarian ("ar") is available to build MS import libraries. * glib/Makefile.am * gmodule/Makefile.am: Use above. New rule to build MS import library. * glib/makefile.msc.in * tests/makefile.msc.in * tests/makefile.mingw.in: Use same DLL and import library names as libtool. gmodule: 2001-09-25 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Fix missing end @ in @LT_CURRENT@. * makefile.msc.in: Use same DLL and import library names as libtool. gobject: 2001-09-25 Tor Lillqvist <tml@iki.fi> * Makefile.am: Use new macros for .def file, and check for MS_LIB_AVAILABLE, new rule to build MS import library. * makefile.msc.in: Use same DLL and import library names as libtool. gthread: 2001-09-25 Tor Lillqvist <tml@iki.fi> * Makefile.am: Use new macros for .def file, and check for MS_LIB_AVAILABLE, new rule to build MS import library. * makefile.msc.in: Use same DLL and import library names as libtool.
Diffstat (limited to 'tests/makefile.msc.in')
-rw-r--r--tests/makefile.msc.in15
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index ead522dc3..91b667317 100644
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -5,13 +5,8 @@ TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
################################################################
-# Nothing much configurable below
-
INCLUDES = -I .. -I ..\glib -I ..\gmodule
DEFINES = -DHAVE_CONFIG_H
@@ -49,19 +44,15 @@ TESTS = \
all : $(TESTS)
-makefile.msc: makefile.msc.in
- $(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
- -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
-
.c.exe :
$(CC) $(CFLAGS) -c $<
- $(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-$(GLIB_VER).lib ..\gmodule\gmodule-$(GLIB_VER).lib ..\gthread\gthread-$(GLIB_VER).lib $(LDFLAGS) user32.lib /subsystem:console
+ $(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gthread\gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) user32.lib /subsystem:console
libmoduletestplugin_a.dll : libmoduletestplugin_a.obj
- $(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+ $(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
libmoduletestplugin_b.dll : libmoduletestplugin_b.obj
- $(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+ $(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
check: all
for %p in ($(TESTS)) do %p