[MPlayer-dev-eng] [PATCH] Makefile cleanups

[Mark Szabo]

Hi,

I have done some cleanups in the Makefile. A patch is attached.

-- 
Mark Szabo (Mw3)
mw3 at bsd.hu
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.184
diff -u -r1.184 Makefile
--- Makefile	3 May 2002 22:05:46 -0000	1.184
+++ Makefile	5 May 2002 19:50:19 -0000
@@ -32,14 +32,10 @@
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
-ifeq ($(VO2),yes)
-VO_LIBS = -Llibvo2 -lvo2
-VO_INC = -Ilibvo2
-else
 VO_LIBS = -Llibvo -lvo
 VO_INC = -Ilibvo
-endif
-V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
+
+V_LIBS = $(X_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
 
 AO_LIBS = -Llibao2 -lao2
 A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
@@ -51,15 +47,10 @@
 endif
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall
 
-PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc input libmpdvdkit
+PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc input libmpdvdkit libvo
 ifeq ($(VIDIX),yes)
 PARTS += libdha vidix
 endif
-ifeq ($(VO2),yes)
-PARTS += libvo2
-else
-PARTS += libvo
-endif
 
 ifeq ($(GUI),yes)
 PARTS += Gui
@@ -91,16 +82,11 @@
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a
+COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a libvo/libvo.a
 
 ifeq ($(VIDIX),yes)
 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
 endif
-ifeq ($(VO2),yes)
-COMMON_DEPS += libvo2/libvo2.a
-else
-COMMON_DEPS += libvo/libvo.a
-endif
 ifeq ($(FAME),yes)
 COMMON_DEPS += libfame/libfame.a
 endif
@@ -130,15 +116,9 @@
 libmpcodecs/libmpcodecs.a:
 	$(MAKE) -C libmpcodecs
 
-loader/DirectShow/libDS_Filter.a:
-	$(MAKE) -C loader/DirectShow
-
 loader/dshow/libDS_Filter.a:
 	$(MAKE) -C loader/dshow
 
-libmp1e/libmp1e.a:
-	$(MAKE) -C libmp1e
-
 libavcodec/libavcodec.a:
 	$(MAKE) -C libavcodec
 
@@ -147,9 +127,6 @@
 
 libvo/libvo.a:
 	$(MAKE) -C libvo
-
-libvo2/libvo2.a:
-	$(MAKE) -C libvo2
 
 libao2/libao2.a:
 	$(MAKE) -C libao2