configure.in More work on enabling static building on Windows. When

2008-04-21  Tor Lillqvist  <tml@novell.com>

	* configure.in
	* */Makefile.am: More work on enabling static building on
	Windows. When building statically: Also define
	GOBJECT_STATIC_COMPILATION in glibconfig.h so that also the
	variables in gparamspecs.h get declared without any
	dllimport/dllexport decorations. Don't install .def files which
	obviously have no meaning for static libraries. Don't create MS
	import libraries. Don't do any resource object files.


svn path=/trunk/; revision=6866
This commit is contained in:
Tor Lillqvist
2008-04-21 08:38:36 +00:00
committed by Tor Lillqvist
parent 6965703ad2
commit 336cc8436b
7 changed files with 73 additions and 61 deletions

View File

@@ -36,27 +36,32 @@ libglib = $(top_builddir)/glib/libglib-2.0.la
# libraries to compile and install
lib_LTLIBRARIES = libgobject-2.0.la
if OS_WIN32_AND_DLL_COMPILATION
if MS_LIB_AVAILABLE
noinst_DATA = gobject-2.0.lib
install_ms_lib_cmd = $(INSTALL) gobject-2.0.lib $(DESTDIR)$(libdir)
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gobject-2.0.lib
endif
endif
install-ms-lib:
$(INSTALL) gobject-2.0.lib $(DESTDIR)$(libdir)
$(install_ms_lib_cmd)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gobject-2.0.lib
else
install-ms-lib:
uninstall-ms-lib:
endif
$(uninstall_ms_lib_cmd)
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
if OS_WIN32
if OS_WIN32_AND_DLL_COMPILATION
export_symbols = -export-symbols gobject.def
gobject_def = gobject.def
gobject_win32_res = gobject-win32-res.o
gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
install-def-file:
$(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def
@@ -69,11 +74,6 @@ uninstall-def-file:
export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
endif
if OS_WIN32
gobject_win32_res = gobject-win32-res.o
gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
endif
# libtool stuff: set version and export symbols for resolving
libgobjectincludedir = $(includedir)/glib-2.0/gobject
libgobject_2_0_la_LDFLAGS = \
@@ -240,11 +240,8 @@ BUILT_EXTRA_DIST = \
gobjectalias.h \
gobjectaliasdef.c
if OS_WIN32
gobject-win32-res.o: gobject.rc
$(WINDRES) gobject.rc $@
endif
gobject-2.0.lib: libgobject-2.0.la gobject.def
lib -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gobject.def -out:$@