Merge branch 'master' into epoxy

diff --combined Makefile.in
index ea764650fe938a790f24ca18069cdebb5e30cae2,f531c3bf9d57f19c6cf2a89619fe706a785953f0..13fbadcb29573afe59af09f68abb943a06050488
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -8,16 -8,12 +8,16 @@@ datarootdir = @datarootdir
  datadir = @datadir@
  top_builddir = @top_builddir@
  with_demo_app = @with_demo_app@
 +with_SDL2 = @with_SDL2@
  
  CC=@CC@
  CXX=@CXX@
 -CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
 -LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
 -DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
 +CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@
 +ifeq ($(with_SDL2),yes)
 +CXXFLAGS += -DHAVE_SDL2
 +endif
 +LDFLAGS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
 +DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
  SHELL=@SHELL@
  LIBTOOL=@LIBTOOL@ --tag=CXX
  RANLIB=ranlib
@@@ -105,10 -101,11 +105,11 @@@ libmovit.la: $(LIB_OBJS:.o=.lo
  
  %.lo: %.cpp
        $(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+       sed 's/\.o:/\.lo:/' < $(@:.lo=.d) > $(@:.lo=.ld)
  %.o: %.cpp
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
  
- DEPS=$(OBJS:.o=.d)
+ DEPS=$(OBJS:.o=.d) $(OBJS:.o=.ld)
  -include $(DEPS)
  
  clean: