luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add variable for LT_CURRENT minus LT_AGE (the suffix used by libtool on

Browse Source 
2001-09-17  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Add variable for LT_CURRENT minus LT_AGE (the
	suffix used by libtool on Win32 for DLLs). Set variables for the
	compiled resource files on Windows. Handle the native Win32
	gthread stuff.

	* glib/Makefile.am
	* gmodule/Makefile.am
	* gobject/Makefile.am: (Win32) Add minor hacks to link in the object
	file produced from the resource file. Use the lt-compile-resource
	script from the build module. The non-hack way would be to teach
	libtool, autoconf and automake about .rc files (which are a kind
	of source code, after all, that gets compiled to object
	files). But then there would be problems for those who wouldn't have
	bleeding edge auto* and libtool.

	* glib/glib.def
	* gobject/gobject.def: Updates.

	* glib/glib.rc.in
	* gmodule/gmodule.rc.in
	* gobject/gobject.rc.in
	* gthread/gthread.rc.in: Update InternalName and OriginalFilename to
	match libtool's naming convention for DLLs.

	* glib/gutils.c: Ditto when constructing the DLL name in the
	definition for GLIB_LOCALE_DIR.

	* glib/makefile.mingw.in
	* gmodule/makefile.mingw.in
	* gobject/makefile.mingw.in
	* gthread/makefile.mingw.in: Update import library names.
This commit is contained in:
Tor Lillqvist
2001-09-17 00:41:39 +00:00
committed by Tor Lillqvist
parent 545a6a7616
commit 020b44f5ac
24 changed files with 431 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gthread/Makefile.am
View File

@@ -37,7 +37,14 @@ libgthread_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols)
libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
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@
if OS_WIN32
@G_THREAD_WIN32_RESOURCE@ : gthread.rc
$(top_srcdir)/build/win32/lt-compile-resource gthread.rc @G_THREAD_WIN32_RESOURCE@
endif
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status

14
gthread/makefile.mingw.in
View File

@@ -15,15 +15,13 @@ INCLUDES = -I .. -I ../glib -I .
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG
all : \
gthread-@GLIB_VERSION@.dll
ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
makefile.mingw: makefile.mingw.in
sed -e 's,@GLIB[_]VERSION@,@GLIB_VERSION@,' <$< >$@
endif
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a
gthread_OBJECTS = \
gthread-impl.o
gthread-@GLIB_VERSION@.dll : $(gthread_OBJECTS) gthread.def
$(BUILD_DLL) gthread @GLIB_VERSION@ gthread.def $(gthread_OBJECTS) -L ../glib -lglib
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(gthread_OBJECTS) gthread.def gthread-@GLIB_VERSION@.rc
$(BUILD_DLL) gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT:@LT_REVISION@:@LT_AGE@ gthread.def $(gthread_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc : gthread.rc
cp $< $@