Commit ecc94e62 authored by glantau's avatar glantau

use MAKE variable


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@63 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 53620a6b
...@@ -15,8 +15,8 @@ PROG= ffmpeg ffserver ...@@ -15,8 +15,8 @@ PROG= ffmpeg ffserver
all: lib $(PROG) all: lib $(PROG)
lib: lib:
make -C libavcodec all $(MAKE) -C libavcodec all
make -C libav all $(MAKE) -C libav all
ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a
gcc $(LDFLAGS) -o $@ $^ -lm gcc $(LDFLAGS) -o $@ $^ -lm
...@@ -31,8 +31,8 @@ install: all ...@@ -31,8 +31,8 @@ install: all
install -s -m 755 $(PROG) $(prefix)/bin install -s -m 755 $(PROG) $(prefix)/bin
clean: clean:
make -C libavcodec clean $(MAKE) -C libavcodec clean
make -C libav clean $(MAKE) -C libav clean
rm -f *.o *~ gmon.out TAGS $(PROG) rm -f *.o *~ gmon.out TAGS $(PROG)
distclean: clean distclean: clean
......
...@@ -68,6 +68,7 @@ if test -z "$CFLAGS"; then ...@@ -68,6 +68,7 @@ if test -z "$CFLAGS"; then
fi fi
echo "prefix=$prefix" >> config.mak echo "prefix=$prefix" >> config.mak
echo "MAKE=make" >> config.mak
echo "CC=$cc" >> config.mak echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak echo "AR=$ar" >> config.mak
echo "OPTFLAGS=$CFLAGS" >> config.mak echo "OPTFLAGS=$CFLAGS" >> config.mak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment