[svn] commit: r1321 - in /trunk: ./ src/bin/auth/ src/bin/auth/tests/ src/lib/config/ src/lib/config/unittests/

[BIND 10 source code commits]

Author: jelte
Date: Thu Mar 11 10:17:03 2010
New Revision: 1321

Log:
use libtool for libcfgclient too
moved tests into unittests/ subdirectory
added boostlibs ldd flag if needed

Added:
    trunk/src/lib/config/unittests/
    trunk/src/lib/config/unittests/Makefile.am
    trunk/src/lib/config/unittests/config_data_unittests.cc
      - copied, changed from r1320, trunk/src/lib/config/config_data_unittests.cc
    trunk/src/lib/config/unittests/data_def_unittests_config.h.in
      - copied, changed from r1320, trunk/src/lib/config/data_def_unittests_config.h.in
    trunk/src/lib/config/unittests/module_spec_unittests.cc
      - copied, changed from r1320, trunk/src/lib/config/module_spec_unittests.cc
    trunk/src/lib/config/unittests/run_unittests.cc
      - copied unchanged from r1320, trunk/src/lib/config/run_unittests.cc
Removed:
    trunk/src/lib/config/config_data_unittests.cc
    trunk/src/lib/config/data_def_unittests_config.h.in
    trunk/src/lib/config/module_spec_unittests.cc
    trunk/src/lib/config/run_unittests.cc
Modified:
    trunk/configure.ac
    trunk/src/bin/auth/Makefile.am
    trunk/src/bin/auth/tests/Makefile.am
    trunk/src/lib/config/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Mar 11 10:17:03 2010
@@ -219,6 +219,7 @@
                  src/lib/python/isc/config/Makefile
                  src/lib/python/isc/Util/Makefile
                  src/lib/config/Makefile
+                 src/lib/config/unittests/Makefile
                  src/lib/dns/Makefile
                  src/lib/dns/tests/Makefile
                  src/lib/exceptions/Makefile
@@ -245,7 +246,7 @@
            src/bin/msgq/msgq_test
            src/bin/msgq/run_msgq.sh
            src/bin/auth/spec_config.h
-           src/lib/config/data_def_unittests_config.h
+           src/lib/config/unittests/data_def_unittests_config.h
            src/lib/python/isc/config/unittests/config_test
            src/lib/dns/gen-rdatacode.py
            src/lib/dns/tests/testdata/gen-wiredata.py

Modified: trunk/src/bin/auth/Makefile.am
==============================================================================
--- trunk/src/bin/auth/Makefile.am (original)
+++ trunk/src/bin/auth/Makefile.am Thu Mar 11 10:17:03 2010
@@ -12,7 +12,7 @@
 b10_auth_SOURCES += main.cc
 b10_auth_LDADD =  $(top_builddir)/src/lib/auth/.libs/libauth.a
 b10_auth_LDADD +=  $(top_builddir)/src/lib/dns/.libs/libdns.a
-b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.a
+b10_auth_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.a
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
 b10_auth_LDADD += $(SQLITE_LIBS)

Modified: trunk/src/bin/auth/tests/Makefile.am
==============================================================================
--- trunk/src/bin/auth/tests/Makefile.am (original)
+++ trunk/src/bin/auth/tests/Makefile.am Thu Mar 11 10:17:03 2010
@@ -16,7 +16,7 @@
 run_unittests_LDADD += $(SQLITE_LIBS)
 run_unittests_LDADD +=  $(top_builddir)/src/lib/auth/.libs/libauth.a
 run_unittests_LDADD +=  $(top_builddir)/src/lib/dns/.libs/libdns.a
-run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.a
+run_unittests_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
 if HAVE_BOOSTLIB

Modified: trunk/src/lib/config/Makefile.am
==============================================================================
--- trunk/src/lib/config/Makefile.am (original)
+++ trunk/src/lib/config/Makefile.am Thu Mar 11 10:17:03 2010
@@ -1,21 +1,11 @@
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext
 
-lib_LIBRARIES = libcfgclient.a
-libcfgclient_a_SOURCES = config_data.h config_data.cc module_spec.h module_spec.cc ccsession.cc ccsession.h
+lib_LTLIBRARIES = libcfgclient.la
+libcfgclient_la_SOURCES = config_data.h config_data.cc module_spec.h module_spec.cc ccsession.cc ccsession.h
 
 CLEANFILES = *.gcno *.gcda
 
 TESTS =
 if HAVE_GTEST
-TESTS += run_unittests
-run_unittests_SOURCES = module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
-run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
-run_unittests_LDADD = libcfgclient.a $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a
+SUBDIRS = . unittests
 endif
-
-noinst_PROGRAMS = $(TESTS)
-
-