diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:14:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:22:37 +0200 |
| commit | 7ae473e8a04f686bbeda75c40167c2df4211e662 (patch) | |
| tree | 073415316c09d2c86fcd41640f0bab7fddc8c4ed /Makefile | |
| parent | a80ce390df38b30f70012c9ce059129516664805 (diff) | |
| parent | cf22705e87b6f5015b5cbbf60b6ce9b818eb1900 (diff) | |
| download | ffmpeg-7ae473e8a04f686bbeda75c40167c2df4211e662.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -17,7 +17,7 @@ PROGS-$(CONFIG_FFSERVER) += ffserver PROGS := $(PROGS-yes:%=%$(EXESUF)) INSTPROGS = $(PROGS-yes:%=%$(PROGSSUF)$(EXESUF)) -OBJS = $(PROGS-yes:%=%.o) cmdutils.o +OBJS = cmdutils.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher @@ -88,12 +88,19 @@ endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) -ffplay.o: CFLAGS += $(SDL_CFLAGS) -ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) -ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) +define DOPROG +OBJS-$(1) += $(1).o +$(1)_g$(EXESUF): $(OBJS-$(1)) +$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) +$(1)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) +$(1)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1)) +-include $$(OBJS-$(1):.o=.d) +endef + +$(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P)))) %$(PROGSSUF)_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) + $(LD) $(LDFLAGS) -o $@ $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS) OBJDIRS += tools |