X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=34f43e7945891df115141901de46b510f8282678;hb=92e791ff37d99cd62a66dbbd3fa5a56bfbae4e4b;hp=8191165ac8087884da5004b632bd144761caa7b1;hpb=f7679c54dd1de0ebb1aa4adda8863d33ff4ca5c3;p=ffmpeg diff --git a/Makefile b/Makefile index 8191165ac80..34f43e79458 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,11 @@ # include config.mak -VPATH=$(SRC_PATH_BARE) +SRC_DIR = $(SRC_PATH_BARE) + +vpath %.c $(SRC_PATH_BARE) +vpath %.h $(SRC_PATH_BARE) +vpath %.texi $(SRC_PATH_BARE) CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \ @@ -64,7 +68,7 @@ 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) EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS) -ifeq ($(CONFIG_SWSCALER),yes) +ifeq ($(CONFIG_SWSCALE),yes) LDFLAGS+=-L$(BUILD_ROOT)/libswscale EXTRALIBS+=-lswscale$(BUILDSUF) endif @@ -77,25 +81,22 @@ endif MAKE-yes = $(MAKE) MAKE- = : $(MAKE) -all: lib $(PROGS) $(ALL_TARGETS-yes) +main: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes) lib: $(MAKE) -C libavutil all $(MAKE) -C libavcodec all $(MAKE) -C libavformat all $(MAKE) -C libavdevice all - $(MAKE-$(CONFIG_PP)) -C libpostproc all - $(MAKE-$(CONFIG_SWSCALER)) -C libswscale all + $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc all + $(MAKE-$(CONFIG_SWSCALE)) -C libswscale all $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all -ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS) - -ffserver$(EXESUF): ffserver.o cmdutils.o .libs - $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o cmdutils.o $(EXTRALIBS) +ffplay_g$(EXESUF): EXTRALIBS += $(SDL_LIBS) +ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) -ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS) +%_g$(EXESUF): %.o cmdutils.o .libs + $(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS) %$(EXESUF): %_g$(EXESUF) cp -p $< $@ @@ -115,10 +116,11 @@ output_example$(EXESUF): output_example.o .libs tools/%$(EXESUF): tools/%.c $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS) -ffplay.o: CFLAGS += $(SDL_CFLAGS) +ffplay.o .depend: CFLAGS += $(SDL_CFLAGS) ffmpeg.o ffplay.o ffserver.o: version.h +# vhooks compile fine without libav*, but need them nonetheless. videohook: .libs $(HOOKS) vhook/%$(SLIBSUF): vhook/%.o @@ -153,10 +155,6 @@ install-progs: $(PROGS) install -d "$(BINDIR)" install -c -m 755 $(PROGS) "$(BINDIR)" -# Create the Windows installer. -wininstaller: all install - makensis ffinstall.nsi - install-man: install -d "$(MANDIR)/man1" install -m 644 $(MANPAGES) "$(MANDIR)/man1" @@ -170,16 +168,17 @@ install-libs: $(MAKE) -C libavcodec install-libs $(MAKE) -C libavformat install-libs $(MAKE) -C libavdevice install-libs - $(MAKE-$(CONFIG_PP)) -C libpostproc install-libs - $(MAKE-$(CONFIG_SWSCALER)) -C libswscale 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_PP)) -C libpostproc install-headers - $(MAKE) -C libswscale 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-libs uninstall-headers uninstall-man uninstall-vhook @@ -218,16 +217,15 @@ depend dep: .depend .vhookdep $(MAKE) -C libavcodec depend $(MAKE) -C libavformat depend $(MAKE) -C libavdevice depend - $(MAKE-$(CONFIG_PP)) -C libpostproc depend - $(MAKE-$(CONFIG_SWSCALER)) -C libswscale depend + $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc depend + $(MAKE-$(CONFIG_SWSCALE)) -C libswscale depend $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend .depend: $(SRCS) version.h - $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend + $(DEPEND_CMD) > $@ -# gcc stupidly only outputs the basename of targets with -MM .vhookdep: $(ALLHOOKS_SRCS) version.h - $(CC) $(VHOOKCFLAGS) -MM $^ | sed 's,^\([a-z]\),vhook/\1,' > $@ + $(VHOOK_DEPEND_CMD) > $@ $(DEP_LIBS): lib @@ -289,7 +287,6 @@ CODEC_TESTS = $(addprefix regtest-, \ rc \ mpeg4adv \ mpeg4thread \ - mp4psp \ error \ mpeg4nr \ mpeg1b \ @@ -312,6 +309,7 @@ CODEC_TESTS = $(addprefix regtest-, \ ac3 \ g726 \ adpcm_ima_wav \ + adpcm_ima_qt \ adpcm_ms \ adpcm_yam \ adpcm_swf \ @@ -406,11 +404,11 @@ test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw @echo $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf -ifeq ($(CONFIG_SWSCALER),yes) +ifeq ($(CONFIG_SWSCALE),yes) test-server codectest $(CODEC_TESTS) libavtest: swscale_error swscale_error: @echo - @echo "This regression test is incompatible with --enable-swscaler." + @echo "This regression test is incompatible with --enable-swscale." @echo @exit 1 endif @@ -433,7 +431,7 @@ tests/seek_test$(EXESUF): tests/seek_test.c .libs $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS) -.PHONY: all lib videohook documentation install* wininstaller uninstall* +.PHONY: all lib videohook documentation install* uninstall* .PHONY: dep depend clean distclean TAGS .PHONY: codectest libavtest seektest test-server fulltest test .PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error