* modules/demux/ogg.c: we now correctly handle multiple vorbis logical streams

[vlc] / Makefile.dep

diff --git a/Makefile.dep b/Makefile.dep
index ca2c1db6d90f515402e4fac84d830c04029183e3..de071516deec0ca057c454b62d16f641c15b1689 100644 (file)
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -45,19 +45,29 @@ default:
 
 -include $(MAKECMDGOALS)
 
+CFLAGS += -DMAKE_DEP
+
 $(C_DEP): .dep/%.d: %.c
-       @test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*)
-       @echo "regenerating dependencies for $*.c"
-       @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
+       @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*)
+       @echo "make[$(MAKELEVEL)]: Generating dependencies for \`$*.c'"
+       @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \
        | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
        .dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
        [ -s $@ ] || rm -f $@'
 
 $(CPP_DEP): .dep/%.dpp: %.cpp
-       @test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*)
-       @echo "regenerating dependencies for $*.c"
-       @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \
+       @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*)
+       @echo "make[$(MAKELEVEL)]: Generating dependencies for \`$*.cpp'"
+       @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \
        | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
        .dep\/$(subst /,\/,$*).dpp : /g'\'' > $@; \
        [ -s $@ ] || rm -f $@'
 
+$(M_DEP): .dep/%.dm: %.m
+       @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*)
+       @echo "make[$(MAKELEVEL)]: Generating dependencies for \`$*.m'"
+       @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \
+       | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
+       .dep\/$(subst /,\/,$*).dm : /g'\'' > $@; \
+       [ -s $@ ] || rm -f $@'
+