More standards compilance

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index a8f341620cedf1bcd770d4d827d62d34278f6e32..a35c32ae0e9c14bd6f33485e07e7cafd455ee2cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,27 @@
 include config.mak
 
 CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav 
-LDFLAGS= -g 
+LDFLAGS= -g
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
 LDFLAGS+=-p
 endif
 
-PROG= ffmpeg ffserver
+ifeq ($(CONFIG_WIN32),yes)
+EXE=.exe
+PROG=ffmpeg$(EXE)
+else
+EXT=
+PROG=ffmpeg ffplay ffserver
+endif
+
+ifeq ($(BUILD_SHARED),yes)
+FFMPEG_LIB=-Llibavcodec -lffmpeg
+DEP_FFMPEG_LIB=
+else
+FFMPEG_LIB=libavcodec/libavcodec.a
+DEP_FFMPEG_LIB=libavcodec/libavcodec.a
+endif
 
 all: lib $(PROG)
 
@@ -18,17 +32,22 @@ lib:
        $(MAKE) -C libavcodec all
        $(MAKE) -C libav all
 
-ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a
-       gcc $(LDFLAGS) -o $@ $^ -lm
+ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
+       $(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
+
+ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
+       $(CC) $(LDFLAGS) -lm -o $@ $^ $(FFMPEG_LIB)
 
-ffserver: ffserver.o libav/libav.a libavcodec/libavcodec.a
-       gcc $(LDFLAGS) -o $@ $^ -lm
+ffplay: ffmpeg$(EXE)
+       ln -sf $< $@
 
 %.o: %.c
-       gcc $(CFLAGS) -c -o $@ $< 
+       $(CC) $(CFLAGS) -c -o $@ $< 
 
 install: all
+       $(MAKE) -C libavcodec install
        install -s -m 755 $(PROG) $(prefix)/bin
+       ln -sf ffmpeg $(prefix)/bin/ffplay 
 
 clean: 
        $(MAKE) -C libavcodec clean
@@ -36,6 +55,7 @@ clean:
        rm -f *.o *~ gmon.out TAGS $(PROG) 
 
 distclean: clean
+       $(MAKE) -C libavcodec distclean
        rm -f config.mak config.h
 
 TAGS: