mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
dependency handling is consistant with libavcodec
Originally committed as revision 1492 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
811e6d731f
commit
4b8b2edb62
15
Makefile
15
Makefile
@ -54,17 +54,14 @@ endif
|
||||
|
||||
OBJS = ffmpeg.o ffserver.o
|
||||
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
|
||||
DEPS = $(OBJS:.o=.d)
|
||||
|
||||
all: lib $(PROG) $(VHOOK)
|
||||
|
||||
-include $(DEPS)
|
||||
|
||||
lib:
|
||||
$(MAKE) -C libavcodec all
|
||||
$(MAKE) -C libavformat all
|
||||
|
||||
ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
|
||||
ffmpeg_g$(EXE): .depend ffmpeg.o $(DEP_LIBS)
|
||||
$(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
|
||||
-lavformat -lavcodec $(EXTRALIBS)
|
||||
|
||||
@ -83,10 +80,6 @@ ffplay: ffmpeg$(EXE)
|
||||
%.o: %.c
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
%.d: %.c
|
||||
@echo $@ \\ > $@
|
||||
$(CC) $(CFLAGS) -MM $< >> $@
|
||||
|
||||
videohook:
|
||||
$(MAKE) -C vhook all
|
||||
|
||||
@ -108,8 +101,10 @@ installlib:
|
||||
|
||||
dep: depend
|
||||
|
||||
depend:
|
||||
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
|
||||
depend: .depend
|
||||
|
||||
.depend: $(SRCS)
|
||||
$(CC) -MM $(CFLAGS) $^ 1>.depend
|
||||
|
||||
clean: $(CLEANVHOOK)
|
||||
$(MAKE) -C libavcodec clean
|
||||
|
@ -30,7 +30,7 @@ imlib2.so: imlib2.o
|
||||
$(CC) -g -o $@ $(SHFLAGS) $<
|
||||
|
||||
clean:
|
||||
rm -f *.o *.d *.so *~
|
||||
rm -f *.o *.d .depend *.so *~
|
||||
|
||||
ifneq ($(wildcard .depend),)
|
||||
include .depend
|
||||
|
Loading…
Reference in New Issue
Block a user