X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=8269847f8f757fb753303f35d39d4801f39dcc8c;hb=ffc5430bc30a787ae684549df3afcb7b9dcc86d9;hp=151f50e0e620f3ae5ec5a4da4d9d959722283151;hpb=2f30a81d192b90fd3b12f2ce40227ed74a331b6d;p=ffmpeg

diff --git a/Makefile b/Makefile
index 151f50e0e62..8269847f8f7 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-       -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \
-       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+       -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 LDFLAGS+= -g
 
 MANPAGES=doc/ffmpeg.1
@@ -26,7 +26,6 @@ ifeq ($(CONFIG_FFPLAY),yes)
 MANPAGES+=doc/ffplay.1
 PROGS_G+=ffplay_g$(EXESUF)
 PROGS+=ffplay$(EXESUF)
-FFPLAY_O=ffplay.o
 endif
 
 BASENAMES=ffmpeg ffplay ffserver
@@ -53,12 +52,17 @@ ifeq ($(BUILD_DOC),yes)
 DOC=documentation
 endif
 
-OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
+OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-FFLIBDIRS = -L./libavformat -L./libavcodec -L./libavutil
-FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
+LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
+EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
-all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+ifeq ($(CONFIG_SWSCALER),yes)
+LDFLAGS+=-L./libswscale
+EXTRALIBS+=-lswscale$(BUILDSUF)
+endif
+
+all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 
 lib:
 	$(MAKE) -C libavutil   all
@@ -67,36 +71,40 @@ lib:
 ifeq ($(CONFIG_PP),yes)
 	$(MAKE) -C libpostproc all
 endif
+ifeq ($(CONFIG_SWSCALER),yes)
+	$(MAKE) -C libswscale  all
+endif
 
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
-	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
+	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
 
 ffserver$(EXESUF): ffserver.o .libs
-	$(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
+	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
 
 %$(EXESUF): %_g$(EXESUF)
 	cp -p $< $@
 	$(STRIP) $@
 
-.PHONY: version.h
 version.h:
 	$(SRC_PATH)/version.sh "$(SRC_PATH)"
 
 output_example$(EXESUF): output_example.o .libs
-	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
+	$(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
 
 qt-faststart$(EXESUF): qt-faststart.c
-	$(CC) $(CFLAGS) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
+	$(CC) $(CFLAGS) $< -o $@
 
 cws2fws$(EXESUF): cws2fws.c
-	$(CC) $(SRC_PATH)/cws2fws.c -o cws2fws$(EXESUF) -lz
+	$(CC) $< -o $@ -lz
 
 ffplay.o: ffplay.c
 	$(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
 
+ffmpeg.o ffplay.o ffserver.o: version.h
+
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
@@ -106,8 +114,6 @@ videohook: .libs
 documentation:
 	$(MAKE) -C doc all
 
-.PHONY: install
-
 install: install-progs install-libs install-headers install-man $(INSTALLVHOOK)
 
 ifeq ($(BUILD_SHARED),yes)
@@ -141,6 +147,10 @@ install-libs:
 ifeq ($(CONFIG_PP),yes)
 	$(MAKE) -C libpostproc install-libs
 endif
+ifeq ($(CONFIG_SWSCALER),yes)
+	$(MAKE) -C libswscale  install-libs
+endif
+
 ifeq ($(BUILD_SHARED),yes)
 	-$(LDCONFIG)
 endif
@@ -152,6 +162,7 @@ install-headers:
 ifeq ($(CONFIG_PP),yes)
 	$(MAKE) -C libpostproc install-headers
 endif
+	$(MAKE) -C libswscale  install-headers
 
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
@@ -186,12 +197,18 @@ depend: .depend
 	$(MAKE) -C libavutil   depend
 	$(MAKE) -C libavcodec  depend
 	$(MAKE) -C libavformat depend
+ifeq ($(CONFIG_PP),yes)
+	$(MAKE) -C libpostproc depend
+endif
+ifeq ($(CONFIG_SWSCALER),yes)
+	$(MAKE) -C libswscale  depend
+endif
 ifeq ($(BUILD_VHOOK),yes)
 	$(MAKE) -C vhook       depend
 endif
 
 .depend: $(SRCS) version.h
-	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
+	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(SRCS) 1>.depend
 
 .libs: lib
 	@test -f .libs || touch .libs
@@ -202,6 +219,7 @@ clean:
 	$(MAKE) -C libavcodec  clean
 	$(MAKE) -C libavformat clean
 	$(MAKE) -C libpostproc clean
+	$(MAKE) -C libswscale  clean
 	$(MAKE) -C tests       clean
 	$(MAKE) -C vhook       clean
 	$(MAKE) -C doc         clean
@@ -214,6 +232,7 @@ distclean: clean
 	$(MAKE) -C libavcodec  distclean
 	$(MAKE) -C libavformat distclean
 	$(MAKE) -C libpostproc distclean
+	$(MAKE) -C libswscale  distclean
 	$(MAKE) -C tests       distclean
 	$(MAKE) -C vhook       distclean
 	rm -f .depend version.h config.* *.pc
@@ -223,11 +242,11 @@ TAGS:
 
 # regression tests
 
-libavtest test mpeg4 mpeg test-server fulltest: $(PROGS)
+codectest libavtest test-server fulltest test mpeg4 mpeg: $(PROGS)
 	$(MAKE) -C tests $@
 
 # tar release (use 'make -k tar' on a checkouted tree)
-FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " libavcodec/avcodec.h | \
+FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " version.h | \
                     cut -d "\"" -f 2 )
 
 tar:
@@ -236,7 +255,9 @@ tar:
 	( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude .svn )
 	rm -rf /tmp/$(FILE)
 
-.PHONY: lib
+.PHONY: all lib videohook documentation install* wininstaller uninstall*
+.PHONY: dep depend clean distclean TAGS tar
+.PHONY: codectest libavtest test-server fulltest test mpeg4 mpeg
 
 ifneq ($(wildcard .depend),)
 include .depend