[yelp] Fix test compilation with internal symbols



commit 56fbb0ffb5f32c92586bdde7eaf103a950623678
Author: David King <amigadave amigadave com>
Date:   Mon Oct 19 12:45:21 2015 +0100

    Fix test compilation with internal symbols
    
    https://bugzilla.gnome.org/show_bug.cgi?id=756658

 tests/Makefile.am |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 01f2c6d..cf0447c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,8 +6,7 @@ YELP_COMMON_CFLAGS =                            \
        -I$(top_srcdir)/libyelp
 YELP_COMMON_LDADD =                            \
        $(YELP_LIBS)                            \
-       $(WARN_LDFLAGS)                         \
-       $(top_builddir)/libyelp/libyelp.la
+       $(WARN_LDFLAGS)
 
 check_PROGRAMS =                               \
        test-magic                              \
@@ -18,27 +17,35 @@ check_PROGRAMS =                            \
 
 if ENABLE_LZMA
 check_PROGRAMS += test-lzma
+test_lzma_libyelp_sources = $(top_srcdir)/libyelp/yelp-lzma-decompressor.c
 test_lzma_CFLAGS = $(YELP_COMMON_CFLAGS)
 test_lzma_LDADD = $(YELP_COMMON_LDADD)
+test_lzma_SOURCES = test-lzma.c $(test_lzma_libyelp_sources)
 endif
 
 if ENABLE_BZ2
 check_PROGRAMS += test-bz2
+test_bz2_libyelp_sources = $(top_srcdir)/libyelp/yelp-bz2-decompressor.c
 test_bz2_CFLAGS = $(YELP_COMMON_CFLAGS)
 test_bz2_LDADD = $(YELP_COMMON_LDADD)
+test_bz2_SOURCES = test-bz2.c $(test_bz2_libyelp_sources)
 endif
 
 test_magic_CFLAGS = $(YELP_COMMON_CFLAGS)
 test_magic_LDADD = $(YELP_COMMON_LDADD)
+test_magic_SOURCES = test-magic.c \
+       $(test_bz2_libyelp_sources) \
+       $(test_lzma_libyelp_sources) \
+       $(top_srcdir)/libyelp/yelp-magic-decompressor.c
 
 test_settings_CFLAGS = $(YELP_COMMON_CFLAGS)
-test_settings_LDADD = $(YELP_COMMON_LDADD)
+test_settings_LDADD = $(YELP_COMMON_LDADD) $(top_builddir)/libyelp/libyelp.la
 
 test_transform_CFLAGS = $(YELP_COMMON_CFLAGS)
-test_transform_LDADD = $(YELP_COMMON_LDADD)
+test_transform_LDADD = $(YELP_COMMON_LDADD) $(top_builddir)/libyelp/libyelp.la
 
 test_uri_CFLAGS = $(YELP_COMMON_CFLAGS)
-test_uri_LDADD = $(YELP_COMMON_LDADD)
+test_uri_LDADD = $(YELP_COMMON_LDADD) $(top_builddir)/libyelp/libyelp.la
 
 test_view_CFLAGS = $(YELP_COMMON_CFLAGS)
-test_view_LDADD = $(YELP_COMMON_LDADD)
+test_view_LDADD = $(YELP_COMMON_LDADD) $(top_builddir)/libyelp/libyelp.la


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]