Signed-off-by: Mans Rullgard <[email protected]>
---
Makefile | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 40a3dc8..766f773 100644
--- a/Makefile
+++ b/Makefile
@@ -105,12 +105,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)
@@ -119,8 +122,6 @@ tools/%.o: tools/%.c
-include $(wildcard tools/*.d)
-ffplay.o: CFLAGS += $(SDL_CFLAGS)
-
VERSION_SH = $(SRC_PATH_BARE)/version.sh
GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
@@ -134,8 +135,6 @@ version.h .version:
# force version.sh to run whenever version might have changed
-include .version
-alltools: $(TOOLS)
-
ifdef PROGS
install: install-progs install-data
endif
--
1.7.5.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
