rename shell variables v4l[2] to video4linux[2]

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 4fdd25b93fd48ac9db84a7f2f89e8f4c04e21d77..344cfbc42dbe76d5b11f53475e7bf9050e805e5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,22 +4,20 @@
 #
 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 \
+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 ($(CONFIG_SWSCALER),yes)
-CFLAGS := -I$(SRC_PATH)/libswscale $(CFLAGS)
-endif
-
+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)
 MANPAGES+=doc/ffserver.1
@@ -47,7 +45,7 @@ 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
@@ -58,7 +56,7 @@ endif
 
 OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-LDFLAGS := -L./libavformat -L./libavcodec -L./libavutil $(LDFLAGS)
+LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
 EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 ifeq ($(CONFIG_SWSCALER),yes)
@@ -93,7 +91,7 @@ ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
        $(STRIP) $@
 
 version.h:
-       $(SRC_PATH)/version.sh "$(SRC_PATH)"
+       $(SRC_PATH)/version.sh $(SRC_PATH)
 
 output_example$(EXESUF): output_example.o .libs
        $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
@@ -118,8 +116,6 @@ videohook: .libs
 documentation:
        $(MAKE) -C doc all
 
-.PHONY: install
-
 install: install-progs install-libs install-headers install-man $(INSTALLVHOOK)
 
 ifeq ($(BUILD_SHARED),yes)
@@ -168,9 +164,7 @@ install-headers:
 ifeq ($(CONFIG_PP),yes)
        $(MAKE) -C libpostproc install-headers
 endif
-ifeq ($(CONFIG_SWSCALER),yes)
        $(MAKE) -C libswscale  install-headers
-endif
 
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
@@ -199,9 +193,7 @@ uninstall-headers:
        -rmdir "$(incdir)"
        -rmdir "$(prefix)/include/postproc"
 
-dep:   depend
-
-depend: .depend
+depend dep: .depend
        $(MAKE) -C libavutil   depend
        $(MAKE) -C libavcodec  depend
        $(MAKE) -C libavformat depend
@@ -211,12 +203,12 @@ endif
 ifeq ($(CONFIG_SWSCALER),yes)
        $(MAKE) -C libswscale  depend
 endif
-ifeq ($(BUILD_VHOOK),yes)
+ifeq ($(CONFIG_VHOOK),yes)
        $(MAKE) -C vhook       depend
 endif
 
 .depend: $(SRCS) version.h
-       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(SRCS) 1>.depend
+       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
 
 .libs: lib
        @test -f .libs || touch .libs
@@ -263,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