X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=21f415a5d0924f7e7a0a39a9b54e3b7a8c9a5742;hp=ec5919d8b04f448dcd057c36369c2de9c1d32171;hb=95edbfccb0843da3cc105dadc5bc6d8e102f6071;hpb=edb0700c0a8ea225ce9add1cb4f70d42af6de381 diff --git a/Makefile.in b/Makefile.in index ec5919d..21f415a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,25 +1,45 @@ GTEST_DIR ?= /usr/src/gtest +# This will be upgraded for each release, although not necessarily for every git commit. +# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +# for the rules as of how this is changed. This does not really mean that Movit will +# strive towards having a rock-stable ABI, but at least the soversion will increase +# whenever it breaks, so that you will not have silent failures, and distribution package +# management can run its course. +movit_ltversion = 2:2:0 +movit_version = 1.1.2 + prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = @includedir@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ +top_builddir = @top_builddir@ with_demo_app = @with_demo_app@ +with_SDL2 = @with_SDL2@ +with_coverage = @with_coverage@ 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@ +CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ +ifeq ($(with_SDL2),yes) +CXXFLAGS += -DHAVE_SDL2 +endif +LDFLAGS=@LDFLAGS@ +LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread +TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread +DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@ +SHELL=@SHELL@ +LIBTOOL=@LIBTOOL@ --tag=CXX RANLIB=ranlib INSTALL=install MKDIR=mkdir -ifeq ($(COVERAGE),1) -CXXFLAGS += -fprofile-arcs -ftest-coverage +ifeq ($(with_coverage),yes) +CXXFLAGS += -fprofile-arcs -ftest-coverage --coverage LDFLAGS += -fprofile-arcs -ftest-coverage +LDLIBS += -lgcov endif DEMO_OBJS=demo.o @@ -49,29 +69,36 @@ 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 +TESTED_EFFECTS += slice_effect +TESTED_EFFECTS += complex_modulate_effect +TESTED_EFFECTS += luma_mix_effect +TESTED_EFFECTS += fft_convolution_effect UNTESTED_EFFECTS = sandbox_effect UNTESTED_EFFECTS += mirror_effect UNTESTED_EFFECTS += resize_effect -UNTESTED_EFFECTS += vignette_effect UNTESTED_EFFECTS += multiply_effect +UNTESTED_EFFECTS += fft_input EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS) # Unit tests. -TESTS=effect_chain_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test) +TESTS=effect_chain_test fp16_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) +LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.o fp16.o $(INPUTS:=.o) $(EFFECTS:=.o) # Default target: -all: libmovit.a $(TESTS) +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 +OWN_TEST_OBJS = gtest_sdl_main.o test_util.o +TEST_OBJS = gtest-all.o $(OWN_TEST_OBJS) gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ @@ -79,29 +106,34 @@ 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 $@ $^ $(TEST_LDLIBS) +OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o) 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) -version-info $(movit_ltversion) -o $@ $^ $(LDLIBS) +%.lo: %.cpp + $(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $< + [ ! -r $(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < $(@:.lo=.d) > $(@:.lo=.ld) + [ ! -r .libs/$(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < .libs/$(@:.lo=.d) > .libs/$(@:.lo=.ld) %.o: %.cpp $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $< -DEPS=$(OBJS:.o=.d) +DEPS=$(OBJS:.o=.d) $(OBJS:.o=.ld) -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 @@ -116,17 +148,25 @@ check: $(TESTS) exit 1; \ fi -# You need to build with COVERAGE=1 to use this target. +ifeq ($(with_coverage),yes) 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 +else +coverage: + @echo You need to compile with --enable-coverage to use this target. + @exit 1 +endif -HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h +HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h fp16.h HDRS += $(INPUTS:=.h) HDRS += $(EFFECTS:=.h) -SHADERS = vs.vert header.frag footer.frag +SHADERS = vs.vert vs.130.vert vs.300es.vert +SHADERS += header.frag header.130.frag header.300es.frag +SHADERS += footer.frag footer.130.frag footer.300es.frag +SHADERS += texture1d.frag texture1d.130.frag texture1d.300es.frag SHADERS += $(INPUTS:=.frag) SHADERS += $(EFFECTS:=.frag) SHADERS += highlight_cutoff_effect.frag @@ -134,15 +174,30 @@ SHADERS += overlay_matte_effect.frag # These purposefully do not exist. MISSING_SHADERS = diffusion_effect.frag glow_effect.frag unsharp_mask_effect.frag resize_effect.frag +MISSING_SHADERS += fft_convolution_effect.frag fft_input.frag SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS)) -install: libmovit.a - $(INSTALL) -m 0644 libmovit.a $(libdir)/ - $(MKDIR) -p $(includedir)/movit/ - $(INSTALL) -m 0644 $(HDRS) $(includedir)/movit/ - $(MKDIR) -p $(datadir)/movit/ - $(INSTALL) -m 0644 $(SHADERS) $(datadir)/movit/ - $(MKDIR) -p $(libdir)/pkgconfig/ - $(INSTALL) -m 644 movit.pc $(libdir)/pkgconfig/ - -.PHONY: coverage clean distclean check all install +install: libmovit.la + $(MKDIR) -p $(DESTDIR)$(libdir)/ + $(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(DESTDIR)$(libdir)/ + $(MKDIR) -p $(DESTDIR)$(includedir)/movit/ + $(INSTALL) -m 0644 $(HDRS) $(DESTDIR)$(includedir)/movit/ + $(MKDIR) -p $(DESTDIR)$(datadir)/movit/ + $(INSTALL) -m 0644 $(SHADERS) $(DESTDIR)$(datadir)/movit/ + $(MKDIR) -p $(DESTDIR)$(libdir)/pkgconfig/ + $(INSTALL) -m 644 movit.pc $(DESTDIR)$(libdir)/pkgconfig/ + +DISTDIR=movit-$(movit_version) +OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README NEWS test_util.h widgets.h + +dist: + $(MKDIR) $(DISTDIR) + cp $(OWN_OBJS:.o=.cpp) $(DISTDIR)/ + cp $(HDRS) $(DISTDIR)/ + cp $(SHADERS) $(DISTDIR)/ + cp $(OTHER_DIST_FILES) $(DISTDIR)/ + ( cd $(DISTDIR) && aclocal && libtoolize --install --copy && autoconf && $(RM) -r autom4te.cache/ ) + tar zcvvf ../$(DISTDIR).tar.gz $(DISTDIR) + $(RM) -r $(DISTDIR) + +.PHONY: coverage clean distclean check all install dist