[MPlayer-cvslog] CVS: main Makefile,1.347,1.348

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv19607

Modified Files:
	Makefile 
Log Message:
revert the attempts for ccache fix

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- Makefile	8 Mar 2006 11:09:01 -0000	1.347
+++ Makefile	8 Mar 2006 19:52:51 -0000	1.348
@@ -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