adding a \ so we can add more lines without having to do a "cosmetic" change in the...

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index b6e2cd08e6d9e80817ec3de0c8faabc0639eedec..42e4d41ea1b5c3cb6cf207e86c81c1159296bcac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,11 @@ 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. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+       -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 LDFLAGS+= -g
 
-ifeq ($(TARGET_GPROF),yes)
-CFLAGS+=-p
-LDFLAGS+=-p
-endif
-
 MANPAGES=doc/ffmpeg.1
 PROGS_G+=ffmpeg_g$(EXESUF)
 PROGS+=ffmpeg$(EXESUF)
@@ -32,6 +29,11 @@ PROGS+=ffplay$(EXESUF)
 FFPLAY_O=ffplay.o
 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
@@ -47,49 +49,44 @@ 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)
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
+FFLIBDIRS = -L./libavformat -L./libavcodec -L./libavutil
+FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
 
-all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 
 lib:
        $(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
 
 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) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
 
 ffserver$(EXESUF): ffserver.o .libs
-       $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
+       $(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-       $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+       $(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
 
-ffplay$(EXESUF): ffplay_g$(EXESUF)
+%$(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) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
+       $(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
 
 qt-faststart$(EXESUF): qt-faststart.c
        $(CC) $(CFLAGS) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
@@ -127,7 +124,7 @@ 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 $(MANPAGES) "$(mandir)/man1" ; \
@@ -142,7 +139,7 @@ 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 ($(BUILD_SHARED),yes)
        -$(LDCONFIG)
@@ -153,18 +150,16 @@ 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
 
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
-ALLPROGS=ffmpeg ffplay ffserver
 uninstall-progs:
        rm -f $(addprefix $(bindir)/, $(ALLPROGS))
 
-ALLMANPAGES=$(addsuffix .1, $(ALLPROGS))
 uninstall-man:
-ifneq ($(CONFIG_WIN32),yes)
+ifneq ($(CONFIG_MINGW),yes)
        rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
 endif
 
@@ -175,51 +170,53 @@ uninstall-libs:
        $(MAKE) -C libavutil   uninstall-libs
        $(MAKE) -C libavcodec  uninstall-libs
        $(MAKE) -C libavformat uninstall-libs
-       $(MAKE) -C libavcodec/libpostproc 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 libavcodec/libpostproc uninstall-headers
+       $(MAKE) -C libpostproc uninstall-headers
        -rmdir "$(incdir)"
        -rmdir "$(prefix)/include/postproc"
 
 dep:   depend
 
 depend: .depend
+       $(MAKE) -C libavutil   depend
        $(MAKE) -C libavcodec  depend
        $(MAKE) -C libavformat depend
 ifeq ($(BUILD_VHOOK),yes)
        $(MAKE) -C vhook       depend
 endif
 
-.depend: $(SRCS)
+.depend: $(SRCS) version.h
        $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 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 libavformat clean
-       $(MAKE) -C libavcodec/libpostproc clean
+       $(MAKE) -C libpostproc clean
        $(MAKE) -C tests       clean
        $(MAKE) -C vhook       clean
+       $(MAKE) -C doc         clean
        rm -f *.o *.d *~ .libs gmon.out TAGS \
-          $(PROGS) $(PROGS_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 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]
@@ -236,7 +233,7 @@ FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " libavcodec/avcodec.h | \
 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