1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

use MAKE variable

Originally committed as revision 63 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2001-08-11 18:57:27 +00:00
parent 0c1e384c5f
commit 2cc8ae9676
2 changed files with 5 additions and 4 deletions

View File

@ -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
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

1
configure vendored
View File

@ -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