X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=78b82fba6bcb511a8b3302cad3a3c1cb014e7c67;hp=b8736334f3068dc8a5ba2c4b5d1c0430d39cf735;hb=614bef1bce4e94e7774d965b790a1d95b55b81bc;hpb=e36d39701c95b3d0712ccdd05a46e747707d4880

diff --git a/Makefile.in b/Makefile.in
index b873633..78b82fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,11 +6,12 @@ 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@
-LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@
+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@
 RANLIB=ranlib
 INSTALL=install
@@ -53,16 +54,21 @@ 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)
 
-LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o $(INPUTS:=.o) $(EFFECTS:=.o)
+LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.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
@@ -97,10 +103,13 @@ clean:
 	$(RM) demo $(TESTS) libmovit.a $(OBJS) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step*.dot chain*.frag
 	$(RM) -r movit.info coverage/
 
+distclean: clean
+	$(RM) Makefile movit.pc config.status config.log
+
 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; \
@@ -113,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 resource_pool.h
 HDRS += $(INPUTS:=.h)
 HDRS += $(EFFECTS:=.h)
 
@@ -136,4 +145,4 @@ install: libmovit.a
 	$(MKDIR) -p $(libdir)/pkgconfig/
 	$(INSTALL) -m 644 movit.pc $(libdir)/pkgconfig/
 
-.PHONY: coverage clean check all install
+.PHONY: coverage clean distclean check all install