summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-07 17:49:37 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-07 17:49:37 +0000
commit6a2cfc6f1f03b357225fee9dbb337973611f8bba (patch)
tree21362ecdaed1f0d04a7e5ba37f8ba58c0dc8b186 /Makefile
parent74baa9693923726f3730dd2cf6dc0c2af5f17fec (diff)
downloadmpv-6a2cfc6f1f03b357225fee9dbb337973611f8bba.tar.bz2
mpv-6a2cfc6f1f03b357225fee9dbb337973611f8bba.tar.xz
fix incomplete abs->rel path conversion
also added missing make distclean for libpostproc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17765 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 682e8ad781..eca3386713 100644
--- a/Makefile
+++ b/Makefile
@@ -161,9 +161,6 @@ endif
PARTS = libmpdemux \
libmpcodecs \
- libavutil \
- libavcodec \
- libavformat \
libao2 \
osdep \
postproc \
@@ -532,6 +529,10 @@ distclean: clean doxygen_clean
-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 @@ depend: help_mp.h
./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