X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.in;h=1e3be0da5f5f95b5c057ac64be96276a8ca1daf5;hb=HEAD;hp=1d874e991f64bf790450a768d08f9eb96dd18301;hpb=9a436a9406d5eb7fb01ada465a84034343e0c398;p=movit

diff --git a/Makefile.in b/Makefile.in
index 1d874e9..1e3be0d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,15 +6,14 @@ 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 = 8:3:0
-movit_version = 1.6.3
+movit_ltversion = 8:5:0
+movit_version = 1.7.1
 
 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_benchmark = @with_benchmark@
@@ -112,8 +111,8 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
 $(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)
+OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o) make_bundled_shaders.o
+OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o) make_bundled_shaders.o
 
 # A small demo program.
 demo: libmovit.la $(DEMO_OBJS)
@@ -193,18 +192,17 @@ install: libmovit.la
 	$(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 downscale2x.frag downscale2x.comp mirror.comp identity.comp 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 downscale2x.frag downscale2x.comp mirror.comp identity.comp movit.pc.in README NEWS test_util.h widgets.h bundled_shaders.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)