X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=559c5b8d5f28ae7a4b7ded458548fef8bb566de6;hb=c037f2f1ba3a2d3114575323550f456e66695edf;hp=3d930d450c10933d58a68c3e7d553b3ce0c08673;hpb=5dba808064e7879c04d3e2fb4f10e709bedf51c2;p=ffmpeg diff --git a/Makefile b/Makefile index 3d930d450c1..559c5b8d5f2 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,9 @@ EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examp SKIPHEADERS = cmdutils_common_opts.h \ compat/w32pthreads.h +# first so "all" becomes default target +all: all-yes + include $(SRC_PATH)/tools/Makefile include $(SRC_PATH)/common.mak @@ -74,6 +77,10 @@ all: $(AVPROGS) $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) +tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) +tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) +tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) + CONFIGURABLE_COMPONENTS = \ $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/version.h)) \ @@ -116,7 +123,7 @@ OBJS-$(1) += $(1).o $(OBJS-$(1)-yes) $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) $$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) $(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) -$(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1)) +$(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1)) -include $$(OBJS-$(1):.o=.d) endef