More tweaks to the .ld generation.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f531c3bf9d57f19c6cf2a89619fe706a785953f0..93318cfd608bcd026965f814d45a34c296b27a47 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,6 +8,7 @@ datarootdir = @datarootdir@
 datadir = @datadir@
 top_builddir = @top_builddir@
 with_demo_app = @with_demo_app@
+with_coverage = @with_coverage@
 
 CC=@CC@
 CXX=@CXX@
@@ -20,7 +21,7 @@ RANLIB=ranlib
 INSTALL=install
 MKDIR=mkdir
 
-ifeq ($(COVERAGE),1)
+ifeq ($(with_coverage),yes)
 CXXFLAGS += -fprofile-arcs -ftest-coverage --coverage
 LDFLAGS += -fprofile-arcs -ftest-coverage
 LDLIBS += -lgcov
@@ -57,6 +58,7 @@ TESTED_EFFECTS += fft_pass_effect
 TESTED_EFFECTS += vignette_effect
 TESTED_EFFECTS += slice_effect
 TESTED_EFFECTS += complex_modulate_effect
+TESTED_EFFECTS += luma_mix_effect
 
 UNTESTED_EFFECTS = sandbox_effect
 UNTESTED_EFFECTS += mirror_effect
@@ -101,7 +103,8 @@ libmovit.la: $(LIB_OBJS:.o=.lo)
 
 %.lo: %.cpp
        $(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
-       sed 's/\.o:/\.lo:/' < $(@:.lo=.d) > $(@:.lo=.ld)
+       [ ! -r $(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < $(@:.lo=.d) > $(@:.lo=.ld)
+       [ ! -r .libs/$(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < .libs/$(@:.lo=.d) > .libs/$(@:.lo=.ld)
 %.o: %.cpp
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 
@@ -126,11 +129,16 @@ check: $(TESTS)
                exit 1; \
        fi
 
-# You need to build with COVERAGE=1 to use this target.
+ifeq ($(with_coverage),yes)
 coverage: check
        lcov -d . -c -o movit.info
        lcov --remove movit.info '*_test.cpp' 'test_util.*' 'sandbox_effect.*' widgets.cpp -o movit.info
        genhtml -o coverage movit.info
+else
+coverage:
+       @echo You need to compile with --enable-coverage to use this target.
+       @exit 1
+endif
 
 HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h
 HDRS += $(INPUTS:=.h)