luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-15 12:08:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

stop using libgthread internally

Browse Source 
The gobject tools (glib-genmarshal and gobject-query) were linking
against libgthread.  Stop that.

Also, remove the gthread_INCLUDES internal automake substitution.
This commit is contained in:
Ryan Lortie 2012-11-25 14:47:53 -05:00
parent 1f005d9385
commit 37f369a41e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -3564,14 +3564,9 @@ AC_SUBST(config_h_INCLUDES)
glib_INCLUDES='$(config_h_INCLUDES) -I$(top_builddir)/glib -I$(top_srcdir)/glib -I$(top_srcdir)' glib_INCLUDES='$(config_h_INCLUDES) -I$(top_builddir)/glib -I$(top_srcdir)/glib -I$(top_srcdir)'
AC_SUBST(glib_INCLUDES) AC_SUBST(glib_INCLUDES)
# gthread:
# same as glib
gthread_INCLUDES='$(glib_INCLUDES)'
AC_SUBST(gthread_INCLUDES)
# gobject: # gobject:
# same as gthread # same as glib
gobject_INCLUDES='$(gthread_INCLUDES)' gobject_INCLUDES='$(glib_INCLUDES)'
AC_SUBST(gobject_INCLUDES) AC_SUBST(gobject_INCLUDES)
# gmodule: # gmodule:

4
gobject/Makefile.am
View File

@ -14,7 +14,7 @@ CLEANFILES=
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GObject\" \ -DG_LOG_DOMAIN=\"GLib-GObject\" \
$(gthread_INCLUDES) \ $(glib_INCLUDES) \
$(GLIB_DEBUG_FLAGS) \ $(GLIB_DEBUG_FLAGS) \
-DGOBJECT_COMPILATION -DGOBJECT_COMPILATION
@ -27,7 +27,7 @@ TESTS = abicheck.sh
endif endif
endif endif
libglib = $(top_builddir)/glib/libglib-2.0.la $(top_builddir)/gthread/libgthread-2.0.la libglib = $(top_builddir)/glib/libglib-2.0.la
# libraries to compile and install # libraries to compile and install
lib_LTLIBRARIES = libgobject-2.0.la lib_LTLIBRARIES = libgobject-2.0.la