File tree Expand file tree Collapse file tree 7 files changed +34
-19
lines changed Expand file tree Collapse file tree 7 files changed +34
-19
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,6 @@ AM_CPPFLAGS += \
18
18
-DNAMED_PLUGINDIR=\"$(pkglibdir)\" \
19
19
-DTESTS_DIR=\"$(abs_srcdir)\"
20
20
21
- LDADD += \
22
- $(top_builddir)/tests/libtest.la \
21
+ LDADD += \
22
+ $(top_builddir)/tests/libtest/libtest .la \
23
23
$(CMOCKA_LIBS)
Original file line number Diff line number Diff line change @@ -1586,7 +1586,8 @@ AC_CONFIG_FILES([tests/Makefile
1586
1586
tests/dns/Makefile
1587
1587
tests/ns/Makefile
1588
1588
tests/irs/Makefile
1589
- tests/isccfg/Makefile] )
1589
+ tests/isccfg/Makefile
1590
+ tests/libtest/Makefile] )
1590
1591
1591
1592
AC_CONFIG_FILES ( [ tests/unit-test-driver.sh] ,
1592
1593
[ chmod +x tests/unit-test-driver.sh] )
Original file line number Diff line number Diff line change @@ -12,19 +12,5 @@ LDADD += \
12
12
$(LIBDNS_LIBS ) \
13
13
$(LIBNS_LIBS )
14
14
15
- SUBDIRS = . isc dns ns isccfg irs
16
-
17
- check_LTLIBRARIES = libtest.la
18
-
19
- noinst_libtest_ladir = .
20
- noinst_libtest_la_HEADERS = \
21
- include/tests/dns.h \
22
- include/tests/isc.h \
23
- include/tests/ns.h
24
- libtest_la_SOURCES = \
25
- $(noinst_libtest_la_HEADERS ) \
26
- dns.c \
27
- isc.c \
28
- ns.c
29
-
30
- include $(top_srcdir ) /Makefile.tests
15
+ SUBDIRS = libtest isc dns ns isccfg irs
16
+ check_PROGRAMS =
Original file line number Diff line number Diff line change
1
+ include $(top_srcdir ) /Makefile.top
2
+
3
+ AM_CPPFLAGS += \
4
+ $(LIBISC_CFLAGS ) \
5
+ $(LIBDNS_CFLAGS ) \
6
+ $(LIBNS_CFLAGS ) \
7
+ $(LIBUV_CFLAGS ) \
8
+ -I$(top_srcdir ) /lib/isc
9
+
10
+ LDADD += \
11
+ $(LIBISC_LIBS ) \
12
+ $(LIBDNS_LIBS ) \
13
+ $(LIBNS_LIBS )
14
+
15
+ check_LTLIBRARIES = libtest.la
16
+
17
+ noinst_libtest_ladir = ..
18
+ noinst_libtest_la_HEADERS = \
19
+ ../include/tests/dns.h \
20
+ ../include/tests/isc.h \
21
+ ../include/tests/ns.h
22
+ libtest_la_SOURCES = \
23
+ $(noinst_libtest_la_HEADERS ) \
24
+ dns.c \
25
+ isc.c \
26
+ ns.c
27
+
28
+ include $(top_srcdir ) /Makefile.tests
File renamed without changes.
File renamed without changes.
File renamed without changes.
You can’t perform that action at this time.
0 commit comments