Merge branch 'master' into epoxy

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7b1698ed5a83d3ecff172f774476ffce4cfd6799..13fbadcb29573afe59af09f68abb943a06050488 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,8 @@ TESTED_EFFECTS += dither_effect
 TESTED_EFFECTS += deconvolution_sharpen_effect
 TESTED_EFFECTS += fft_pass_effect
 TESTED_EFFECTS += vignette_effect
+TESTED_EFFECTS += slice_effect
+TESTED_EFFECTS += complex_modulate_effect
 
 UNTESTED_EFFECTS = sandbox_effect
 UNTESTED_EFFECTS += mirror_effect
@@ -68,9 +70,9 @@ UNTESTED_EFFECTS += multiply_effect
 EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS)
 
 # Unit tests.
-TESTS=effect_chain_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test)
+TESTS=effect_chain_test fp16_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test)
 
-LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.o $(INPUTS:=.o) $(EFFECTS:=.o)
+LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.o fp16.o $(INPUTS:=.o) $(EFFECTS:=.o)
 
 # Default target:
 all: libmovit.la $(TESTS)
@@ -103,10 +105,11 @@ 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)
 %.o: %.cpp
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 
-DEPS=$(OBJS:.o=.d)
+DEPS=$(OBJS:.o=.d) $(OBJS:.o=.ld)
 -include $(DEPS)
 
 clean: