From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 11 Mar 2014 00:38:44 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~36
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1320ed72d619610b9f056c106496dfe7dbd95e06;hp=15daf781e6ce00ec37ca806a16e490d59dcb4e24;p=movit

Merge branch 'master' into epoxy
---

diff --git a/Makefile.in b/Makefile.in
index ea76465..13fbadc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,10 +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: