From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 22 Jan 2014 00:59:10 +0000 (+0100)
Subject: Use the libtool autoconf macros.
X-Git-Tag: 1.0~66
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=22e75c9ef1c2ae2b2eb793e7e11105840c1058b0

Use the libtool autoconf macros.
---

diff --git a/Makefile.in b/Makefile.in
index abc2e82..c4503f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,7 @@ includedir = @includedir@
 libdir = @libdir@
 datarootdir = @datarootdir@
 datadir = @datadir@
+top_builddir = @top_builddir@
 with_demo_app = @with_demo_app@
 
 CC=@CC@
@@ -13,6 +14,7 @@ CXX=@CXX@
 CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
 LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
 DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
+LIBTOOL=@LIBTOOL@
 RANLIB=ranlib
 INSTALL=install
 MKDIR=mkdir
@@ -81,26 +83,26 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
 
 # Unit tests.
 $(TESTS): %: %.o $(TEST_OBJS) libmovit.la
-	libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
+	$(LIBTOOL) --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
 
 OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 # A small demo program.
 demo: libmovit.la $(DEMO_OBJS)
-	libtool --mode=link $(CXX) -o demo $(DEMO_OBJS) libmovit.la $(LDFLAGS) $(DEMO_LDFLAGS)
+	$(LIBTOOL) --mode=link $(CXX) -o demo $(DEMO_OBJS) libmovit.la $(LDFLAGS) $(DEMO_LDFLAGS)
 
 # The library itself.
 libmovit.la: $(LIB_OBJS)
-	libtool --mode=link $(CXX) -rpath $(libdir) -o $@ $(LIB_OBJS:.o=.lo)
+	$(LIBTOOL) --mode=link $(CXX) -rpath $(libdir) -o $@ $(LIB_OBJS:.o=.lo)
 
 %.o: %.cpp
-	libtool --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+	$(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 
 DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
 
 clean:
-	libtool --mode=clean $(RM) demo $(TESTS) libmovit.la $(OBJS:.o=.lo)
+	$(LIBTOOL) --mode=clean $(RM) demo $(TESTS) libmovit.la $(OBJS:.o=.lo)
 	$(RM) $(OBJS:.o=.gcno) $(OBJS:.o=.gcda) $(DEPS) step*.dot chain*.frag
 	$(RM) -r movit.info coverage/ .libs/
 
@@ -138,7 +140,7 @@ MISSING_SHADERS = diffusion_effect.frag glow_effect.frag unsharp_mask_effect.fra
 SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS))
 
 install: libmovit.la
-	libtool --mode=install $(INSTALL) -m 0644 libmovit.la $(libdir)/
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(libdir)/
 	$(MKDIR) -p $(includedir)/movit/
 	$(INSTALL) -m 0644 $(HDRS) $(includedir)/movit/
 	$(MKDIR) -p $(datadir)/movit/
diff --git a/autogen.sh b/autogen.sh
index 9391cf4..cd39dc6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,5 @@
 #! /bin/sh
 aclocal
+libtoolize --install --copy
 autoconf
 ./configure "$@"
diff --git a/configure.ac b/configure.ac
index d21b85a..7515e6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,6 @@
+AC_CONFIG_MACRO_DIR([m4])
 AC_INIT(movit, git)
+LT_INIT
 
 AC_CONFIG_SRCDIR(effect.cpp)