buildsystem: explicit build of a static library (used for tests)

diff --git a/configure.ac b/configure.ac
index 085a7ffda41f477c34adbc5198652aabfbb080ed..c69f9ae2e5a7d3f3006c4f654abc856637e3587f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ LT_INIT
 PKG_PROG_PKG_CONFIG
 
 # Check for dependencies
-AC_CHECK_FUNCS([nftw, mkdtemp])
+AC_CHECK_FUNCS([opendir, mkdtemp])
 PKG_CHECK_MODULES([libknot], [libknot])
 PKG_CHECK_MODULES([libuv], [libuv], [build_daemon=yes], [build_daemon=no])
 PKG_CHECK_MODULES([cmocka], [cmocka], [build_tests=yes], [build_tests=no])

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index c27f1e774e809b769398d22d452c0ed69d42e91d..3cb4cede7e41ab5c0628313d61abe6c8f48bd941 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,6 +19,6 @@ kresolved_SOURCES =                                   \
 
 # sbin programs
 sbin_PROGRAMS = kresolved
-kresolved_LDADD = $(top_builddir)/lib/libknotresolve.la $(libuv_LIBS) $(libknot_LIBS)
+kresolved_LDADD = $(top_builddir)/lib/libkresolve.la $(libuv_LIBS) $(libknot_LIBS)
 
 endif

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 476db0fbca7a01ef7650328f58039d8b3c76fc97..ba490c3ddae5dd57b6da79cef304c0432b8170d5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,8 @@
-SUBDIRS = .
-
-lib_LTLIBRARIES = libknotresolve.la
-
-libknotresolve_la_SOURCES =            \
+# Static version of the library
+noinst_LTLIBRARIES = libkresolve_static.la
+libkresolve_static_la_CPPFLAGS = $(AM_CPPFLAGS) $(libknot_CFLAGS) $(libuv_CFLAGS)
+libkresolve_static_la_LDFLAGS  = $(AM_LDFLAGS) $(libknot_LIBS) $(libuv_LIBS)
+libkresolve_static_la_SOURCES =                \
        layer/iterate.h \
        layer/iterate.c \
        layer/itercache.h       \
@@ -23,5 +23,7 @@ libknotresolve_la_SOURCES =           \
        cache.h                 \
        cache.c
 
-libknotresolve_la_CPPFLAGS = $(AM_CPPFLAGS) $(libknot_CFLAGS) $(libuv_CFLAGS)
-libknotresolve_la_LDFLAGS  = $(AM_LDFLAGS) $(libknot_LIBS) $(libuv_LIBS)
+# Shared version (to be installed)
+lib_LTLIBRARIES = libkresolve.la
+libkresolve_la_SOURCES = 
+libkresolve_la_LIBADD = libkresolve_static.la

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f0f741d0742a57383d05877ac6a065d0717cc477..37ce059be64b88f62c30b289a353519a79339123 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
        $(cmocka_CFLAGS)
 
 LDADD = \
-       $(top_builddir)/lib/libknotresolve.la \
+       $(top_builddir)/lib/libkresolve_static.la \
        $(libknot_LIBS) \
        $(cmocka_LIBS)
 
@@ -28,12 +28,11 @@ endif
 # Integration tests
 if BUILD_INTEGRATION
 
-noinst_LTLIBRARIES = _test_integration.la
+check_LTLIBRARIES = _test_integration.la
 _test_integration_la_SOURCES = test_integration.c
 _test_integration_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(AM_CPPFLAGS)
-_test_integration_la_LDFLAGS = -rpath $(abs_builddir) -module -export-dynamic -shared -avoid-version \
-                               --wrap=gettimeofday $(PYTHON_LDFLAGS)
-_test_integration_la_LIBADD = $(LDADD)
+_test_integration_la_LDFLAGS = -rpath $(abs_builddir) -module -shared -avoid-version --wrap=gettimeofday
+_test_integration_la_LIBADD = $(top_builddir)/lib/libkresolve_static.la $(libknot_LIBS) $(PYTHON_LIBS)
 
 convenience-link: $(noinst_LTLIBRARIES)
        @for soname in `echo | $(EGREP) "^dlname=" $(noinst_LTLIBRARIES) | $(SED) -e "s|^dlname='\(.*\)'|\1|"`; do  \
@@ -42,7 +41,7 @@ convenience-link: $(noinst_LTLIBRARIES)
 
 check-local-integration: convenience-link
        @echo "---- Executing integration tests ----"
-       @$(LIBTOOL) --mode=execute -dlopen $(top_builddir)/lib/libknotresolve.la ./test_integration.py testdata
+       echo ./test_integration.py testdata
 
 clean-local:
        @for soname in `echo | $(EGREP) "^dlname=" $(noinst_LTLIBRARIES) | $(SED) -e "s|^dlname='\(.*\)'|\1|"`; do  \