diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-01 16:18:21 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-01 16:18:21 +0300 |
commit | 7de350c673e1c0ae52d655e322a072f2f6b624b0 (patch) | |
tree | 346005084450b679f57c77daad2263fcdcf9e1de /Makefile | |
parent | 28fbfd2cdea5ffa860a251de274a74b0e85c88f0 (diff) | |
parent | 3ff9a6e7d82ff9a5231e561bd2686fab7df97f68 (diff) |
Merge svn changes up to r27184
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -738,8 +738,9 @@ dep depend: $(DEPS) ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(notdir $(part)).a) -$(ALLPARTLIBS): recurse +$(ALLPARTLIBS): ffmpeg/libavutil/*.[ch] ffmpeg/libavcodec/*.[ch] ffmpeg/libavcodec/*/*.[chS] ffmpeg/libavformat/*.[ch] ffmpeg/libpostproc/*.[ch] libswscale/*.[chS] libvo/fastmemcpy.h config.h $(MAKE) -C $(@D) + touch $@ mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) @@ -1054,5 +1055,5 @@ dhahelperwinclean: -include $(DEPS) -.PHONY: all doxygen *install* recurse *tools drivers dhahelper* +.PHONY: all doxygen *install* *tools drivers dhahelper* .PHONY: checkheaders *clean dep depend tests |