Mercurial > mplayer.hg
changeset 1010:6d3a6d42c831
dependency stuff fixed
| author | arpi_esp |
|---|---|
| date | Mon, 04 Jun 2001 19:33:28 +0000 |
| parents | c51d7e4853d6 |
| children | d1e70889094e |
| files | Makefile libao2/Makefile libao2/ao_null.c libmpeg2/Makefile libvo/Makefile loader/dshow/Makefile mp3lib/Makefile |
| diffstat | 7 files changed, 22 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Jun 04 19:30:24 2001 +0000 +++ b/Makefile Mon Jun 04 19:33:28 2001 +0000 @@ -25,7 +25,7 @@ # .PHONY: all clean -all: version.h config.h $(PRG) +all: $(PRG) # $(PRG_AVIP) .c.o: @@ -60,22 +60,22 @@ encore/libencore.a: $(MAKE) -C encore -mplayerwithoutlink: .depend mplayer.o $(OBJS) loader/libloader.a $(DS_DEP) libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a +mplayerwithoutlink: version.h mplayer.o $(OBJS) loader/libloader.a $(DS_DEP) libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a @for a in mp3lib libac3 libmpeg2 libvo opendivx encore loader/DirectShow ; do $(MAKE) -C $$a all ; done -$(PRG): .depend mplayer.o $(OBJS) loader/libloader.a $(DS_DEP) libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a +$(PRG): version.h mplayer.o $(OBJS) loader/libloader.a $(DS_DEP) libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader $(DS_LIB) -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Llibao2 -lao $(CSS_LIB) -Lencore -lencore $(ARCH_LIBS) -# $(PRG_HQ): .depend mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a +# $(PRG_HQ): depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a # $(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread -# $(PRG_AVIP): .depend aviparse.o $(OBJS) loader/libloader.a $(COMMONLIBS) +# $(PRG_AVIP): depfile aviparse.o $(OBJS) loader/libloader.a $(COMMONLIBS) # $(CC) $(CFLAGS) -o $(PRG_AVIP) aviparse.o $(OBJS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl $(VO_LIBS) -lpthread -# $(PRG_TV): .depend tvision.o $(OBJS) $(COMMONLIBS) +# $(PRG_TV): depfile tvision.o $(OBJS) $(COMMONLIBS) # $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) -$(PRG_CFG): .depend codec-cfg.c codec-cfg.h +$(PRG_CFG): version.h codec-cfg.c codec-cfg.h $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML install: $(PRG) @@ -91,12 +91,10 @@ dep: depend -depend: version.h config.h .depend +depend: + $(CC) -MM $(CFLAGS) mplayer.c $(SRCS) 1>.depend @for a in mp3lib libac3 libmpeg2 libvo libao2 opendivx encore loader/DirectShow ; do $(MAKE) -C $$a dep ; done -.depend: Makefile config.mak config.h - $(CC) -MM $(CFLAGS) mplayer.c $(SRCS) 1>.depend - # ./configure must be run if it changed in CVS config.h: configure @echo "############################################################" @@ -106,8 +104,9 @@ # rebuild at every config.h/config.mak change: version.h: config.h config.mak Makefile + ./version.sh $(MAKE) distclean - ./version.sh + $(MAKE) depend # rebuild at every CVS update: ifneq ($(wildcard CVS/Entries),)
--- a/libao2/Makefile Mon Jun 04 19:30:24 2001 +0000 +++ b/libao2/Makefile Mon Jun 04 19:33:28 2001 +0000 @@ -17,7 +17,7 @@ .c.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) all: $(LIBNAME) @@ -29,9 +29,8 @@ rm -f Makefile.bak *.o *.a *~ .depend dep: depend -depend: .depend -.depend: Makefile ../config.mak ../config.h +depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend #
--- a/libao2/ao_null.c Mon Jun 04 19:30:24 2001 +0000 +++ b/libao2/ao_null.c Mon Jun 04 19:33:28 2001 +0000 @@ -33,7 +33,7 @@ ao_outburst=4096; - return 0; + return 1; } // close audio device
--- a/libmpeg2/Makefile Mon Jun 04 19:30:24 2001 +0000 +++ b/libmpeg2/Makefile Mon Jun 04 19:33:28 2001 +0000 @@ -15,7 +15,7 @@ .c.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) all: $(LIBNAME) @@ -27,9 +27,8 @@ rm -f Makefile.bak *.o *.a *~ .depend dep: depend -depend: .depend -.depend: Makefile ../config.mak ../config.h +depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend #
--- a/libvo/Makefile Mon Jun 04 19:30:24 2001 +0000 +++ b/libvo/Makefile Mon Jun 04 19:33:28 2001 +0000 @@ -16,7 +16,7 @@ .c.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) all: $(LIBNAME) @@ -28,9 +28,8 @@ rm -f Makefile.bak *.o *.a *~ .depend dep: depend -depend: .depend -.depend: Makefile config.mak ../config.mak ../config.h +depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend #
--- a/loader/dshow/Makefile Mon Jun 04 19:30:24 2001 +0000 +++ b/loader/dshow/Makefile Mon Jun 04 19:33:28 2001 +0000 @@ -18,7 +18,7 @@ .cpp.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) test: test.c $(LIBNAME) @@ -33,9 +33,8 @@ rm -f Makefile.bak *.o *.a *~ .depend test test.raw dep: depend -depend: .depend -.depend: Makefile ../../config.mak +depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend #
--- a/mp3lib/Makefile Mon Jun 04 19:30:24 2001 +0000 +++ b/mp3lib/Makefile Mon Jun 04 19:33:28 2001 +0000 @@ -16,7 +16,7 @@ .s.o: $(CC) -c $(CFLAGS) -o $@ $< -libMP3.a: .depend $(OBJS) +libMP3.a: $(OBJS) $(AR) r libMP3.a $(OBJS) test1: libMP3.a test.c @@ -34,9 +34,8 @@ rm -f *~ *.o *.a Makefile.bak .depend dep: depend -depend: .depend -.depend: Makefile config.mak ../config.mak ../config.h +depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend #