luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't bother defining Autoconf variables for glib.def, gmodule.def,

Browse Source 
2008-03-16  Tor Lillqvist  <tml@novell.com>

	* 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
This commit is contained in:
Tor Lillqvist 2008-03-16 10:16:57 +00:00 committed by Tor Lillqvist
parent ff69c53da9
commit e2ee29dd2c
9 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-03-16 Tor Lillqvist <tml@novell.com>
* 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 <mitch@imendio.com> 2008-03-14 Michael Natterer <mitch@imendio.com>
* glib/*.h: make it possible to disable single-file includes by * glib/*.h: make it possible to disable single-file includes by

15
configure.in
View File

@ -118,11 +118,6 @@ AC_MSG_CHECKING([for Win32])
case "$host" in case "$host" in
*-*-mingw*) *-*-mingw*)
glib_native_win32=yes 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 *' glib_pid_type='void *'
# Unfortunately the mingw implementations of C99-style snprintf and vsnprintf # 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. # 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_native_win32=no
GLIB_DEF=
GMODULE_DEF=
GOBJECT_DEF=
GTHREAD_DEF=
TESTGMODULE_EXP=
glib_pid_type=int glib_pid_type=int
;; ;;
esac 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_UNIX, [test "$glib_native_win32" != "yes"])
AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"]) AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "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 if test "$glib_native_win32" = "yes"; then
AC_CHECK_TOOL(WINDRES, windres, no) AC_CHECK_TOOL(WINDRES, windres, no)

4
glib/Makefile.am
View File

@ -252,8 +252,8 @@ no_undefined = -no-undefined
endif endif
if OS_WIN32 if OS_WIN32
# This requires a very new libtool
export_symbols = -export-symbols glib.def export_symbols = -export-symbols glib.def
glib_def = glib.def
install-def-file: install-def-file:
$(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
@ -286,7 +286,7 @@ pcre_inc =
endif 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_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 = \ libglib_2_0_la_LDFLAGS = \
$(glib_win32_res_ldflag) \ $(glib_win32_res_ldflag) \

5
gmodule/ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-16 Tor Lillqvist <tml@novell.com>
* Makefile.am: Define gmodule_def locally here instead of using an
Autoconf variable.
2008-03-10 Matthias Clasen <mclasen@redhat.com> 2008-03-10 Matthias Clasen <mclasen@redhat.com>
* === Released 2.16.1 === * === Released 2.16.1 ===

3
gmodule/Makefile.am
View File

@ -59,6 +59,7 @@ endif
if OS_WIN32 if OS_WIN32
export_symbols = -export-symbols $(srcdir)/gmodule.def export_symbols = -export-symbols $(srcdir)/gmodule.def
gmodule_def = gmodule.def
install-def-file: install-def-file:
$(INSTALL) $(srcdir)/gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def $(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_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 if OS_WIN32
gmodule-win32-res.o: gmodule.rc gmodule-win32-res.o: gmodule.rc

5
gobject/ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-16 Tor Lillqvist <tml@novell.com>
* Makefile.am: Define gobject_def locally here instead of using an
Autoconf variable.
2008-03-10 Matthias Clasen <mclasen@redhat.com> 2008-03-10 Matthias Clasen <mclasen@redhat.com>
* === Released 2.16.1 === * === Released 2.16.1 ===

3
gobject/Makefile.am
View File

@ -55,6 +55,7 @@ endif
if OS_WIN32 if OS_WIN32
export_symbols = -export-symbols gobject.def export_symbols = -export-symbols gobject.def
gobject_def = gobject.def
install-def-file: install-def-file:
$(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def $(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_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 # setup source file variables

5
gthread/ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-16 Tor Lillqvist <tml@novell.com>
* Makefile.am: Define gthread_def locally here instead of using an
Autoconf variable.
2008-03-10 Matthias Clasen <mclasen@redhat.com> 2008-03-10 Matthias Clasen <mclasen@redhat.com>
* === Released 2.16.1 === * === Released 2.16.1 ===

3
gthread/Makefile.am
View File

@ -47,6 +47,7 @@ endif
if OS_WIN32 if OS_WIN32
export_symbols = -export-symbols $(srcdir)/gthread.def export_symbols = -export-symbols $(srcdir)/gthread.def
gthread_def = gthread.def
install-def-file: install-def-file:
$(INSTALL) $(srcdir)/gthread.def $(DESTDIR)$(libdir)/gthread-2.0.def $(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_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 if OS_WIN32
gthread-win32-res.o: gthread.rc gthread-win32-res.o: gthread.rc