mirror of https://git.ffmpeg.org/ffmpeg.git
cosmetics: Move around some rules and variable declarations.
This is in preparation for common.mak inclusion in the main Makefile. Originally committed as revision 12596 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
92e791ff37
commit
2721715985
20
Makefile
20
Makefile
|
@ -22,6 +22,7 @@ PROGS-$(CONFIG_FFSERVER) += ffserver
|
||||||
|
|
||||||
PROGS = $(addsuffix $(EXESUF), $(PROGS-yes))
|
PROGS = $(addsuffix $(EXESUF), $(PROGS-yes))
|
||||||
PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes))
|
PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes))
|
||||||
|
SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
|
||||||
MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
|
MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
|
||||||
|
|
||||||
BASENAMES = ffmpeg ffplay ffserver
|
BASENAMES = ffmpeg ffplay ffserver
|
||||||
|
@ -44,6 +45,15 @@ INSTALL_TARGETS-yes += install-progs
|
||||||
INSTALL_TARGETS-$(BUILD_DOC) += install-man
|
INSTALL_TARGETS-$(BUILD_DOC) += install-man
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
main: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
|
||||||
|
|
||||||
|
%$(EXESUF): %_g$(EXESUF)
|
||||||
|
cp -p $< $@
|
||||||
|
$(STRIP) $@
|
||||||
|
|
||||||
|
vhook/%.o: vhook/%.c
|
||||||
|
$(CC) $(VHOOKCFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
|
VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
|
||||||
|
|
||||||
BASEHOOKS = fish null watermark
|
BASEHOOKS = fish null watermark
|
||||||
|
@ -64,7 +74,6 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
|
||||||
|
|
||||||
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
|
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
|
||||||
|
|
||||||
SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
|
|
||||||
LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
|
LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
|
||||||
EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
|
EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
|
||||||
|
|
||||||
|
@ -81,8 +90,6 @@ endif
|
||||||
MAKE-yes = $(MAKE)
|
MAKE-yes = $(MAKE)
|
||||||
MAKE- = : $(MAKE)
|
MAKE- = : $(MAKE)
|
||||||
|
|
||||||
main: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
|
|
||||||
|
|
||||||
lib:
|
lib:
|
||||||
$(MAKE) -C libavutil all
|
$(MAKE) -C libavutil all
|
||||||
$(MAKE) -C libavcodec all
|
$(MAKE) -C libavcodec all
|
||||||
|
@ -98,10 +105,6 @@ ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
|
||||||
%_g$(EXESUF): %.o cmdutils.o .libs
|
%_g$(EXESUF): %.o cmdutils.o .libs
|
||||||
$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
|
$(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
|
||||||
|
|
||||||
%$(EXESUF): %_g$(EXESUF)
|
|
||||||
cp -p $< $@
|
|
||||||
$(STRIP) $@
|
|
||||||
|
|
||||||
SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
|
SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
|
||||||
ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
|
ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
|
||||||
version.h: $(SVN_ENTRIES)
|
version.h: $(SVN_ENTRIES)
|
||||||
|
@ -126,9 +129,6 @@ videohook: .libs $(HOOKS)
|
||||||
vhook/%$(SLIBSUF): vhook/%.o
|
vhook/%$(SLIBSUF): vhook/%.o
|
||||||
$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
|
$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
|
||||||
|
|
||||||
vhook/%.o: vhook/%.c
|
|
||||||
$(CC) $(VHOOKCFLAGS) -c -o $@ $<
|
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) $(CFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue