X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=4ad6023bf3fb1cc52e7052c8de23272aa7bd3a8c;hb=568ad81b1afb23b1b31bd3ebce04700e5664d422;hp=4e91630c4b195bdaa81368faeb1a5793cbeed1f5;hpb=1e7ffa50b76b49ad774e1c3a702a34d90302c5ca;p=ffmpeg

diff --git a/Makefile b/Makefile
index 4e91630c4b1..4ad6023bf3f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,34 +4,37 @@
 #
 include config.mak
 
-VPATH=$(SRC_PATH)
+VPATH=$(SRC_PATH_BARE)
 
-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
 
-ifeq ($(TARGET_GPROF),yes)
-CFLAGS+=-p
-LDFLAGS+=-p
-endif
-
-MANPAGE=doc/ffmpeg.1
-PROG_G+=ffmpeg_g$(EXESUF)
-PROG+=ffmpeg$(EXESUF)
+ifeq ($(CONFIG_FFMPEG),yes)
+MANPAGES=doc/ffmpeg.1
+PROGS_G+=ffmpeg_g$(EXESUF)
+PROGS+=ffmpeg$(EXESUF)
 PROGTEST=output_example$(EXESUF)
 QTFASTSTART=qt-faststart$(EXESUF)
+endif
 
 ifeq ($(CONFIG_FFSERVER),yes)
-MANPAGE+=doc/ffserver.1
-PROG+=ffserver$(EXESUF)
+MANPAGES+=doc/ffserver.1
+PROGS+=ffserver$(EXESUF)
 endif
 
 ifeq ($(CONFIG_FFPLAY),yes)
-MANPAGE+=doc/ffplay.1
-PROG_G+=ffplay_g$(EXESUF)
-PROG+=ffplay$(EXESUF)
-FFPLAY_O=ffplay.o
+MANPAGES+=doc/ffplay.1
+PROGS_G+=ffplay_g$(EXESUF)
+PROGS+=ffplay$(EXESUF)
 endif
 
+BASENAMES=ffmpeg ffplay ffserver
+ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
+ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
+ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
+
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
 EXTRALIBS+=-lmedia -lbe
 endif
@@ -42,64 +45,68 @@ else
 DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 endif
 
-ifeq ($(BUILD_VHOOK),yes)
+ifeq ($(CONFIG_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
 endif
 
-ifeq ($(TARGET_OS), SunOS)
-TEST=/usr/bin/test
-else
-TEST=test
-endif
-
 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)
-FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -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: lib $(PROG_G) $(PROG) $(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
-	$(MAKE) -C libavcodec all
+	$(MAKE) -C libavutil   all
+	$(MAKE) -C libavcodec  all
 	$(MAKE) -C libavformat all
 ifeq ($(CONFIG_PP),yes)
-	$(MAKE) -C libavcodec/libpostproc all
+	$(MAKE) -C libpostproc all
+endif
+ifeq ($(CONFIG_SWSCALER),yes)
+	$(MAKE) -C libswscale  all
 endif
 
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
-	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
-
-ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
-	cp -p $< $@
-	$(STRIP) $@
+	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
 
 ffserver$(EXESUF): ffserver.o .libs
-	$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
+	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
 
-ffplay$(EXESUF): ffplay_g$(EXESUF)
+%$(EXESUF): %_g$(EXESUF)
 	cp -p $< $@
 	$(STRIP) $@
 
+version.h:
+	$(SRC_PATH)/version.sh $(SRC_PATH)
+
 output_example$(EXESUF): output_example.o .libs
-	$(CC) $(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 $@ $<
 
@@ -109,17 +116,15 @@ videohook: .libs
 documentation:
 	$(MAKE) -C doc all
 
-.PHONY: install
-
 install: install-progs install-libs install-headers install-man $(INSTALLVHOOK)
 
 ifeq ($(BUILD_SHARED),yes)
-install-progs: $(PROG) install-libs
+install-progs: $(PROGS) install-libs
 else
-install-progs: $(PROG)
+install-progs: $(PROGS)
 endif
 	install -d "$(bindir)"
-	install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
+	install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
 
 # create the window installer
 wininstaller: all install
@@ -127,10 +132,10 @@ wininstaller: all install
 
 # install man from source dir if available
 install-man:
-ifneq ($(CONFIG_WIN32),yes)
+ifneq ($(CONFIG_MINGW),yes)
 	if [ -f doc/ffmpeg.1 ] ; then \
 	    install -d "$(mandir)/man1" ; \
-	    install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
+	    install -m 644 $(MANPAGES) "$(mandir)/man1" ; \
 	fi
 endif
 
@@ -142,8 +147,12 @@ install-libs:
 	$(MAKE) -C libavcodec  install-libs
 	$(MAKE) -C libavformat install-libs
 ifeq ($(CONFIG_PP),yes)
-	$(MAKE) -C libavcodec/libpostproc install-libs
+	$(MAKE) -C libpostproc install-libs
 endif
+ifeq ($(CONFIG_SWSCALER),yes)
+	$(MAKE) -C libswscale  install-libs
+endif
+
 ifeq ($(BUILD_SHARED),yes)
 	-$(LDCONFIG)
 endif
@@ -153,64 +162,104 @@ install-headers:
 	$(MAKE) -C libavcodec  install-headers
 	$(MAKE) -C libavformat install-headers
 ifeq ($(CONFIG_PP),yes)
-	$(MAKE) -C libavcodec/libpostproc install-headers
+	$(MAKE) -C libpostproc install-headers
+endif
+	$(MAKE) -C libswscale  install-headers
+
+uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
+
+uninstall-progs:
+	rm -f $(addprefix $(bindir)/, $(ALLPROGS))
+
+uninstall-man:
+ifneq ($(CONFIG_MINGW),yes)
+	rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
 endif
 
+uninstall-vhook:
+	$(MAKE) -C vhook uninstall
+
+uninstall-libs:
+	$(MAKE) -C libavutil   uninstall-libs
+	$(MAKE) -C libavcodec  uninstall-libs
+	$(MAKE) -C libavformat uninstall-libs
+	$(MAKE) -C libpostproc uninstall-libs
+
+uninstall-headers:
+	$(MAKE) -C libavutil   uninstall-headers
+	$(MAKE) -C libavcodec  uninstall-headers
+	$(MAKE) -C libavformat uninstall-headers
+	$(MAKE) -C libpostproc uninstall-headers
+	-rmdir "$(incdir)"
+	-rmdir "$(prefix)/include/postproc"
+
 dep:	depend
 
 depend: .depend
-	$(MAKE) -C libavcodec depend
+	$(MAKE) -C libavutil   depend
+	$(MAKE) -C libavcodec  depend
 	$(MAKE) -C libavformat depend
-ifeq ($(BUILD_VHOOK),yes)
-	$(MAKE) -C vhook depend
+ifeq ($(CONFIG_PP),yes)
+	$(MAKE) -C libpostproc depend
+endif
+ifeq ($(CONFIG_SWSCALER),yes)
+	$(MAKE) -C libswscale  depend
+endif
+ifeq ($(CONFIG_VHOOK),yes)
+	$(MAKE) -C vhook       depend
 endif
 
-.depend: $(SRCS)
-	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
+.depend: $(SRCS) version.h
+	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(SRCS) 1>.depend
 
 .libs: lib
 	@test -f .libs || touch .libs
-	@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
+	@for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
 
 clean:
-	$(MAKE) -C libavutil clean
-	$(MAKE) -C libavcodec clean
+	$(MAKE) -C libavutil   clean
+	$(MAKE) -C libavcodec  clean
 	$(MAKE) -C libavformat clean
-	$(MAKE) -C libavcodec/libpostproc clean
-	$(MAKE) -C tests clean
-	$(MAKE) -C vhook clean
+	$(MAKE) -C libpostproc clean
+	$(MAKE) -C libswscale  clean
+	$(MAKE) -C tests       clean
+	$(MAKE) -C vhook       clean
+	$(MAKE) -C doc         clean
 	rm -f *.o *.d *~ .libs gmon.out TAGS \
-	   $(PROG) $(PROG_G) $(PROGTEST) $(QTFASTSTART)
+	   $(ALLPROGS) $(ALLPROGS_G) $(PROGTEST) $(QTFASTSTART)
 
 # Note well: config.log is NOT removed.
 distclean: clean
 	$(MAKE) -C libavutil   distclean
 	$(MAKE) -C libavcodec  distclean
 	$(MAKE) -C libavformat distclean
-	$(MAKE) -C libavcodec/libpostproc distclean
+	$(MAKE) -C libpostproc distclean
+	$(MAKE) -C libswscale  distclean
 	$(MAKE) -C tests       distclean
 	$(MAKE) -C vhook       distclean
-	rm -f .depend config.mak config.h *.pc
+	rm -f .depend version.h config.* *.pc
 
 TAGS:
 	etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
 
 # regression tests
 
-libavtest test mpeg4 mpeg test-server fulltest: $(PROG)
+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:
 	rm -rf /tmp/$(FILE)
 	cp -r . /tmp/$(FILE)
-	( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
+	( 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