[vala/wip/valadate: 70/101] Don't hardcode gio-2.0 linker dependency
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/valadate: 70/101] Don't hardcode gio-2.0 linker dependency
- Date: Sat, 7 Oct 2017 10:55:52 +0000 (UTC)
commit 28581bde6a3e0159f23466a83d9507af0bd84a8b
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Mon Sep 26 09:30:47 2016 +0200
Don't hardcode gio-2.0 linker dependency
configure.ac | 5 +++++
tests/Makefile.am | 8 ++++++--
valadate/Makefile.am | 6 ++----
3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6f0a79b..3ba2387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,11 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED)
+
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GMODULE_CFLAGS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6ee25b2..2eff57d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,8 +20,8 @@ valadatetests_SOURCES = \
valadatetests_LDADD = \
$(GLIB_LIBS) \
+ $(GIO_LIBS) \
$(GMODULE_LIBS) \
- -lgio-2.0 \
-lm \
$(top_srcdir)/valadate/libvaladate.la \
$(NULL)
@@ -29,6 +29,7 @@ valadatetests_LDADD = \
valadatetests_CPPFLAGS = \
-I$(top_srcdir)/valadate \
$(GLIB_CPPFLAGS) \
+ $(GIO_CFLAGS) \
$(GMODULE_CPPFLAGS) \
-fPIE \
$(NULL)
@@ -36,6 +37,7 @@ valadatetests_CPPFLAGS = \
valadatetests_CFLAGS = \
-I$(top_srcdir)/valadate \
$(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
$(GMODULE_CFLAGS) \
-pie \
-g \
@@ -58,8 +60,8 @@ valactests@PACKAGE_SUFFIX@_SOURCES = \
valactests@PACKAGE_SUFFIX@_LDADD = \
$(GLIB_LIBS) \
+ $(GIO_LIBS) \
$(GMODULE_LIBS) \
- -lgio-2.0 \
-lm \
$(top_srcdir)/valadate/libvaladate.la \
$(NULL)
@@ -67,6 +69,7 @@ valactests@PACKAGE_SUFFIX@_LDADD = \
valactests@PACKAGE_SUFFIX@_CPPFLAGS = \
-I$(top_srcdir)/valadate \
$(GLIB_CPPFLAGS) \
+ $(GIO_CFLAGS) \
$(GMODULE_CPPFLAGS) \
-fPIE \
$(NULL)
@@ -74,6 +77,7 @@ valactests@PACKAGE_SUFFIX@_CPPFLAGS = \
valactests@PACKAGE_SUFFIX@_CFLAGS = \
-I$(top_srcdir)/valadate \
$(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
$(GMODULE_CFLAGS) \
-pie \
-g \
diff --git a/valadate/Makefile.am b/valadate/Makefile.am
index 58393ef..250751d 100644
--- a/valadate/Makefile.am
+++ b/valadate/Makefile.am
@@ -32,9 +32,9 @@ libvaladate_la_VALAFLAGS = \
-g \
$(NULL)
-
libvaladate_la_CFLAGS = \
$(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
$(GMODULE_CFLAGS) \
$(NULL)
@@ -47,7 +47,6 @@ libvaladate_la_CPPFLAGS = \
-I$(top_srcdir)/ccode \
$(NULL)
-
libvaladate_la_LDFLAGS = \
-export-dynamic \
-shared \
@@ -57,8 +56,8 @@ libvaladate_la_LIBADD = \
$(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \
$(COVERAGE_LIBS) \
$(GLIB_LIBS) \
+ $(GIO_LIBS) \
$(GMODULE_LIBS) \
- -lgio-2.0 \
$(NULL)
libvaladateincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
@@ -75,7 +74,6 @@ CLEANFILES = \
valadate.h \
$(NULL)
-
MAINTAINERCLEANFILES = \
valadate.vapi \
valadate.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]