You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

326 lines
9.1 KiB

  1. --- a/src/bin/admin/Makefile.am
  2. +++ b/src/bin/admin/Makefile.am
  3. @@ -1,4 +1,4 @@
  4. -SUBDIRS = . tests
  5. +SUBDIRS = .
  6. # Install kea-admin in sbin.
  7. sbin_SCRIPTS = kea-admin
  8. --- a/src/bin/agent/Makefile.am
  9. +++ b/src/bin/agent/Makefile.am
  10. @@ -1,4 +1,4 @@
  11. -SUBDIRS = . tests
  12. +SUBDIRS = .
  13. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  14. AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
  15. --- a/src/bin/d2/Makefile.am
  16. +++ b/src/bin/d2/Makefile.am
  17. @@ -1,4 +1,4 @@
  18. -SUBDIRS = . tests
  19. +SUBDIRS = .
  20. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  21. AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
  22. --- a/src/bin/dhcp4/Makefile.am
  23. +++ b/src/bin/dhcp4/Makefile.am
  24. @@ -1,4 +1,4 @@
  25. -SUBDIRS = . tests
  26. +SUBDIRS = .
  27. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  28. AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
  29. --- a/src/bin/dhcp6/Makefile.am
  30. +++ b/src/bin/dhcp6/Makefile.am
  31. @@ -1,4 +1,4 @@
  32. -SUBDIRS = . tests
  33. +SUBDIRS = .
  34. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  35. AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
  36. --- a/src/bin/keactrl/Makefile.am
  37. +++ b/src/bin/keactrl/Makefile.am
  38. @@ -1,4 +1,4 @@
  39. -SUBDIRS = . tests
  40. +SUBDIRS = .
  41. # Install keactrl in sbin and the keactrl.conf required by the keactrl
  42. # in etc. keactrl will look for its configuration file in the etc folder.
  43. --- a/src/bin/lfc/Makefile.am
  44. +++ b/src/bin/lfc/Makefile.am
  45. @@ -1,4 +1,4 @@
  46. -SUBDIRS = . tests
  47. +SUBDIRS = .
  48. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  49. AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
  50. --- a/src/bin/netconf/Makefile.am
  51. +++ b/src/bin/netconf/Makefile.am
  52. @@ -1,4 +1,4 @@
  53. -SUBDIRS = . tests
  54. +SUBDIRS = .
  55. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  56. AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
  57. --- a/src/bin/perfdhcp/Makefile.am
  58. +++ b/src/bin/perfdhcp/Makefile.am
  59. @@ -1,4 +1,4 @@
  60. -SUBDIRS = . tests
  61. +SUBDIRS = .
  62. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  63. AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
  64. --- a/src/bin/shell/Makefile.am
  65. +++ b/src/bin/shell/Makefile.am
  66. @@ -1,4 +1,4 @@
  67. -SUBDIRS = . tests
  68. +SUBDIRS = .
  69. pkgpython_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py
  70. --- a/src/hooks/dhcp/high_availability/Makefile.am
  71. +++ b/src/hooks/dhcp/high_availability/Makefile.am
  72. @@ -1,4 +1,4 @@
  73. -SUBDIRS = . tests
  74. +SUBDIRS = .
  75. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  76. AM_CPPFLAGS += $(BOOST_INCLUDES)
  77. --- a/src/hooks/dhcp/lease_cmds/Makefile.am
  78. +++ b/src/hooks/dhcp/lease_cmds/Makefile.am
  79. @@ -1,4 +1,4 @@
  80. -SUBDIRS = . tests
  81. +SUBDIRS = .
  82. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  83. AM_CPPFLAGS += $(BOOST_INCLUDES)
  84. --- a/src/hooks/dhcp/stat_cmds/Makefile.am
  85. +++ b/src/hooks/dhcp/stat_cmds/Makefile.am
  86. @@ -1,4 +1,4 @@
  87. -SUBDIRS = . tests
  88. +SUBDIRS = .
  89. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  90. AM_CPPFLAGS += $(BOOST_INCLUDES)
  91. --- a/src/hooks/dhcp/user_chk/Makefile.am
  92. +++ b/src/hooks/dhcp/user_chk/Makefile.am
  93. @@ -1,4 +1,4 @@
  94. -SUBDIRS = . tests
  95. +SUBDIRS = .
  96. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  97. AM_CPPFLAGS += $(BOOST_INCLUDES)
  98. --- a/src/lib/asiodns/Makefile.am
  99. +++ b/src/lib/asiodns/Makefile.am
  100. @@ -1,4 +1,4 @@
  101. -SUBDIRS = . tests
  102. +SUBDIRS = .
  103. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  104. AM_CPPFLAGS += $(BOOST_INCLUDES)
  105. --- a/src/lib/asiolink/Makefile.am
  106. +++ b/src/lib/asiolink/Makefile.am
  107. @@ -1,4 +1,4 @@
  108. -SUBDIRS = . testutils tests
  109. +SUBDIRS = .
  110. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  111. AM_CPPFLAGS += $(BOOST_INCLUDES)
  112. --- a/src/lib/cc/Makefile.am
  113. +++ b/src/lib/cc/Makefile.am
  114. @@ -1,4 +1,4 @@
  115. -SUBDIRS = . tests
  116. +SUBDIRS = .
  117. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  118. AM_CPPFLAGS += $(BOOST_INCLUDES)
  119. --- a/src/lib/cfgrpt/Makefile.am
  120. +++ b/src/lib/cfgrpt/Makefile.am
  121. @@ -1,4 +1,4 @@
  122. -SUBDIRS = . tests
  123. +SUBDIRS = .
  124. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  125. AM_CXXFLAGS = $(KEA_CXXFLAGS)
  126. --- a/src/lib/config/Makefile.am
  127. +++ b/src/lib/config/Makefile.am
  128. @@ -1,4 +1,4 @@
  129. -SUBDIRS = . tests
  130. +SUBDIRS = .
  131. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  132. AM_CPPFLAGS += $(BOOST_INCLUDES)
  133. --- a/src/lib/config_backend/Makefile.am
  134. +++ b/src/lib/config_backend/Makefile.am
  135. @@ -1,4 +1,4 @@
  136. -SUBDIRS = . tests
  137. +SUBDIRS = .
  138. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  139. AM_CPPFLAGS += $(BOOST_INCLUDES)
  140. --- a/src/lib/cql/Makefile.am
  141. +++ b/src/lib/cql/Makefile.am
  142. @@ -1,4 +1,4 @@
  143. -SUBDIRS = . testutils tests
  144. +SUBDIRS = .
  145. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  146. AM_CPPFLAGS += $(BOOST_INCLUDES) $(CQL_CPPFLAGS)
  147. --- a/src/lib/cryptolink/Makefile.am
  148. +++ b/src/lib/cryptolink/Makefile.am
  149. @@ -1,4 +1,4 @@
  150. -SUBDIRS = . tests
  151. +SUBDIRS = .
  152. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  153. AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
  154. --- a/src/lib/database/Makefile.am
  155. +++ b/src/lib/database/Makefile.am
  156. @@ -1,4 +1,4 @@
  157. -SUBDIRS = . testutils tests
  158. +SUBDIRS = .
  159. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  160. AM_CPPFLAGS += $(BOOST_INCLUDES)
  161. --- a/src/lib/dhcp/Makefile.am
  162. +++ b/src/lib/dhcp/Makefile.am
  163. @@ -1,4 +1,4 @@
  164. -SUBDIRS = . tests
  165. +SUBDIRS = .
  166. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  167. AM_CPPFLAGS += $(BOOST_INCLUDES)
  168. --- a/src/lib/dhcp_ddns/Makefile.am
  169. +++ b/src/lib/dhcp_ddns/Makefile.am
  170. @@ -1,4 +1,4 @@
  171. -SUBDIRS = . tests
  172. +SUBDIRS = .
  173. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  174. AM_CPPFLAGS += $(BOOST_INCLUDES)
  175. --- a/src/lib/dhcpsrv/Makefile.am
  176. +++ b/src/lib/dhcpsrv/Makefile.am
  177. @@ -1,6 +1,6 @@
  178. AUTOMAKE_OPTIONS = subdir-objects
  179. -SUBDIRS = . testutils tests benchmarks
  180. +SUBDIRS = . benchmarks
  181. dhcp_data_dir = @localstatedir@/@PACKAGE@
  182. kea_lfc_location = @prefix@/sbin/kea-lfc
  183. --- a/src/lib/dns/Makefile.am
  184. +++ b/src/lib/dns/Makefile.am
  185. @@ -1,6 +1,6 @@
  186. AUTOMAKE_OPTIONS = subdir-objects
  187. -SUBDIRS = . tests
  188. +SUBDIRS = .
  189. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  190. AM_CPPFLAGS += $(BOOST_INCLUDES)
  191. --- a/src/lib/eval/Makefile.am
  192. +++ b/src/lib/eval/Makefile.am
  193. @@ -1,4 +1,4 @@
  194. -SUBDIRS = . tests
  195. +SUBDIRS = .
  196. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  197. AM_CPPFLAGS += $(BOOST_INCLUDES)
  198. --- a/src/lib/exceptions/Makefile.am
  199. +++ b/src/lib/exceptions/Makefile.am
  200. @@ -1,4 +1,4 @@
  201. -SUBDIRS = . tests
  202. +SUBDIRS = .
  203. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  204. AM_CXXFLAGS=$(KEA_CXXFLAGS)
  205. --- a/src/lib/hooks/Makefile.am
  206. +++ b/src/lib/hooks/Makefile.am
  207. @@ -1,4 +1,4 @@
  208. -SUBDIRS = . tests
  209. +SUBDIRS = .
  210. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  211. AM_CPPFLAGS += $(BOOST_INCLUDES)
  212. --- a/src/lib/http/Makefile.am
  213. +++ b/src/lib/http/Makefile.am
  214. @@ -1,4 +1,4 @@
  215. -SUBDIRS = . tests
  216. +SUBDIRS = .
  217. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  218. AM_CPPFLAGS += $(BOOST_INCLUDES)
  219. --- a/src/lib/log/Makefile.am
  220. +++ b/src/lib/log/Makefile.am
  221. @@ -1,4 +1,4 @@
  222. -SUBDIRS = interprocess . compiler tests
  223. +SUBDIRS = interprocess . compiler
  224. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  225. AM_CPPFLAGS += $(BOOST_INCLUDES)
  226. --- a/src/lib/log/interprocess/Makefile.am
  227. +++ b/src/lib/log/interprocess/Makefile.am
  228. @@ -1,4 +1,4 @@
  229. -SUBDIRS = . tests
  230. +SUBDIRS = .
  231. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  232. AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(localstatedir)/run/$(PACKAGE_NAME)\"
  233. --- a/src/lib/mysql/Makefile.am
  234. +++ b/src/lib/mysql/Makefile.am
  235. @@ -1,4 +1,4 @@
  236. -SUBDIRS = . testutils tests
  237. +SUBDIRS = .
  238. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  239. AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS)
  240. --- a/src/lib/pgsql/Makefile.am
  241. +++ b/src/lib/pgsql/Makefile.am
  242. @@ -1,4 +1,4 @@
  243. -SUBDIRS = . testutils tests
  244. +SUBDIRS = .
  245. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  246. AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS)
  247. --- a/src/lib/process/Makefile.am
  248. +++ b/src/lib/process/Makefile.am
  249. @@ -1,4 +1,4 @@
  250. -SUBDIRS = . testutils tests
  251. +SUBDIRS = .
  252. # DATA_DIR is the directory where to put PID files.
  253. dhcp_data_dir = @runstatedir@/@PACKAGE@
  254. AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
  255. --- a/src/lib/stats/Makefile.am
  256. +++ b/src/lib/stats/Makefile.am
  257. @@ -1,4 +1,4 @@
  258. -SUBDIRS = . tests
  259. +SUBDIRS = .
  260. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  261. AM_CPPFLAGS += $(BOOST_INCLUDES)
  262. --- a/src/lib/util/Makefile.am
  263. +++ b/src/lib/util/Makefile.am
  264. @@ -1,6 +1,6 @@
  265. AUTOMAKE_OPTIONS = subdir-objects
  266. -SUBDIRS = . io unittests tests python threads
  267. +SUBDIRS = . io python threads
  268. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  269. AM_CPPFLAGS += $(BOOST_INCLUDES)
  270. --- a/src/lib/util/threads/Makefile.am
  271. +++ b/src/lib/util/threads/Makefile.am
  272. @@ -1,4 +1,4 @@
  273. -SUBDIRS = . tests
  274. +SUBDIRS = .
  275. AM_CXXFLAGS = $(KEA_CXXFLAGS)
  276. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  277. --- a/src/lib/yang/Makefile.am
  278. +++ b/src/lib/yang/Makefile.am
  279. @@ -1,4 +1,4 @@
  280. -SUBDIRS = . testutils pretests tests
  281. +SUBDIRS = .
  282. AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  283. AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_CPPFLAGS)