From c2b7070033f690b12dd1adc81209fcdeb8bb21d3 Mon Sep 17 00:00:00 2001 From: arpi_esp Date: Mon, 4 Jun 2001 19:33:28 +0000 Subject: dependency stuff fixed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1011 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 23 +++++++++++------------ libao2/Makefile | 5 ++--- libao2/ao_null.c | 2 +- libmpeg2/Makefile | 5 ++--- libvo/Makefile | 5 ++--- loader/dshow/Makefile | 5 ++--- mp3lib/Makefile | 5 ++--- 7 files changed, 22 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 08a7d10b6c..36a5f98f3d 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ VO_LIBS = -Llibvo -lvo $(X_LIBS) # .PHONY: all clean -all: version.h config.h $(PRG) +all: $(PRG) # $(PRG_AVIP) .c.o: @@ -60,22 +60,22 @@ opendivx/libdecore.a: 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,11 +91,9 @@ distclean: dep: depend -depend: version.h config.h .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 +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 # ./configure must be run if it changed in CVS config.h: configure @@ -106,8 +104,9 @@ config.h: configure # rebuild at every config.h/config.mak change: version.h: config.h config.mak Makefile - $(MAKE) distclean ./version.sh + $(MAKE) distclean + $(MAKE) depend # rebuild at every CVS update: ifneq ($(wildcard CVS/Entries),) diff --git a/libao2/Makefile b/libao2/Makefile index 9d64132ce3..ddf755f04e 100644 --- a/libao2/Makefile +++ b/libao2/Makefile @@ -17,7 +17,7 @@ CFLAGS = $(OPTFLAGS) -I. -I.. .c.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) all: $(LIBNAME) @@ -29,9 +29,8 @@ distclean: rm -f Makefile.bak *.o *.a *~ .depend dep: depend -depend: .depend -.depend: Makefile ../config.mak ../config.h +depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libao2/ao_null.c b/libao2/ao_null.c index d48667757f..4ec360fea6 100644 --- a/libao2/ao_null.c +++ b/libao2/ao_null.c @@ -33,7 +33,7 @@ static int init(int rate,int channels,int format,int flags){ ao_outburst=4096; - return 0; + return 1; } // close audio device diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile index d6a7f1cfa7..8a6ecbd1a3 100644 --- a/libmpeg2/Makefile +++ b/libmpeg2/Makefile @@ -15,7 +15,7 @@ CFLAGS = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY .c.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) all: $(LIBNAME) @@ -27,9 +27,8 @@ distclean: rm -f Makefile.bak *.o *.a *~ .depend dep: depend -depend: .depend -.depend: Makefile ../config.mak ../config.h +depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libvo/Makefile b/libvo/Makefile index adbef9a515..556d918dcd 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -16,7 +16,7 @@ CFLAGS = $(OPTFLAGS) -I. -I.. -DMPG12PLAY .c.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) all: $(LIBNAME) @@ -28,9 +28,8 @@ distclean: 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 # diff --git a/loader/dshow/Makefile b/loader/dshow/Makefile index 29a525ef5e..5a2e554cda 100644 --- a/loader/dshow/Makefile +++ b/loader/dshow/Makefile @@ -18,7 +18,7 @@ CFLAGS = $(OPTFLAGS) $(INCLUDE) .cpp.o: $(CC) -c $(CFLAGS) -o $@ $< -$(LIBNAME): .depend $(OBJS) +$(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) test: test.c $(LIBNAME) @@ -33,9 +33,8 @@ distclean: 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 # diff --git a/mp3lib/Makefile b/mp3lib/Makefile index c8ee1eb915..57797da46b 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -16,7 +16,7 @@ CFLAGS = $(OPTFLAGS) .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 @@ distclean: 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 # -- cgit v1.2.3