summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-02 07:30:40 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-02 07:30:40 +0000
commitf586d45ab706481cef8b2515831a1f47f9f05070 (patch)
tree50cf68ea6c763123d1aa3da536cdadf60963474b
parent0535cfb080fcca0ac34648b2d1c684c56bdd98af (diff)
downloadmpv-f586d45ab706481cef8b2515831a1f47f9f05070.tar.bz2
mpv-f586d45ab706481cef8b2515831a1f47f9f05070.tar.xz
further fixes..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18016 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a0be370b94..e51a194e41 100644
--- a/Makefile
+++ b/Makefile
@@ -523,8 +523,7 @@ strip:
dep: depend
-depend: help_mp.h
- ./version.sh `$(CC) -dumpversion`
+depend:
$(CC) -MM $(CFLAGS) -DCODECS2HTML mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend
@for a in $(PARTS); do $(MAKE) -C $$a dep; done
@@ -534,8 +533,6 @@ config.h: configure
@echo "####### Please run ./configure again - it's changed! #######"
@echo "############################################################"
-# do not rebuild after cvs commits if .developer file is present!
-
# rebuild at every config.h/config.mak change:
version.h:
./version.sh `$(CC) -dumpversion`
@@ -570,6 +567,9 @@ version.h: config.h config.mak Makefile
# explicit dependencies to force version.h to be built even if .depend is missing
mplayer.o mencoder.o vobsub.o: version.h
+# temporary measure to make sure help_mp.h is built. we desperately need correct deps!
+$(MPLAYER_DEP) $(MENCODER_DEP): help_mp.h
+
#
# the following lines provide _partial_ dependency information
# for the 'library' directories under main dir, in order to cause