aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-07-23 20:06:54 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-07-23 20:06:54 +0000
commit980fc7b83458fe6bbd58910813ba7ad3faf6cf76 (patch)
tree54215c0a4172d6a0490478d6e83685c0851884e7 /Makefile
parentd78647e8b4ae46352d689179079a65cc7e1d1efe (diff)
downloadffmpeg-980fc7b83458fe6bbd58910813ba7ad3faf6cf76.tar.gz
fixed config for direct mplayer build compatibility
Originally committed as revision 8 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1650c89612..ffa1b80a14 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
# Main ffmpeg Makefile
# (c) 2000, 2001 Gerard Lantau
#
-include config.mk
+include config.mak
-CFLAGS= -O2 -Wall -g -I./libavcodec -I./libav
+CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav
LDFLAGS= -g
-ifdef CONFIG_GPROF
+ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
LDFLAGS+=-p
endif
@@ -28,7 +28,7 @@ ffserver: ffserver.o libav/libav.a libavcodec/libavcodec.a
gcc $(CFLAGS) -c -o $@ $<
install: all
- install -s -m 755 $(PROG) $(PREFIX)/bin
+ install -s -m 755 $(PROG) $(prefix)/bin
clean:
make -C libavcodec clean
@@ -36,7 +36,7 @@ clean:
rm -f *.o *~ gmon.out TAGS $(PROG)
distclean: clean
- rm -f Rules.mk config.h
+ rm -f config.mak config.h
TAGS:
etags *.[ch] libav/*.[ch] libavcodec/*.[ch]