Module: libav Branch: master Commit: d93d7349ceb963150100d3c1b8649d234e396616
Author: Mans Rullgard <[email protected]> Committer: Mans Rullgard <[email protected]> Date: Mon Jun 6 19:57:10 2011 +0100 build: rearrange some lines in a more logical way Signed-off-by: Mans Rullgard <[email protected]> --- 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) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
