diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-09-25 06:03:23 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-09-25 06:03:23 +0000 |
| commit | 1c8de25a5ebc658c6b427e6c8d212c0f5ce49a2a (patch) | |
| tree | 8b94c07c2e16b40b7f9db2491d063f695a1b3379 /gthread | |
| parent | 50d0ad98034e764808c774f6ad496cf9f129dd16 (diff) | |
| download | glib-1c8de25a5ebc658c6b427e6c8d212c0f5ce49a2a.tar.gz glib-1c8de25a5ebc658c6b427e6c8d212c0f5ce49a2a.tar.bz2 glib-1c8de25a5ebc658c6b427e6c8d212c0f5ce49a2a.zip | |
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 'gthread')
| -rw-r--r-- | gthread/ChangeLog | 8 | ||||
| -rw-r--r-- | gthread/Makefile.am | 9 | ||||
| -rw-r--r-- | gthread/makefile.msc.in | 17 |
3 files changed, 20 insertions, 14 deletions
diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 8159e1239..20ae0b56c 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,11 @@ +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. + 2001-09-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * gthread-posix.c: Add g_thread_equal_posix_impl and add to the diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 4a03529f7..1c35e1c45 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -25,6 +25,10 @@ top_builddir_full=`cd \$(top_builddir); pwd` lib_LTLIBRARIES = libgthread-1.3.la +if MS_LIB_AVAILABLE +noinst_DATA = gthread-1.3.lib +endif + if PLATFORM_WIN32 no_undefined = -no-undefined endif @@ -39,13 +43,16 @@ libgthread_1_3_la_LDFLAGS = \ libgthread_1_3_la_LIBADD = @G_THREAD_WIN32_RESOURCE@ @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib) -libgthread_1_3_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ +libgthread_1_3_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ @GTHREAD_DEF@ if OS_WIN32 @G_THREAD_WIN32_RESOURCE@ : gthread.rc $(top_srcdir)/build/win32/lt-compile-resource gthread.rc @G_THREAD_WIN32_RESOURCE@ endif +gthread-1.3.lib: libgthread-1.3.la gthread.def + lib -name:libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gthread.def -out:$@ + gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in index a4547c13b..2cf7d5672 100644 --- a/gthread/makefile.msc.in +++ b/gthread/makefile.msc.in @@ -7,29 +7,20 @@ 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 . -I ..\glib DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" # DEPCFLAGS = $(PTHREAD_CFLAGS) # DEPCLIBS = $(PTHREAD_LIBS) all : \ - gthread-$(GLIB_VER).dll + libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll gthread_OBJECTS = \ gthread-impl.obj -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 >$@ - gthread-impl.obj : gthread-impl.c gthread-win32.c $(CC) -c $(CFLAGS) gthread-impl.c - -gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread.def - $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def + +libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def + $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gthread.def |