Some tweaks to the libtool parts of the Makefile.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 78b82fba6bcb511a8b3302cad3a3c1cb014e7c67..7f1bfb42844af1805a90f3141dcad0df3d32d757 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,7 @@ includedir = @includedir@
 libdir = @libdir@
 datarootdir = @datarootdir@
 datadir = @datadir@
+top_builddir = @top_builddir@
 with_demo_app = @with_demo_app@
 
 CC=@CC@
@@ -13,13 +14,15 @@ 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@
 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
@@ -49,6 +52,7 @@ TESTED_EFFECTS += padding_effect
 TESTED_EFFECTS += resample_effect
 TESTED_EFFECTS += dither_effect
 TESTED_EFFECTS += deconvolution_sharpen_effect
+TESTED_EFFECTS += fft_pass_effect
 
 UNTESTED_EFFECTS = sandbox_effect
 UNTESTED_EFFECTS += mirror_effect
@@ -64,7 +68,7 @@ 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 resource_pool.o $(INPUTS:=.o) $(EFFECTS:=.o)
 
 # Default target:
-all: libmovit.a $(TESTS)
+all: libmovit.la $(TESTS)
 
 ifeq ($(with_demo_app),yes)
 all: demo
@@ -79,20 +83,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 $<
 
@@ -100,8 +105,9 @@ 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
@@ -136,8 +142,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/