# HG changeset patch # User henry # Date 1141753777 0 # Node ID 3858a365c3a0bc8f5b12a460753a068b7646689e # Parent 72f3e5e8d2a124cc552c39f2fbf3637d0e2bf6c2 fix incomplete abs->rel path conversion also added missing make distclean for libpostproc diff -r 72f3e5e8d2a1 -r 3858a365c3a0 Makefile --- a/Makefile Tue Mar 07 15:40:49 2006 +0000 +++ b/Makefile Tue Mar 07 17:49:37 2006 +0000 @@ -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