X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.in;h=f531c3bf9d57f19c6cf2a89619fe706a785953f0;hb=b65b7cace3efb474a378e65d395f278307c1c44c;hp=7f1bfb42844af1805a90f3141dcad0df3d32d757;hpb=e0344975e8bf5c303af92926e415d86ec75a93a3;p=movit

diff --git a/Makefile.in b/Makefile.in
index 7f1bfb4..f531c3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,8 +13,9 @@ CC=@CC@
 CXX=@CXX@
 CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
 LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
-DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
-LIBTOOL=@LIBTOOL@
+DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
+SHELL=@SHELL@
+LIBTOOL=@LIBTOOL@ --tag=CXX
 RANLIB=ranlib
 INSTALL=install
 MKDIR=mkdir
@@ -53,19 +54,21 @@ TESTED_EFFECTS += resample_effect
 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
 UNTESTED_EFFECTS += resize_effect
-UNTESTED_EFFECTS += vignette_effect
 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)
@@ -98,10 +101,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:
@@ -125,7 +129,7 @@ check: $(TESTS)
 # You need to build with COVERAGE=1 to use this target.
 coverage: check
 	lcov -d . -c -o movit.info
-	lcov --remove movit.info '*_test.cpp' '*/test_util.{cpp,h}' -o movit.info
+	lcov --remove movit.info '*_test.cpp' 'test_util.*' 'sandbox_effect.*' widgets.cpp -o movit.info
 	genhtml -o coverage movit.info
 
 HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h