RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-02 12:53:29 +00:00
Code Issues Projects Releases Wiki Activity

* quick fix to support make -j x

Browse Source 
Originally committed as revision 1670 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zdenek Kabelac 2003-03-12 18:38:18 +00:00
parent e803f1a2ee
commit cf2818b0e7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -54,6 +54,7 @@ endif
OBJS = ffmpeg.o ffserver.o OBJS = ffmpeg.o ffserver.o
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
all: lib $(PROG) $(VHOOK) all: lib $(PROG) $(VHOOK)
@ -61,18 +62,15 @@ lib:
$(MAKE) -C libavcodec all $(MAKE) -C libavcodec all
$(MAKE) -C libavformat all $(MAKE) -C libavformat all
ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS) ffmpeg_g$(EXE): ffmpeg.o .libs
$(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \ $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS)
-lavformat -lavcodec $(EXTRALIBS)
ffmpeg$(EXE): ffmpeg_g$(EXE) ffmpeg$(EXE): ffmpeg_g$(EXE)
cp -p $< $@ cp -p $< $@
$(STRIP) $@ $(STRIP) $@
ffserver$(EXE): ffserver.o $(DEP_LIBS) ffserver$(EXE): ffserver.o .libs
$(CC) $(LDFLAGS) $(FFSLDFLAGS) \ $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
-o $@ ffserver.o -L./libavcodec -L./libavformat \
-lavformat -lavcodec $(EXTRALIBS)
ffplay: ffmpeg$(EXE) ffplay: ffmpeg$(EXE)
ln -sf $< $@ ln -sf $< $@
@ -111,11 +109,14 @@ endif
.depend: $(SRCS) .depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend $(CC) -MM $(CFLAGS) $^ 1>.depend
.libs: lib
touch .libs
clean: $(CLEANVHOOK) clean: $(CLEANVHOOK)
$(MAKE) -C libavcodec clean $(MAKE) -C libavcodec clean
$(MAKE) -C libavformat clean $(MAKE) -C libavformat clean
$(MAKE) -C tests clean $(MAKE) -C tests clean
rm -f *.o *.d *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG)
clean-vhook: clean-vhook:
$(MAKE) -C vhook clean $(MAKE) -C vhook clean
@ -141,6 +142,8 @@ tar:
( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS ) ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
rm -rf /tmp/$(FILE) rm -rf /tmp/$(FILE)
.PHONY: lib
ifneq ($(wildcard .depend),) ifneq ($(wildcard .depend),)
include .depend include .depend
endif endif