[template-glib] build: fix linking on Ubuntu
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [template-glib] build: fix linking on Ubuntu
- Date: Sat, 10 Sep 2016 21:24:22 +0000 (UTC)
commit f0fcd6d941e39797e4e5d99e7f2d395cadb57530
Author: Garrett Regier <garrettregier gmail com>
Date: Sat Sep 10 00:18:06 2016 -0700
build: fix linking on Ubuntu
examples/Makefile.am | 4 ++--
src/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index fe2e521..bf8806f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -7,14 +7,14 @@ noinst_PROGRAMS = simple
simple_SOURCES = simple.c
simple_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src
-simple_LDADD = $(top_builddir)/src/libtemplate-glib-1.0.la
+simple_LDADD = $(TMPL_LIBS) $(top_builddir)/src/libtemplate-glib-1.0.la
if ENABLE_VAPIGEN
noinst_PROGRAMS += simple-vala
simple_vala_SOURCES = simple-vala.vala
simple_vala_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src
-simple_vala_LDADD = $(top_builddir)/src/libtemplate-glib-1.0.la
+simple_vala_LDADD = $(TMPL_LIBS) $(top_builddir)/src/libtemplate-glib-1.0.la
simple_vala_VALAFLAGS = \
--vapidir $(top_builddir)/src \
--pkg template-glib-1.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 71482f9..ed5a945 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = \
tmpl-expr-scanner.h
template_glib_eval_CFLAGS = $(TMPL_CFLAGS)
-template_glib_eval_LDADD = libtemplate-glib-1.0.la
+template_glib_eval_LDADD = $(TMPL_LIBS) libtemplate-glib-1.0.la
template_glib_eval_SOURCES = main.c
pkgincludedir = $(includedir)/template-glib-1.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]