X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=eb40ff329b13faa16b0ed737de5e19e905f26ebc;hb=abbae514e18bde2c24f9182cb1eb091dc2801331;hp=4caa076d58f12b5476eb1379ab99ddb6fe990f29;hpb=82e8566a02d1f69de792e4937662c15ceaafc735;p=ffmpeg diff --git a/Makefile b/Makefile index 4caa076d58f..eb40ff329b1 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,6 @@ include config.mak SRC_DIR = $(SRC_PATH_BARE) -vpath %.c $(SRC_PATH_BARE) -vpath %.h $(SRC_PATH_BARE) vpath %.texi $(SRC_PATH_BARE) PROGS-$(CONFIG_FFMPEG) += ffmpeg @@ -16,7 +14,7 @@ PROGS-$(CONFIG_FFSERVER) += ffserver PROGS = $(addsuffix $(EXESUF), $(PROGS-yes)) PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes)) -PROGS_SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c +OBJS = $(addsuffix .o, $(PROGS-yes)) cmdutils.o MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes))) BASENAMES = ffmpeg ffplay ffserver @@ -24,14 +22,17 @@ ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES)) ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) -LIBS-$(CONFIG_AVFILTER) += avfilter -LIBS-$(CONFIG_POSTPROC) += postproc -LIBS-$(CONFIG_SWSCALE) += swscale +FFLIBS-$(CONFIG_AVFILTER) += avfilter +FFLIBS-$(CONFIG_POSTPROC) += postproc +FFLIBS-$(CONFIG_SWSCALE) += swscale -LIBS := avcodec avdevice avformat avutil $(LIBS-yes) +FFLIBS := avdevice avformat avcodec avutil -S := $(BUILD_SHARED:yes=S) -DEP_LIBS := $(foreach L,$(LIBS),lib$(L)/$($(S)LIBPREF)$(L)$($(S)LIBSUF)) +include common.mak + +FF_LDFLAGS := $(FFLDFLAGS) +FF_EXTRALIBS := $(FFEXTRALIBS) +FF_DEP_LIBS := $(DEP_LIBS) ALL_TARGETS-$(CONFIG_VHOOK) += videohook ALL_TARGETS-$(BUILD_DOC) += documentation @@ -43,18 +44,48 @@ INSTALL_TARGETS-$(BUILD_DOC) += install-man endif INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs -main: lib $(PROGS) $(ALL_TARGETS-yes) +all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes) $(PROGS): %$(EXESUF): %_g$(EXESUF) cp -p $< $@ $(STRIP) $@ -.depend: version.h $(PROGS_SRCS) +SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES DIRS TESTS -# bandaid to disable triggering shared library installation routines -DISABLE=yes +define RESET +$(1) := +$(1)-yes := +endef -include common.mak +define DOSUBDIR +$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) +SUBDIR := $(1)/ +include $(1)/Makefile +endef + +$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) + +ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) +ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) + +%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) + $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) + +SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries +ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES)) +version.h: $(SVN_ENTRIES) +endif + +version.h: + $(SRC_PATH)/version.sh $(SRC_PATH) + +output_example$(EXESUF): output_example.o $(FF_DEP_LIBS) + $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + +tools/%$(EXESUF): tools/%.c + $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + +ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS) VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS)) @@ -76,58 +107,18 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` VHOOKCFLAGS += $(VHOOKCFLAGS-yes) -vhook/%.o: CFLAGS:=$(VHOOKCFLAGS) - -LDFLAGS-$(CONFIG_SWSCALE) += -L$(BUILD_ROOT)/libswscale -LDFLAGS-$(CONFIG_AVFILTER) += -L$(BUILD_ROOT)/libavfilter -LDFLAGS := $(LDFLAGS-yes) -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil -g $(LDFLAGS) - -EXTRALIBS-$(CONFIG_AVFILTER) += -lavfilter$(BUILDSUF) -EXTRALIBS-$(CONFIG_SWSCALE) += -lswscale$(BUILDSUF) -EXTRALIBS := $(EXTRALIBS-yes) -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS) - -MAKE-yes = $(MAKE) -MAKE- = : $(MAKE) - -lib: - $(MAKE) -C libavutil all - $(MAKE) -C libavcodec all - $(MAKE) -C libavformat all - $(MAKE) -C libavdevice all - $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc all - $(MAKE-$(CONFIG_SWSCALE)) -C libswscale all - $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all - -ffplay_g$(EXESUF): EXTRALIBS += $(SDL_LIBS) -ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) - -%_g$(EXESUF): %.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS) - -SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries -ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES)) -version.h: $(SVN_ENTRIES) -endif - -version.h: - $(SRC_PATH)/version.sh $(SRC_PATH) - -output_example$(EXESUF): output_example.o .libs - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS) - -tools/%$(EXESUF): tools/%.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS) - -ffplay.o .depend: CFLAGS += $(SDL_CFLAGS) - -ffmpeg.o ffplay.o ffserver.o: version.h +vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS) # vhooks compile fine without libav*, but need them nonetheless. -videohook: .libs $(HOOKS) +videohook: $(FF_DEP_LIBS) $(HOOKS) +$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS)) vhook/%$(SLIBSUF): vhook/%.o $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F)) +VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d) +depend dep: $(VHOOK_DEPS) + documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \ ffplay-doc.html general.html hooks.html \ $(ALLMANPAGES)) @@ -148,7 +139,7 @@ install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) install -d "$(BINDIR)" install -c -m 755 $(PROGS) "$(BINDIR)" -install-man: +install-man: $(MANPAGES) install -d "$(MANDIR)/man1" install -m 644 $(MANPAGES) "$(MANDIR)/man1" @@ -156,24 +147,6 @@ install-vhook: videohook install -d "$(SHLIBDIR)/vhook" install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook" -install-libs: - $(MAKE) -C libavutil install-libs - $(MAKE) -C libavcodec install-libs - $(MAKE) -C libavformat install-libs - $(MAKE) -C libavdevice install-libs - $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-libs - $(MAKE-$(CONFIG_SWSCALE)) -C libswscale install-libs - $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-libs - -install-headers:: - $(MAKE) -C libavutil install-headers - $(MAKE) -C libavcodec install-headers - $(MAKE) -C libavformat install-headers - $(MAKE) -C libavdevice install-headers - $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-headers - $(MAKE) -C libswscale install-headers - $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-headers - uninstall: uninstall-progs uninstall-man uninstall-vhook uninstall-progs: @@ -186,51 +159,8 @@ uninstall-vhook: rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF))) -rmdir "$(SHLIBDIR)/vhook/" -uninstall-libs:: - $(MAKE) -C libavutil uninstall-libs - $(MAKE) -C libavcodec uninstall-libs - $(MAKE) -C libavformat uninstall-libs - $(MAKE) -C libavdevice uninstall-libs - $(MAKE) -C libpostproc uninstall-libs - $(MAKE) -C libswscale uninstall-libs - $(MAKE) -C libavfilter uninstall-libs - -uninstall-headers:: - $(MAKE) -C libavutil uninstall-headers - $(MAKE) -C libavcodec uninstall-headers - $(MAKE) -C libavformat uninstall-headers - $(MAKE) -C libavdevice uninstall-headers - $(MAKE) -C libpostproc uninstall-headers - $(MAKE) -C libswscale uninstall-headers - $(MAKE) -C libavfilter uninstall-headers - -rmdir "$(INCDIR)" - -depend dep: .vhookdep - $(MAKE) -C libavutil depend - $(MAKE) -C libavcodec depend - $(MAKE) -C libavformat depend - $(MAKE) -C libavdevice depend - $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc depend - $(MAKE-$(CONFIG_SWSCALE)) -C libswscale depend - $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend - -.vhookdep: $(ALLHOOKS_SRCS) version.h - $(VHOOK_DEPEND_CMD) > $@ - -$(DEP_LIBS): lib - -.libs: $(DEP_LIBS) - touch $@ - clean:: - $(MAKE) -C libavutil clean - $(MAKE) -C libavcodec clean - $(MAKE) -C libavformat clean - $(MAKE) -C libavdevice clean - $(MAKE) -C libpostproc clean - $(MAKE) -C libswscale clean - $(MAKE) -C libavfilter clean - rm -f .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \ + rm -f gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \ output_example$(EXESUF) rm -f doc/*.html doc/*.pod doc/*.1 rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~ @@ -239,14 +169,7 @@ clean:: rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll distclean:: - $(MAKE) -C libavutil distclean - $(MAKE) -C libavcodec distclean - $(MAKE) -C libavformat distclean - $(MAKE) -C libavdevice distclean - $(MAKE) -C libpostproc distclean - $(MAKE) -C libswscale distclean - $(MAKE) -C libavfilter distclean - rm -f .vhookdep version.h config.* *.pc + rm -f version.h config.* *.pc vhook/*.d # regression tests @@ -412,14 +335,14 @@ tests/asynth1.sw: tests/audiogen$(EXESUF) $(BUILD_ROOT)/$< $@ %$(EXESUF): %.c - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< + $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< -tests/seek_test$(EXESUF): tests/seek_test.c .libs - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS) +tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS) + $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS) .PHONY: lib videohook documentation TAGS .PHONY: codectest libavtest seektest test-server fulltest test .PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error --include .vhookdep +-include $(VHOOK_DEPS)