Remove the finalize() member function from Input.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b8736334f3068dc8a5ba2c4b5d1c0430d39cf735..030140f9648c94a6fb0a0c43e853e104f55fc35a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,19 +6,24 @@ includedir = @includedir@
 libdir = @libdir@
 datarootdir = @datarootdir@
 datadir = @datadir@
-
-CC=gcc
-CXX=g++
-CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
-LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@
-DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
+top_builddir = @top_builddir@
+with_demo_app = @with_demo_app@
+
+CC=@CC@
+CXX=@CXX@
+CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
+LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
+DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
+SHELL=@SHELL@
+LIBTOOL=@LIBTOOL@ --tag=CXX
 RANLIB=ranlib
 INSTALL=install
 MKDIR=mkdir
 
 ifeq ($(COVERAGE),1)
-CXXFLAGS += -fprofile-arcs -ftest-coverage
+CXXFLAGS += -fprofile-arcs -ftest-coverage --coverage
 LDFLAGS += -fprofile-arcs -ftest-coverage
+LDLIBS += -lgcov
 endif
 
 DEMO_OBJS=demo.o
@@ -48,21 +53,27 @@ TESTED_EFFECTS += padding_effect
 TESTED_EFFECTS += resample_effect
 TESTED_EFFECTS += dither_effect
 TESTED_EFFECTS += deconvolution_sharpen_effect
+TESTED_EFFECTS += fft_pass_effect
+TESTED_EFFECTS += vignette_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)
 
-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.la $(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
@@ -73,20 +84,21 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
        $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
 
 # Unit tests.
-$(TESTS): %: %.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
+$(TESTS): %: %.o $(TEST_OBJS) libmovit.la
+       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 # A small demo program.
-demo: libmovit.a $(DEMO_OBJS)
-       $(CXX) -o demo $(DEMO_OBJS) libmovit.a $(LDFLAGS) $(DEMO_LDFLAGS)
+demo: libmovit.la $(DEMO_OBJS)
+       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o demo $(DEMO_OBJS) libmovit.la $(LDLIBS) $(DEMO_LDLIBS)
 
 # The library itself.
-libmovit.a: $(LIB_OBJS)
-       $(AR) rc $@ $(LIB_OBJS)
-       $(RANLIB) $@
+libmovit.la: $(LIB_OBJS:.o=.lo)
+       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $(LDLIBS)
 
+%.lo: %.cpp
+       $(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 %.o: %.cpp
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 
@@ -94,13 +106,17 @@ DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
-       $(RM) demo $(TESTS) libmovit.a $(OBJS) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step*.dot chain*.frag
-       $(RM) -r movit.info coverage/
+       $(LIBTOOL) --mode=clean $(RM) demo $(TESTS) libmovit.la $(OBJS) $(OBJS:.o=.lo)
+       $(RM) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step*.dot chain*.frag
+       $(RM) -r movit.info coverage/ .libs/
+
+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; \
@@ -110,10 +126,10 @@ 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.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)
 
@@ -127,8 +143,8 @@ SHADERS += overlay_matte_effect.frag
 MISSING_SHADERS = diffusion_effect.frag glow_effect.frag unsharp_mask_effect.frag resize_effect.frag
 SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS))
 
-install: libmovit.a
-       $(INSTALL) -m 0644 libmovit.a $(libdir)/
+install: libmovit.la
+       $(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(libdir)/
        $(MKDIR) -p $(includedir)/movit/
        $(INSTALL) -m 0644 $(HDRS) $(includedir)/movit/
        $(MKDIR) -p $(datadir)/movit/
@@ -136,4 +152,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