[MPlayer-cvslog] CVS: main Makefile,1.344,1.345
Jindrich Makovicka CVS
syncmail at mplayerhq.hu
Tue Mar 7 18:49:40 CET 2006
CVS change done by Jindrich Makovicka CVS
Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv14402
Modified Files:
Makefile
Log Message:
fix incomplete abs->rel path conversion
also added missing make distclean for libpostproc
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- Makefile 7 Mar 2006 15:37:58 -0000 1.344
+++ Makefile 7 Mar 2006 17:49:37 -0000 1.345
@@ -161,9 +161,6 @@
PARTS = libmpdemux \
libmpcodecs \
- libavutil \
- libavcodec \
- libavformat \
libao2 \
osdep \
postproc \
@@ -532,6 +529,10 @@
-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)
@@ -542,6 +543,9 @@
./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
More information about the MPlayer-cvslog
mailing list