diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-02-01 20:57:37 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-02-01 20:57:37 +0000 |
| commit | 811b32ed69b938cbaa2fd01db5794512c23ba3ff (patch) | |
| tree | 3333c02d139e12f85ab9da835bcc738bf287e3a7 | |
| parent | 91d742b7460ba90ad53696b2767b5250da8413dc (diff) | |
| download | ffmpeg-811b32ed69b938cbaa2fd01db5794512c23ba3ff.tar.gz | |
dependencies are only build with make depend
Originally committed as revision 1531 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | libavcodec/Makefile | 8 |
2 files changed, 9 insertions, 6 deletions
@@ -61,7 +61,7 @@ lib: $(MAKE) -C libavcodec all $(MAKE) -C libavformat all -ffmpeg_g$(EXE): .depend ffmpeg.o $(DEP_LIBS) +ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS) $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \ -lavformat -lavcodec $(EXTRALIBS) @@ -102,6 +102,11 @@ installlib: dep: depend depend: .depend + make -C libavcodec depend + make -C libavformat depend +ifeq ($(BUILD_VHOOK),yes) + make -C vhook depend +endif .depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 368d967c91..071609325e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -113,14 +113,14 @@ all: $(LIB) $(SLIB) tests: apiexample cpuid_test $(TESTS) -$(LIB): .depend $(OBJS) +$(LIB): $(OBJS) rm -f $@ $(AR) rc $@ $(OBJS) ifneq ($(CONFIG_OS2),yes) $(RANLIB) $@ endif -$(SLIB): .depend $(OBJS) +$(SLIB): $(OBJS) $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) dsputil.o: dsputil.c dsputil.h @@ -142,13 +142,11 @@ alpha/motion_est_alpha.o: alpha/motion_est_alpha.c $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $< endif -.depend: $(SRCS) +depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend dep: depend -depend: .depend - clean: rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \ armv4l/*.o armv4l/*~ \ |