added ffserver disabling for easier porting

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index c28de12e8bfae32d63a90a8ece23c7475c2a4777..a954e0e7b4d1b559e61e448e6aa8a1f69d6fc55e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,8 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+= -g -d
-FFSLDFLAGS= -Wl,-bind_at_load
-else
-LDFLAGS+= -g -Wl,--warn-common
-FFSLDFLAGS= -Wl,-E
-endif
+CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+LDFLAGS+= -g 
 
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
@@ -25,7 +19,10 @@ EXE=.exe
 PROG=ffmpeg$(EXE)
 else
 EXT=
-PROG=ffmpeg ffplay ffserver
+PROG=ffmpeg ffplay
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver
+endif
 endif
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
@@ -33,9 +30,9 @@ EXTRALIBS+=-lmedia -lbe
 endif
 
 ifeq ($(BUILD_SHARED),yes)
-DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a
+DEP_LIBS=libavcodec/libavcodec.so libavformat/libavformat.a
 else
-DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a
+DEP_LIBS=libavcodec/libavcodec.a libavformat/libavformat.a
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
@@ -48,9 +45,6 @@ ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
 CLEANVHOOK=clean-vhook
-ifneq ($(CONFIG_DARWIN),yes)
-LDFLAGS += -rdynamic
-endif
 endif
 
 OBJS = ffmpeg.o ffserver.o
@@ -60,10 +54,10 @@ all: lib $(PROG) $(VHOOK)
 
 lib:
        $(MAKE) -C libavcodec all
-       $(MAKE) -C libav all
+       $(MAKE) -C libavformat all
 
 ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
-       $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libav \
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
               -lavformat -lavcodec $(EXTRALIBS)
 
 ffmpeg$(EXE): ffmpeg_g$(EXE)
@@ -71,8 +65,8 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
 
 ffserver$(EXE): ffserver.o $(DEP_LIBS)
        $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
-               -o $@ ffserver.o -L./libavcodec -L./libav \
-              -lavformat -lavcodec -ldl $(EXTRALIBS) 
+               -o $@ ffserver.o -L./libavcodec -L./libavformat \
+              -lavformat -lavcodec $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -93,11 +87,11 @@ install-vhook: $(prefix)/lib/vhook
        $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
 
 $(prefix)/lib/vhook:
-       mkdir $@
+       install -d $@
 
 installlib:
        $(MAKE) -C libavcodec installlib
-       $(MAKE) -C libav installlib
+       $(MAKE) -C libavformat installlib
 
 dep:   depend
 
@@ -106,7 +100,7 @@ depend:
 
 clean: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
-       $(MAKE) -C libav clean
+       $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
        rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
 
@@ -118,12 +112,12 @@ distclean: clean
        rm -f config.mak config.h
 
 TAGS:
-       etags *.[ch] libav/*.[ch] libavcodec/*.[ch]
+       etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
 
 # regression tests
 
 libavtest test mpeg4 mpeg: ffmpeg$(EXE)
-       make -C tests $@
+       $(MAKE) -C tests $@
 
 ifneq ($(wildcard .depend),)
 include .depend