[FFmpeg-cvslog] build: rearrange some lines in a more logical way
Mans Rullgard
git at videolan.org
Tue Jun 7 03:49:12 CEST 2011
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Jun 6 19:57:10 2011 +0100| [d93d7349ceb963150100d3c1b8649d234e396616] | committer: Mans Rullgard
build: rearrange some lines in a more logical way
Signed-off-by: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d93d7349ceb963150100d3c1b8649d234e396616
---
Makefile | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 708f5e5..f745a93 100644
--- a/Makefile
+++ b/Makefile
@@ -74,12 +74,15 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
+ffplay.o: CFLAGS += $(SDL_CFLAGS)
ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
%$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
$(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
+alltools: $(TOOLS)
+
tools/%$(EXESUF): tools/%.o
$(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
@@ -89,8 +92,6 @@ tools/%.o: tools/%.c
-include $(wildcard tools/*.d)
-include $(wildcard tests/*.d)
-ffplay.o: CFLAGS += $(SDL_CFLAGS)
-
VERSION_SH = $(SRC_PATH_BARE)/version.sh
GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
@@ -104,8 +105,6 @@ version.h .version:
# force version.sh to run whenever version might have changed
-include .version
-alltools: $(TOOLS)
-
DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html) $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
documentation: $(DOCS)
More information about the ffmpeg-cvslog
mailing list