aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-06-06 19:57:10 +0100
committerMans Rullgard <mans@mansr.com>2011-06-06 23:21:12 +0100
commitd93d7349ceb963150100d3c1b8649d234e396616 (patch)
treef84d2401bf33643ba01acce4794b12cc65ee4317 /Makefile
parent4f8da7e7dc9244342da6c97ca489a8e6f712f3b4 (diff)
downloadffmpeg-d93d7349ceb963150100d3c1b8649d234e396616.tar.gz
build: rearrange some lines in a more logical way
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 708f5e5134..f745a939bc 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)