X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=445f5b7dd96c858f21ca81494d5706cc141fa77d;hp=fa2556964eed1de541ef16e30a2038244a95a215;hb=131e7179b596f8268fd80c32312849da83581e55;hpb=9499a20d6c4c017ecfa96d0d32f5ee971ae93461 diff --git a/Makefile.in b/Makefile.in index fa25569..445f5b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,8 +6,8 @@ GTEST_DIR ?= /usr/src/gtest # 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 = 1:1:0 -movit_version = 1.0.1 +movit_ltversion = 1:3:0 +movit_version = 1.0.3 prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -22,7 +22,9 @@ with_coverage = @with_coverage@ CC=@CC@ CXX=@CXX@ CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@ -LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ @FFTW3_LIBS@ -lpthread +LDFLAGS=@LDFLAGS@ +LDLIBS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread +TEST_LDLIBS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@ SHELL=@SHELL@ LIBTOOL=@LIBTOOL@ --tag=CXX @@ -101,7 +103,7 @@ gtest_sdl_main.o: gtest_sdl_main.cpp # Unit tests. $(TESTS): %: %.o $(TEST_OBJS) libmovit.la - $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + $(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) @@ -180,7 +182,7 @@ install: libmovit.la $(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 effectlist.txt identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README NEWS test_util.h widgets.h +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)