Parcourir la source

[2198] Remove dependency on libb10-util in src/lib/util/unittests/

Mukund Sivaraman il y a 12 ans
Parent
commit
638f92b82b
2 fichiers modifiés avec 2 ajouts et 3 suppressions
  1. 1 1
      src/lib/util/Makefile.am
  2. 1 2
      src/lib/util/unittests/Makefile.am

+ 1 - 1
src/lib/util/Makefile.am

@@ -1,5 +1,5 @@
 # InterprocessSyncFile has a dependency on isc::util::thread::Mutex
-SUBDIRS = threads . io unittests tests pyunittests python
+SUBDIRS = io unittests threads . tests pyunittests python
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util

+ 1 - 2
src/lib/util/unittests/Makefile.am

@@ -21,8 +21,7 @@ if HAVE_GTEST
 libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
 endif
 
-libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/libb10-util.la
-libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libb10-util-io.la
+libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/io/libb10-util-io.la
 libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 
 CLEANFILES = *.gcno *.gcda