From 4826f53c0bd0e0a6919dfcbf2ebece26818839e6 Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Date: Thu, 10 Apr 2014 17:47:44 -0500 Subject: [PATCH] More fixes for make distcheck - VPATH works * Still fails on valadoc compilation --- gxml/Makefile.am | 2 +- test/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gxml/Makefile.am b/gxml/Makefile.am index cc1814ee..f303fa87 100644 --- a/gxml/Makefile.am +++ b/gxml/Makefile.am @@ -99,7 +99,7 @@ libgxml_0_4_la_LDFLAGS = \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" gxml_0_4_la_vala.stamp: $(sources) - $(VALAC) $(AM_VALAFLAGS) $(sources) + $(VALAC) $(AM_VALAFLAGS) $^ libgxml_0_4_la_SOURCES=$(sources:.vala=.c) diff --git a/test/Makefile.am b/test/Makefile.am index 50a00bfd..dffcccb7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -19,7 +19,6 @@ AM_CFLAGS = \ -DTEST_DIR=\""$(top_srcdir)/test"\" \ $(NULL) -VALAC=valac noinst_PROGRAMS = $(TEST_PROGS) @@ -71,7 +70,7 @@ gxml_test_LDADD = \ $(GXML_LIBS) \ $(LIBXML_LIBS) \ $(GIO_LIBS) \ - -L$(top_srcdir)/gxml -lgxml-0.4 \ + ../gxml/libgxml-0.4.la $(NULL) gxml_test_LDFLAGS = $(AM_LDFLAGS) -- GitLab