luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-25 18:39:00 +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
gobject/Makefile.am
View File

@@ -31,7 +31,9 @@ libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
-export-dynamic $(no_undefined) $(export_symbols) \
@STRIP_END@
libgobject_1_3_la_LIBADD = $(libglib)
libgobject_1_3_la_LIBADD = @G_OBJECT_WIN32_RESOURCE@ $(libglib)
libgobject_1_3_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@
#
# setup source file variables
@@ -197,6 +199,11 @@ glib-mkenums: $(srcdir)/glib-mkenums
fi; \
cp $(srcdir)/glib-mkenums glib-mkenums
if OS_WIN32
@G_OBJECT_WIN32_RESOURCE@ : gobject.rc
$(top_srcdir)/build/win32/lt-compile-resource gobject.rc @G_OBJECT_WIN32_RESOURCE@
endif
gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in
cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status

9
gobject/gobject.def
View File

@@ -2,14 +2,6 @@ EXPORTS
g_boxed_copy
g_boxed_free
g_boxed_type_register_static
g_bsearch_array_destroy
g_bsearch_array_get_index
g_bsearch_array_get_nth
g_bsearch_array_new
g_bsearch_array_insert
g_bsearch_array_lookup
g_bsearch_array_remove
g_bsearch_array_remove_node
g_cclosure_marshal_STRING__OBJECT_POINTER
g_cclosure_marshal_VOID__BOOLEAN
g_cclosure_marshal_VOID__BOXED
@@ -192,6 +184,7 @@ EXPORTS
g_type_interface_add_prerequisite
g_type_interface_get_plugin
g_type_interface_peek
g_type_interface_peek_parent
g_type_interfaces
g_type_is_a
g_type_module_add_interface

21
gobject/makefile.mingw.in
View File

@@ -16,21 +16,13 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_grun
srcdir=.
BUILD_DLL = ../build-dll
all : \
gobject-@GLIB_VERSION@.dll \
libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a \
testgruntime.exe \
glib-genmarshal.exe
ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
makefile.mingw: makefile.mingw.in
sed -e 's,@GLIB[_]VERSION@,@GLIB_VERSION@,' \
-e 's,@RE[B]UILD@,,' <$< >$@
endif
gobject_OBJECTS = \
gboxed.o \
gbsearcharray.o \
gclosure.o \
genums.o \
gobject.o \
@@ -45,11 +37,14 @@ gobject_OBJECTS = \
gvaluetransform.o \
gvaluetypes.o
gobject-@GLIB_VERSION@.dll : $(srcdir)/stamp-gmarshal.h gmarshal.c $(gobject_OBJECTS) gobject.def
$(BUILD_DLL) gobject @GLIB_VERSION@ gobject.def $(gobject_OBJECTS) -L ../glib -lglib
libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(srcdir)/stamp-gmarshal.h gmarshal.c $(gobject_OBJECTS) gobject.def
$(BUILD_DLL) gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gobject.def $(gobject_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
glib-genmarshal.exe : glib-genmarshal.c
$(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION $< -L ../glib -lglib
$(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION $< -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
testgruntime.exe: libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a testgruntime.o
$(CC) $(CFLAGS) -o testgruntime.exe testgruntime.o -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ -L . -lgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ $(LFLAGS)
# Copied from Makefile.am:
# initial creation of the real stamp-* files