# HG changeset patch
# User henry
# Date 1141847807 0
# Node ID dca06252af6cc2731b62db9ad4470cc1e3fc9757
# Parent  d9474f04cce503dd4667dd8951e1e6000f6ff57d
revert the attempts for ccache fix

diff -r d9474f04cce5 -r dca06252af6c Makefile
--- a/Makefile	Wed Mar 08 15:49:46 2006 +0000
+++ b/Makefile	Wed Mar 08 19:56:47 2006 +0000
@@ -161,6 +161,9 @@
 
 PARTS = libmpdemux \
         libmpcodecs \
+        libavutil \
+        libavcodec \
+        libavformat \
         libao2 \
         osdep \
         postproc \
@@ -300,16 +303,16 @@
 	$(MAKE) -C loader/dmo
 
 libavutil/libavutil.a:
-	$(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a SRC_PATH=..
+	$(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a
 
 libavcodec/libavcodec.a:
-	$(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a SRC_PATH=..
+	$(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a
 
 libavcodec/libpostproc/libpostproc.a:
-	$(MAKE) -C libavcodec/libpostproc LIBPREF=lib LIBSUF=.a SRC_PATH=../..
+	$(MAKE) -C libavcodec/libpostproc LIBPREF=lib LIBSUF=.a
 
 libavformat/libavformat.a:
-	$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a SRC_PATH=..
+	$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
 
 libmpeg2/libmpeg2.a:
 	$(MAKE) -C libmpeg2
@@ -529,10 +532,6 @@
 	-rm -f *~ $(PRG) $(PRG_MENCODER) $(PRG_CFG)
 	-rm -f .depend configure.log codecs.conf.h help_mp.h
 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
-	$(MAKE) -C libavutil distclean SRC_PATH=.. 
-	$(MAKE) -C libavcodec distclean SRC_PATH=.. 
-	$(MAKE) -C libavcodec/libpostproc distclean SRC_PATH=../..
-	$(MAKE) -C libavformat distclean SRC_PATH=..
 
 strip:
 	strip -s $(ALL_PRG)
@@ -543,9 +542,6 @@
 	./version.sh `$(CC) -dumpversion`
 	$(CC) -MM $(CFLAGS) -DCODECS2HTML mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend
 	@for a in $(PARTS); do $(MAKE) -C $$a dep; done
-	$(MAKE) -C libavutil dep SRC_PATH=..
-	$(MAKE) -C libavcodec dep SRC_PATH=..
-	$(MAKE) -C libavformat dep SRC_PATH=..
 
 # ./configure must be run if it changed in CVS
 config.h: configure
diff -r d9474f04cce5 -r dca06252af6c configure
--- a/configure	Wed Mar 08 15:49:46 2006 +0000
+++ b/configure	Wed Mar 08 19:56:47 2006 +0000
@@ -7263,6 +7263,7 @@
 HAVE_XVMC_ACCEL = $_xvmc
 
 # for FFmpeg
+SRC_PATH=`pwd`
 LIBPREF=lib
 LIBSUF=.a
 LIB=\$(LIBPREF)\$(NAME)\$(LIBSUF)