X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=d1eb16533be13670b6d5ac212edc9097f3870c57;hp=b3d1a3ff33801e0c4a53acfa81d2ee7c586184c3;hb=4e1cc130959901f8be5566eacf7ecadbc7e0e9b2;hpb=04fa50e1587057705dccb6e539378415c52209ad diff --git a/Makefile.in b/Makefile.in index b3d1a3f..d1eb165 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,6 +6,7 @@ includedir = @includedir@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ +with_demo_app = @with_demo_app@ CC=@CC@ CXX=@CXX@ @@ -53,6 +54,7 @@ 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) @@ -62,7 +64,11 @@ TESTS=effect_chain_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test) LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o $(INPUTS:=.o) $(EFFECTS:=.o) # Default target: -all: $(TESTS) demo +all: libmovit.a $(TESTS) + +ifeq ($(with_demo_app),yes) +all: demo +endif # Google Test and other test library functions. TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o @@ -116,7 +122,7 @@ coverage: check lcov --remove movit.info '*_test.cpp' '*/test_util.{cpp,h}' -o movit.info genhtml -o coverage movit.info -HDRS = effect_chain.h effect.h input.h image_format.h init.h util.h +HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h HDRS += $(INPUTS:=.h) HDRS += $(EFFECTS:=.h)