X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=5d0cb8ad3a98e3927f9c8e8b5768ab43f6f2267a;hp=6010a73671118ecb37a9957335aaf985796f73b0;hb=ca67cec61c932c07d6504cb54bbd5e2343365397;hpb=14d06ca86d428e95becfb6bbc8af467d060148b3 diff --git a/Makefile.in b/Makefile.in index 6010a73..5d0cb8a 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:2:0 +movit_version = 1.0.2 prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -22,7 +22,8 @@ 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=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread +TEST_LDLIBS=@SDL_LIBS@ DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@ SHELL=@SHELL@ LIBTOOL=@LIBTOOL@ --tag=CXX @@ -101,7 +102,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 $@ $^ $(LDLIBS) $(TEST_LDLIBS) OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o) OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o) @@ -170,6 +171,7 @@ MISSING_SHADERS += fft_convolution_effect.frag fft_input.frag SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS)) 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/