summaryrefslogtreecommitdiff
path: root/relay
diff options
context:
space:
mode:
authorTomek Mrugalski <tomasz@isc.org>2012-08-14 15:20:46 +0200
committerTomek Mrugalski <tomasz@isc.org>2012-08-14 15:20:46 +0200
commit85c8df6dd08d48a4bab5fdec6ea71c70e9bd9dc2 (patch)
treeab009f3af64ad0e0dcd1c546e0b7ae277cfe26dd /relay
parenta0497ac5ac9b787edebceaecb29da0c4e5e0b320 (diff)
parent0b483f01af4288c4be28ee06ba254435c954716e (diff)
downloadisc-dhcp-85c8df6dd08d48a4bab5fdec6ea71c70e9bd9dc2.tar.gz
[master] Merge branch 'rt25901_atf'
Conflicts: configure
Diffstat (limited to 'relay')
-rw-r--r--relay/Makefile.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/relay/Makefile.in b/relay/Makefile.in
index 7e8f606a..68ea8e3a 100644
--- a/relay/Makefile.in
+++ b/relay/Makefile.in
@@ -64,6 +64,8 @@ CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+ATF_CFLAGS = @ATF_CFLAGS@
+ATF_LDFLAGS = @ATF_LDFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@