summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-01 11:39:37 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-01 11:39:37 +0000
commit32b0d3cd26bf8b3a81433f4f8ba71efe2db9c02d (patch)
treed7a523591aac684ee474bd96cd14f3eb4be17ec3 /Makefile
parentacc08a36ec38f27179a4b998eadbd1ac3d86e74e (diff)
downloadmpv-32b0d3cd26bf8b3a81433f4f8ba71efe2db9c02d.tar.bz2
mpv-32b0d3cd26bf8b3a81433f4f8ba71efe2db9c02d.tar.xz
libmpdvdkit/ and libmp1e/ are obsolete.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7219 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 2 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index a08e798fcb..7f94aafefb 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ MISC_LIBS += -Llibdha -ldha vidix/libvidix.a
endif
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(FREETYPE_INC) $(SDL_INC) # -Wall
-PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit libvo
+PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit2 libvo
ifeq ($(VIDIX),yes)
PARTS += libdha vidix
endif
@@ -94,13 +94,6 @@ endif
ifeq ($(FAME),yes)
COMMON_DEPS += libfame/libfame.a
endif
-ifeq ($(DVDKIT),yes)
-ifeq ($(DVDKIT_SHARED),yes)
-COMMON_DEPS += libmpdvdkit/libmpdvdkit.so
-else
-COMMON_DEPS += libmpdvdkit/libmpdvdkit.a
-endif
-endif
ifeq ($(DVDKIT2),yes)
ifeq ($(DVDKIT_SHARED),yes)
COMMON_DEPS += libmpdvdkit2/libmpdvdkit.so
@@ -109,12 +102,6 @@ COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
endif
endif
-libmpdvdkit/libmpdvdkit.a:
- $(MAKE) -C libmpdvdkit
-
-libmpdvdkit/libmpdvdkit.so:
- $(MAKE) -C libmpdvdkit libmpdvdkit.so
-
libmpdvdkit2/libmpdvdkit.a:
$(MAKE) -C libmpdvdkit2
@@ -136,9 +123,6 @@ libmpcodecs/libmpcodecs.a:
loader/dshow/libDS_Filter.a:
$(MAKE) -C loader/dshow
-libmp1e/libmp1e.a:
- $(MAKE) -C libmp1e
-
libavcodec/libavcodec.a:
$(MAKE) -C libavcodec
@@ -246,7 +230,7 @@ endif
ifeq ($(DVDKIT),yes)
ifeq ($(DVDKIT_SHARED),yes)
if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
- $(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+ $(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit2/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
endif
endif
ifeq ($(CSS_USE),yes)