summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-04 19:33:28 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-04 19:33:28 +0000
commitc2b7070033f690b12dd1adc81209fcdeb8bb21d3 (patch)
tree8af3cb78a6e2e107508777ec24f9467e562caaab /Makefile
parentb2b9d98b8f35204705c67c8ae3304d7461fe6b7e (diff)
downloadmpv-c2b7070033f690b12dd1adc81209fcdeb8bb21d3.tar.bz2
mpv-c2b7070033f690b12dd1adc81209fcdeb8bb21d3.tar.xz
dependency stuff fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1011 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 11 insertions, 12 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),)