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

build: Conditionally add spawn and IO channel without using EXTRA_ prefix

Browse Source 
See previous commit; same reasoning behind the commit, except that these
sources weren’t (yet) causing `make distcheck` to fail.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2018-07-31 14:49:17 +01:00
parent 862fe11f90
commit ca0110c34d
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -1552,14 +1552,14 @@ dnl **********************
AC_MSG_CHECKING(for gspawn implementation) AC_MSG_CHECKING(for gspawn implementation)
case "$host" in case "$host" in
*-*-mingw*) *-*-mingw*)
GSPAWN=gspawn-win32.lo g_spawn_impl=win32
;; ;;
*) *)
GSPAWN=gspawn.lo g_spawn_impl=unix
;; ;;
esac esac
AC_MSG_RESULT($GSPAWN) AC_MSG_RESULT($g_spawn_impl)
AC_SUBST(GSPAWN) AM_CONDITIONAL(G_SPAWN_WIN32, [test "$g_spawn_impl" = "win32"])
dnl ************************* dnl *************************
dnl *** GIOChannel checks *** dnl *** GIOChannel checks ***
@ -1568,14 +1568,14 @@ dnl *************************
AC_MSG_CHECKING(for GIOChannel implementation) AC_MSG_CHECKING(for GIOChannel implementation)
case "$host" in case "$host" in
*-*-mingw*) *-*-mingw*)
GIO=giowin32.lo g_io_channel_impl=win32
;; ;;
*) *)
GIO=giounix.lo g_io_channel_impl=unix
;; ;;
esac esac
AC_MSG_RESULT($GIO) AC_MSG_RESULT($g_io_channel_impl)
AC_SUBST(GIO) AM_CONDITIONAL(G_IO_CHANNEL_WIN32, [test "$g_io_channel_impl" = "win32"])
dnl ********************************* dnl *********************************
dnl *** Directory for GIO modules *** dnl *** Directory for GIO modules ***

23
glib/Makefile.am
View File

@ -163,6 +163,7 @@ libglib_2_0_la_SOURCES = \
gshell.c \ gshell.c \
gslice.c \ gslice.c \
gslist.c \ gslist.c \
gspawn-private.h \
gstdio.c \ gstdio.c \
gstdioprivate.h \ gstdioprivate.h \
gstrfuncs.c \ gstrfuncs.c \
@ -226,13 +227,17 @@ if PLATFORM_WIN32
libglib_2_0_la_SOURCES += gwin32.c libglib_2_0_la_SOURCES += gwin32.c
endif endif
EXTRA_libglib_2_0_la_SOURCES = \ if G_SPAWN_WIN32
giounix.c \ libglib_2_0_la_SOURCES += gspawn-win32.c
giowin32.c \ else
gspawn.c \ libglib_2_0_la_SOURCES += gspawn.c
gspawn-private.h \ endif
gspawn-win32.c \
$(NULL) if G_IO_CHANNEL_WIN32
libglib_2_0_la_SOURCES += giowin32.c
else
libglib_2_0_la_SOURCES += giounix.c
endif
glibincludedir=$(includedir)/glib-2.0 glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \ glibinclude_HEADERS = \
@ -364,8 +369,8 @@ pcre_inc =
endif endif
libglib_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) $(LIBSYSTEMD_CFLAGS) libglib_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) $(LIBSYSTEMD_CFLAGS)
libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(LIBSYSTEMD_LIBS) libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(LIBSYSTEMD_LIBS)
libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ $(glib_win32_res) $(glib_def) libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) $(glib_win32_res) $(glib_def)
libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
$(glib_win32_res_ldflag) \ $(glib_win32_res_ldflag) \