[MPlayer-dev-eng] [PATCH] libmpeg2 and libvo conflicts

[Steven M. Schultz]

Hi

	Additional conflicts appeared sooner than expected.   This morning
	the wrong version of libvo.a was used - there was an older version
	installed (from another package) in /usr/local/lib and that 
	version was used in preference over the one in libvo/libvo.a

	libmpeg2 also encountered a conflict for the same reason.
	
	So far libao2 does not conflict but it is just a matter of time I
	suspect

	All in all it's probably, since static linking is being used, 
	better to use "libXX/libXX.a"  instead of "-LlibXX -lXX"

	Cheers,
	Steven Schultz
	sms at 2bsd.com
-------------- next part --------------
--- Makefile.dist	Tue Jun 18 08:45:35 2002
+++ Makefile	Tue Jun 18 08:55:09 2002
@@ -39,18 +39,18 @@
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
 ifeq ($(VO2),yes)
-VO_LIBS = -Llibvo2 -lvo2
+VO_LIBS = libvo2/libvo2.a
 VO_INC = -Ilibvo2
 else
-VO_LIBS = -Llibvo -lvo
+VO_LIBS = libvo/libvo.a
 VO_INC = -Ilibvo
 endif
 V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
 
-AO_LIBS = -Llibao2 -lao2
+AO_LIBS = libao2/libao2.a
 A_LIBS = $(ALSA_LIB) $(ARTS_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
 
-CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Llibmpeg2 -lmpeg2 $(AV_LIB) $(FAME_LIB)
+CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 liba52/liba52.a libmpeg2/libmpeg2.a $(AV_LIB) $(FAME_LIB)
 COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux  $(NEW_INPUT_LIB)  $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB)  $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(GIF_LIB) $(CDPARANOIA_LIB) -lm
 ifeq ($(VIDIX),yes)
 MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix