Merge branch 'master' into epoxy

diff --git a/Makefile.in b/Makefile.in
index 3a2461f41edf6a55d0d106aed69767b5a3a79b37..cefbf7853da65a10b08d21da7b45c8aa388bd7b8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,7 +107,8 @@ 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)
+       [ ! -r $(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < $(@:.lo=.d) > $(@:.lo=.ld)
+       [ ! -r .libs/$(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < .libs/$(@:.lo=.d) > .libs/$(@:.lo=.ld)
 %.o: %.cpp
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 
@@ -143,7 +144,7 @@ coverage:
        @exit 1
 endif
 
-HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h
+HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h fp16.h
 HDRS += $(INPUTS:=.h)
 HDRS += $(EFFECTS:=.h)
 
@@ -152,6 +153,7 @@ SHADERS += $(INPUTS:=.frag)
 SHADERS += $(EFFECTS:=.frag)
 SHADERS += highlight_cutoff_effect.frag
 SHADERS += overlay_matte_effect.frag
+SHADERS += texture1d.frag
 
 # These purposefully do not exist.
 MISSING_SHADERS = diffusion_effect.frag glow_effect.frag unsharp_mask_effect.frag resize_effect.frag