From e2ee29dd2c8ccda29e8a3f8b88fb7cc249b08a48 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 16 Mar 2008 10:16:57 +0000 Subject: [PATCH] Don't bother defining Autoconf variables for glib.def, gmodule.def, 2008-03-16 Tor Lillqvist * configure.in: Don't bother defining Autoconf variables for glib.def, gmodule.def, gobject.def and gthread.def when this can be handled easily in */Makefile.am which are the only files that use them. Remove also TESTGMODULE_EXP which isn't used at all. * */Makefile.am: Corrsponding changes. svn path=/trunk/; revision=6722 --- ChangeLog | 9 +++++++++ configure.in | 15 --------------- glib/Makefile.am | 4 ++-- gmodule/ChangeLog | 5 +++++ gmodule/Makefile.am | 3 ++- gobject/ChangeLog | 5 +++++ gobject/Makefile.am | 3 ++- gthread/ChangeLog | 5 +++++ gthread/Makefile.am | 3 ++- 9 files changed, 32 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8fa9331a..73d92221e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-16 Tor Lillqvist + + * configure.in: Don't bother defining Autoconf variables for + glib.def, gmodule.def, gobject.def and gthread.def when this can + be handled easily in */Makefile.am which are the only files that + use them. Remove also TESTGMODULE_EXP which isn't used at all. + + * glib/Makefile.am: Corrsponding change. + 2008-03-14 Michael Natterer * glib/*.h: make it possible to disable single-file includes by diff --git a/configure.in b/configure.in index 77a01adaf..bf99fd165 100644 --- a/configure.in +++ b/configure.in @@ -118,11 +118,6 @@ AC_MSG_CHECKING([for Win32]) case "$host" in *-*-mingw*) glib_native_win32=yes - GLIB_DEF=glib.def - GMODULE_DEF=gmodule.def - GOBJECT_DEF=gobject.def - GTHREAD_DEF=gthread.def - TESTGMODULE_EXP=testgmodule.exp glib_pid_type='void *' # Unfortunately the mingw implementations of C99-style snprintf and vsnprintf # don't seem to be quite good enough, at least not in mingw-runtime-3.14. @@ -136,11 +131,6 @@ case "$host" in ;; *) glib_native_win32=no - GLIB_DEF= - GMODULE_DEF= - GOBJECT_DEF= - GTHREAD_DEF= - TESTGMODULE_EXP= glib_pid_type=int ;; esac @@ -165,11 +155,6 @@ AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"]) AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"]) AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"]) AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"]) -AC_SUBST(GLIB_DEF) -AC_SUBST(GMODULE_DEF) -AC_SUBST(GOBJECT_DEF) -AC_SUBST(GTHREAD_DEF) -AC_SUBST(TESTGMODULE_EXP) if test "$glib_native_win32" = "yes"; then AC_CHECK_TOOL(WINDRES, windres, no) diff --git a/glib/Makefile.am b/glib/Makefile.am index ba66d532c..4093cac9a 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -252,8 +252,8 @@ no_undefined = -no-undefined endif if OS_WIN32 -# This requires a very new libtool export_symbols = -export-symbols glib.def +glib_def = glib.def install-def-file: $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def @@ -286,7 +286,7 @@ pcre_inc = endif libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) -libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) @GLIB_DEF@ +libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libglib_2_0_la_LDFLAGS = \ $(glib_win32_res_ldflag) \ diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index c3cb7cc6c..6ff9b40c5 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +2008-03-16 Tor Lillqvist + + * Makefile.am: Define gmodule_def locally here instead of using an + Autoconf variable. + 2008-03-10 Matthias Clasen * === Released 2.16.1 === diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index a0adfd6b3..c238110ff 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -59,6 +59,7 @@ endif if OS_WIN32 export_symbols = -export-symbols $(srcdir)/gmodule.def +gmodule_def = gmodule.def install-def-file: $(INSTALL) $(srcdir)/gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def @@ -84,7 +85,7 @@ libgmodule_2_0_la_LDFLAGS = \ libgmodule_2_0_la_LIBADD = $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib) -libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(GMODULE_DEF) +libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(gmodule_def) if OS_WIN32 gmodule-win32-res.o: gmodule.rc diff --git a/gobject/ChangeLog b/gobject/ChangeLog index c71f130fa..8bcd47e49 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +2008-03-16 Tor Lillqvist + + * Makefile.am: Define gobject_def locally here instead of using an + Autoconf variable. + 2008-03-10 Matthias Clasen * === Released 2.16.1 === diff --git a/gobject/Makefile.am b/gobject/Makefile.am index b2ab425a2..c348b6762 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -55,6 +55,7 @@ endif if OS_WIN32 export_symbols = -export-symbols gobject.def +gobject_def = gobject.def install-def-file: $(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def @@ -82,7 +83,7 @@ libgobject_2_0_la_LDFLAGS = \ libgobject_2_0_la_LIBADD = $(libglib) -libgobject_2_0_la_DEPENDENCIES = $(gobject_win32_res) $(GOBJECT_DEF) +libgobject_2_0_la_DEPENDENCIES = $(gobject_win32_res) $(gobject_def) # # setup source file variables diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 39da76795..75e10e571 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,8 @@ +2008-03-16 Tor Lillqvist + + * Makefile.am: Define gthread_def locally here instead of using an + Autoconf variable. + 2008-03-10 Matthias Clasen * === Released 2.16.1 === diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 6d91d4d60..07dc0a20d 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -47,6 +47,7 @@ endif if OS_WIN32 export_symbols = -export-symbols $(srcdir)/gthread.def +gthread_def = gthread.def install-def-file: $(INSTALL) $(srcdir)/gthread.def $(DESTDIR)$(libdir)/gthread-2.0.def @@ -71,7 +72,7 @@ libgthread_2_0_la_LDFLAGS = \ libgthread_2_0_la_LIBADD = $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(libglib) -libgthread_2_0_la_DEPENDENCIES = $(gthread_win32_res) $(GTHREAD_DEF) +libgthread_2_0_la_DEPENDENCIES = $(gthread_win32_res) $(gthread_def) if OS_WIN32 gthread-win32-res.o: gthread.rc