summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-03 01:42:02 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-03 01:42:02 +0000
commit70af3967c4eba2ce8391764adf0edcfdeb53409e (patch)
treebf344fc2abb65362cbfed08a352e5c20fb19c649 /Makefile
parenteaff4aad661a39f7997b3265a8e1fffc24387aa4 (diff)
downloadmpv-70af3967c4eba2ce8391764adf0edcfdeb53409e.tar.bz2
mpv-70af3967c4eba2ce8391764adf0edcfdeb53409e.tar.xz
finally fixed no-opendivx compile problem
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4492 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 1 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 80c736bb0d..c62c9c9565 100644
--- a/Makefile
+++ b/Makefile
@@ -95,11 +95,8 @@ all: $(ALL_PRG)
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-COMMON_DEPS = g72x/libg72x.a libmpdemux/libmpdemux.a libao2/libao2.a libac3/libac3.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+COMMON_DEPS = g72x/libg72x.a libmpdemux/libmpdemux.a libao2/libao2.a libac3/libac3.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a opendivx/libdecore.a xa/libxa.a
-ifeq ($(OPENDIVX),yes)
-COMMON_DEPS += opendivx/libdecore.a
-endif
ifeq ($(VIDIX),yes)
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
endif
@@ -151,9 +148,6 @@ mp3lib/libMP3.a:
opendivx/libdecore.a:
$(MAKE) -C opendivx
-opendivx/postprocess.o:
- $(MAKE) -C opendivx
-
libdha/libdha.so:
$(MAKE) -C libdha