From: cpickett <cpickett@64e312b2-a51f-0410-8e61-82d0ca0eb02a>
Date: Sun, 28 Dec 2008 21:05:31 +0000 (+0000)
Subject: * #include "../lib/libcompat.h" in two places
X-Git-Tag: 0.10.0~695
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f46bb9c4bc501449e37d108dd79b09cfd0876ff;p=check

* #include "../lib/libcompat.h" in two places
* change .. in LDADD and LIBADD to $(top_builddir)



git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@467 64e312b2-a51f-0410-8e61-82d0ca0eb02a
---

diff --git a/src/Makefile.am b/src/Makefile.am
index d609808..4eaae19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 lib_LTLIBRARIES		= libcheck.la
 noinst_LTLIBRARIES	= libcheckinternal.la
 
-LIBADD                  = ../lib/libcompat.la
+LIBADD                  = $(top_builddir)/lib/libcompat.la
 
 include_HEADERS		= check.h
 
diff --git a/src/check_run.c b/src/check_run.c
index 09e508b..fdffa80 100644
--- a/src/check_run.c
+++ b/src/check_run.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "lib/libcompat.h"
+#include "../lib/libcompat.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8778c3e..fb23eef 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = \
 	ex_xml_output	\
 	ex_log_output
 
-LDADD = ../lib/libcompat.la
+LDADD = $(top_builddir)/lib/libcompat.la
 
 EXTRA_DIST = test_output.sh test_log_output.sh test_xml_output.sh
 
diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c
index 303932d..d49e95a 100644
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "../lib/libcompat.h"
 #include <sys/types.h>
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -12,7 +13,6 @@
 
 
 
-
 START_TEST(test_lno)
 {
   fail("Failure expected"); /* line 18*/