X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=f5ae1034106ea6998915492d7f0eb834ca8a3e33;hp=d717216d3cb6270be4486a041a04493543b3db49;hb=4a55a7fdc6a0e184dda9c19052654989f21163cc;hpb=6278a96c8e0ea5df9d831ecd5b893f831ddc8297

diff --git a/Makefile.in b/Makefile.in
index d717216..f5ae103 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,10 +6,11 @@ includedir = @includedir@
 libdir = @libdir@
 datarootdir = @datarootdir@
 datadir = @datadir@
+with_demo_app = @with_demo_app@
 
-CC=gcc
-CXX=g++
-CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
+CC=@CC@
+CXX=@CXX@
+CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
 LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@
 DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
 RANLIB=ranlib
@@ -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
@@ -103,7 +109,7 @@ distclean: clean
 check: $(TESTS)
 	FAILED_TESTS=""; \
 	for TEST in $(TESTS); do \
-	    ./$$TEST || FAILED_TESTS="$$TEST $$FAILED_TESTS"; \
+		./$$TEST || FAILED_TESTS="$$TEST $$FAILED_TESTS"; \
 	done; \
 	if [ "$$FAILED_TESTS" ]; then \
 		echo Failed tests: $$FAILED_TESTS; \
@@ -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.h input.h image_format.h init.h util.h defs.h
 HDRS += $(INPUTS:=.h)
 HDRS += $(EFFECTS:=.h)