X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=445f5b7dd96c858f21ca81494d5706cc141fa77d;hp=76929cdb1f0ca12a297b1c2a658239902c3e37bf;hb=131e7179b596f8268fd80c32312849da83581e55;hpb=240cced0e8e7f24385a702631c253971862281fe

diff --git a/Makefile.in b/Makefile.in
index 76929cd..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:0:0
-movit_version = 1.0
+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)
@@ -112,7 +114,7 @@ demo: libmovit.la $(DEMO_OBJS)
 
 # The library itself.
 libmovit.la: $(LIB_OBJS:.o=.lo)
-	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -version-info $(movit_ltversion) -o $@ $^ $(LDLIBS)
+	$(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 $<
@@ -170,16 +172,17 @@ MISSING_SHADERS += fft_convolution_effect.frag fft_input.frag
 SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS))
 
 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/
-	$(INSTALL) -m 0644 $(SHADERS) $(datadir)/movit/
-	$(MKDIR) -p $(libdir)/pkgconfig/
-	$(INSTALL) -m 644 movit.pc $(libdir)/pkgconfig/
+	$(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 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)