dependency handling is consistant with libavcodec

Originally committed as revision 1490 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Fabrice Bellard 22 years ago
parent 8f0a61620d
commit 7c235fe238
  1. 22
      libavformat/Makefile
  2. 15
      vhook/Makefile

@ -50,17 +50,20 @@ endif
LIB= $(LIBPREF)avformat$(LIBSUF) LIB= $(LIBPREF)avformat$(LIBSUF)
DEPS= $(OBJS:.o=.d) SRCS := $(OBJS:.o=.c)
all: $(LIB) all: $(LIB)
$(LIB): $(OBJS) $(LIB): .depend $(OBJS)
rm -f $@ rm -f $@
$(AR) rc $@ $(OBJS) $(AR) rc $@ $(OBJS)
ifneq ($(CONFIG_OS2),yes) ifneq ($(CONFIG_OS2),yes)
$(RANLIB) $@ $(RANLIB) $@
endif endif
.depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
installlib: all installlib: all
install -m 644 $(LIB) $(prefix)/lib install -m 644 $(LIB) $(prefix)/lib
mkdir -p $(prefix)/include/ffmpeg mkdir -p $(prefix)/include/ffmpeg
@ -72,15 +75,16 @@ installlib: all
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
%.d: %.c
@echo $@ \\ > $@
$(CC) $(CFLAGS) -MM $< >> $@
-include $(DEPS)
# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
%.o: %.cpp %.o: %.cpp
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
clean: clean:
rm -f *.o *.d *~ *.a $(LIB) rm -f *.o *.d .depend *~ *.a $(LIB)
#
# include dependency files if they exist
#
ifneq ($(wildcard .depend),)
include .depend
endif

@ -15,7 +15,10 @@ endif
all: $(HOOKS) all: $(HOOKS)
DEPS= $(HOOKS:.so=.d) SRCS := $(OBJS:.o=.c)
.depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
install: install:
install -s -m 755 $(HOOKS) $(INSTDIR) install -s -m 755 $(HOOKS) $(INSTDIR)
@ -26,14 +29,12 @@ imlib2.so: imlib2.o
%.so: %.o %.so: %.o
$(CC) -g -o $@ $(SHFLAGS) $< $(CC) -g -o $@ $(SHFLAGS) $<
%.d: %.c
@echo $@ \\ > $@
$(CC) $(CFLAGS) -MM $< >> $@
-include $(DEPS)
%.html: %.texi %.html: %.texi
texi2html -monolithic -number $< texi2html -monolithic -number $<
clean: clean:
rm -f *.o *.d *.so *~ rm -f *.o *.d *.so *~
ifneq ($(wildcard .depend),)
include .depend
endif

Loading…
Cancel
Save