mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
build: generalise rules and variable settings for av* programs
This simplifies adding extra flags for individual programs and also allows more than one object file per program. Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
parent
859a579e9b
commit
baac24e680
17
Makefile
17
Makefile
@ -59,7 +59,7 @@ PROGS-$(CONFIG_AVPROBE) += avprobe
|
||||
PROGS-$(CONFIG_AVSERVER) += avserver
|
||||
|
||||
PROGS := $(PROGS-yes:%=%$(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
|
||||
@ -121,12 +121,19 @@ endef
|
||||
|
||||
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
|
||||
|
||||
avplay.o: CFLAGS += $(SDL_CFLAGS)
|
||||
avplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
|
||||
avserver$(EXESUF): LDFLAGS += $(AVSERVERLDFLAGS)
|
||||
define DOPROG
|
||||
OBJS-$(1) += $(1).o
|
||||
$(1)$(EXESUF): $(OBJS-$(1))
|
||||
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
|
||||
$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
|
||||
$(1)$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1))
|
||||
-include $$(OBJS-$(1):.o=.d)
|
||||
endef
|
||||
|
||||
$(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
|
||||
|
||||
$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
|
||||
$(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
|
||||
$(LD) $(LDFLAGS) -o $@ $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS)
|
||||
|
||||
OBJDIRS += tools
|
||||
|
||||
|
6
configure
vendored
6
configure
vendored
@ -3442,7 +3442,7 @@ CC_O=$CC_O
|
||||
LD_O=$LD_O
|
||||
DLLTOOL=$dlltool
|
||||
LDFLAGS=$LDFLAGS
|
||||
AVSERVERLDFLAGS=$AVSERVERLDFLAGS
|
||||
LDFLAGS-avserver=$AVSERVERLDFLAGS
|
||||
SHFLAGS=$SHFLAGS
|
||||
YASMFLAGS=$YASMFLAGS
|
||||
BUILDSUF=$build_suffix
|
||||
@ -3474,8 +3474,8 @@ HOSTCC_C=$HOSTCC_C
|
||||
HOSTCC_O=$HOSTCC_O
|
||||
TARGET_EXEC=$target_exec
|
||||
TARGET_PATH=$target_path
|
||||
SDL_LIBS=$sdl_libs
|
||||
SDL_CFLAGS=$sdl_cflags
|
||||
LIBS-avplay=$sdl_libs
|
||||
CFLAGS-avplay=$sdl_cflags
|
||||
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
|
||||
EXTRALIBS=$extralibs
|
||||
INSTALL=install
|
||||
|
Loading…
Reference in New Issue
Block a user