luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-30 22:03:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

20
gthread/Makefile.am
View File

@@ -28,24 +28,26 @@ top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgthread-2.0.la
if OS_WIN32_AND_DLL_COMPILATION
if MS_LIB_AVAILABLE
noinst_DATA = gthread-2.0.lib
install_ms_lib_cmd = $(INSTALL) gthread-2.0.lib $(DESTDIR)$(libdir)
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gthread-2.0.lib
endif
endif
install-ms-lib:
$(INSTALL) gthread-2.0.lib $(DESTDIR)$(libdir)
$(install_ms_lib_cmd)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gthread-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 $(srcdir)/gthread.def
gthread_def = gthread.def
@@ -59,7 +61,7 @@ install-def-file:
uninstall-def-file:
endif
if OS_WIN32
if OS_WIN32_AND_DLL_COMPILATION
gthread_win32_res = gthread-win32-res.o
gthread_win32_res_ldflag = -Wl,$(gthread_win32_res)
endif
@@ -74,10 +76,8 @@ libgthread_2_0_la_LIBADD = $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $
libgthread_2_0_la_DEPENDENCIES = $(gthread_win32_res) $(gthread_def)
if OS_WIN32
gthread-win32-res.o: gthread.rc
$(WINDRES) gthread.rc $@
endif
gthread-2.0.lib: libgthread-2.0.la gthread.def
lib -name:libgthread-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gthread.def -out:$@