Revision caec74dd Makefile

View differences:

Makefile
14 14

  
15 15
PROGS       = $(addsuffix   $(EXESUF), $(PROGS-yes))
16 16
PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
17
PROGS_SRCS  = $(addsuffix .c,          $(PROGS-yes)) cmdutils.c
17
OBJS        = $(addsuffix .o,          $(PROGS-yes)) cmdutils.o
18 18
MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
19 19

  
20 20
BASENAMES   = ffmpeg ffplay ffserver
......
52 52
	cp -p $< $@
53 53
	$(STRIP) $@
54 54

  
55
.depend: version.h $(PROGS_SRCS)
56

  
57 55
SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES
58 56

  
59 57
define RESET
......
89 87
tools/%$(EXESUF): tools/%.c
90 88
	$(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
91 89

  
92
ffplay.o .depend: CFLAGS += $(SDL_CFLAGS)
93

  
94
ffmpeg.o ffplay.o ffserver.o: version.h
90
ffplay.o: CFLAGS += $(SDL_CFLAGS)
95 91

  
96 92
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
97 93

  
......
113 109

  
114 110
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
115 111

  
116
vhook/%.o: CFLAGS:=$(VHOOKCFLAGS)
112
vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS)
117 113

  
118 114
# vhooks compile fine without libav*, but need them nonetheless.
119 115
videohook: $(DEP_LIBS) $(HOOKS)
......
121 117
vhook/%$(SLIBSUF): vhook/%.o
122 118
	$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
123 119

  
124
.vhookdep: $(ALLHOOKS_SRCS) version.h
125
	$(VHOOK_DEPEND_CMD) > $@
126

  
127
depend dep: .vhookdep
120
VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d)
121
depend dep: $(VHOOK_DEPS)
128 122

  
129 123
documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \
130 124
                                 ffplay-doc.html general.html hooks.html \
......
176 170
	rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
177 171

  
178 172
distclean::
179
	rm -f .vhookdep version.h config.* *.pc
173
	rm -f version.h config.* *.pc vhook/*.d
180 174

  
181 175
# regression tests
182 176

  
......
352 346
.PHONY: codectest libavtest seektest test-server fulltest test
353 347
.PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error
354 348

  
355
-include .vhookdep
349
-include $(VHOOK_DEPS)

Also available in: Unified diff