diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-08-17 16:28:47 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-08-17 16:28:47 +0000 |
| commit | 041514a422848da78f667e6754f7303edb2e44e2 (patch) | |
| tree | 2bc50354538f993fbc1072ffc785b453dbc4be3d | |
| parent | cf41e667362085e6b62130c1c247b6cd6c8b80fe (diff) | |
Revert last commit, VPATH is necessary for out-of-tree builds.
Originally committed as revision 6014 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/Makefile | 4 | ||||
| -rw-r--r-- | vhook/Makefile | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/Makefile b/doc/Makefile index d472dc3297..744a9fbc18 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,3 +1,7 @@ +-include ../config.mak + +VPATH=$(SRC_PATH)/doc + all: ffmpeg-doc.html faq.html ffserver-doc.html ffplay-doc.html hooks.html \ ffmpeg.1 ffserver.1 ffplay.1 diff --git a/vhook/Makefile b/vhook/Makefile index 5b68b43d09..13353551b4 100644 --- a/vhook/Makefile +++ b/vhook/Makefile @@ -1,5 +1,7 @@ include ../config.mak +VPATH=$(SRC_PATH)/vhook + CFLAGS=$(VHOOKCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H |