use dir/libname.a instead of -Ldir -lname

partially done by "Steven M. Schultz" <sms@2BSD.COM>
Note: some entries (libmpdvdkit, libdha) left unchanged as they may be
dynamic and not shipped with mplayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7149 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile

@@ -38,17 +38,17 @@ SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c mp-opt-reg.c
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
-VO_LIBS = -Llibvo -lvo
+VO_LIBS = libvo/libvo.a
 VO_INC = -Ilibvo
 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) $(XVID_LIB)
-COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux  -Linput -linput $(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) $(FREETYPE_LIB) -lm
+CODEC_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(AV_LIB) $(FAME_LIB) $(XVID_LIB)
+COMMON_LIBS = $(CODEC_LIBS) libmpdemux/libmpdemux.a  input/libinput.a $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) postproc/libpostproc.a $(DECORE_LIB) linux/libosdep.a $(TERMCAP_LIB)  $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(GIF_LIB) $(CDPARANOIA_LIB) $(FREETYPE_LIB) -lm
 ifeq ($(VIDIX),yes)
-MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix
+MISC_LIBS += -Llibdha -ldha vidix/libvidix.a
 endif
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(FREETYPE_INC) # -Wall
 
@@ -181,12 +181,12 @@ MENCODER_DEP = $(OBJS_MENCODER) $(LOADER_DEP) $(MP1E_DEP) $(AV_DEP) $(COMMON_DEP
 ifeq ($(GUI),yes)
 MPLAYER_DEP += Gui/libgui.a
 MENCODER_DEP += Gui/libgui.a
-GUI_LIBS = -LGui -lgui
+GUI_LIBS = Gui/libgui.a
 endif
 
 VIDIX_LIBS =
 ifeq ($(VIDIX),yes)
-VIDIX_LIBS += -Lvidix -lvidix
+VIDIX_LIBS += vidix/libvidix.a
 endif
 
 $(PRG):	$(MPLAYER_DEP)
@@ -199,7 +199,7 @@ $(PRG_FIBMAP): fibmap_mplayer.o
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
 	./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpcodecs -lmpencoders $(COMMON_LIBS) $(EXTRA_LIB) $(ENCORE_LIB) $(MLIB_LIB) $(LIRC_LIB)
+	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(COMMON_LIBS) $(EXTRA_LIB) $(ENCORE_LIB) $(MLIB_LIB) $(LIRC_LIB)
 endif
 
 # Every mplayer dependency depends on version.h, to force building version.h

configure

@@ -2820,7 +2820,7 @@ fi
 if test "$_mp1e" != no ; then
   _mp1e=yes
   _def_mp1e='#define USE_MP1E'
-  _ld_mp1e="-Llibmp1e -lmp1e"
+  _ld_mp1e='libmp1e/libmp1e.a'
   _dep_mp1e='libmp1e/libmp1e.a'
 else
   _mp1e=no
@@ -2854,8 +2854,8 @@ fi
 _def_fame='#undef USE_LIBFAME'
 if test "$_fame" = yes ; then
   _def_fame='#define USE_LIBFAME 1'	
-  _ld_fame='-Llibfame -lfame'	
-fi  
+  _ld_fame='libfame/libfame.a'
+fi
 
 
 #########
@@ -3370,7 +3370,7 @@ if test "$_win32" = auto ; then
 fi
 if test "$_win32" = yes ; then
   _def_win32='#define USE_WIN32DLL 1'
-  _ld_win32='-Lloader -lloader'
+  _ld_win32='loader/libloader.a'
   _dep_win32='loader/libloader.a'
   _codecmodules="win32 $_codecmodules"
   echores "yes (using $_win32libdir)"
@@ -3430,7 +3430,7 @@ echores "$_dshow"
 
 if test "$_dshow" = yes ; then
   _def_dshow='#define USE_DIRECTSHOW 1'
-  _ld_dshow='-Lloader/dshow -lDS_Filter'
+  _ld_dshow='loader/dshow/libDS_Filter.a'
   _dep_dshow='loader/dshow/libDS_Filter.a'
   _codecmodules="directshow $_codecmodules"
 else
@@ -3652,7 +3652,7 @@ _def_libavcodecso='#undef USE_LIBAVCODEC_SO'
 _def_ffpostprocess='#undef FF_POSTPROCESS'
 if test "$_libavcodec" = yes ; then
   _def_libavcodec='#define USE_LIBAVCODEC 1'
-  _ld_libavcodec='-Llibavcodec -lavcodec'
+  _ld_libavcodec='libavcodec/libavcodec.a'
   _dep_libavcodec='libavcodec/libavcodec.a'
   _def_ffpostprocess='#define FF_POSTPROCESS 1'
   _codecmodules="libavcodec $_codecmodules"
@@ -3798,7 +3798,7 @@ if cc_check -lm -ldivxdecore -lm ; then
 elif test "$_opendivx" != no ; then
   _divx4linux=no
   _opendivx=yes
-  _ld_decore='-Lopendivx -ldecore'
+  _ld_decore='opendivx/libdecore.a'
   _def_decore='#undef NEW_DECORE'
   _def_divx='#define USE_DIVX'
   _def_divx5='#undef DECORE_DIVX5'

liba52/Makefile

@@ -19,10 +19,10 @@ $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
 
 test:        $(LIBNAME) test.c
-	$(CC) $(CFLAGS)  test.c ../cpudetect.c -o test -L. -la52 -lm
+	$(CC) $(CFLAGS)  test.c ../cpudetect.c -o test ./liba52.a -lm
 
 test2:        $(LIBNAME) test.c
-	$(CC) $(CFLAGS) test.c -o test2 -L../libac3 -lac3 -L. -la52
+	$(CC) $(CFLAGS) test.c -o test2 ../libac3/libac3.a ./liba52.a -lm
 
 all:	$(LIBNAME)
 

libmpdemux/Makefile

@@ -39,7 +39,7 @@ $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
 
 test:	$(LIBNAME) test.c
-	$(CC) $(CFLAGS) test.c ../mp_msg.c ../linux/shmem.c -o test -L. -lmpdemux -ldvdread -lz -lpthread
+	$(CC) $(CFLAGS) test.c ../mp_msg.c ../linux/shmem.c -o test ./libmpdemux.a -ldvdread -lz -lpthread
 
 clean:
 	rm -f *.o *.a *~

loader/dshow/Makefile

@@ -23,7 +23,7 @@ $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
 
 test:   test.c $(LIBNAME)
-	$(CC) test.c $(CFLAGS) -o test -L. -lDS_Filter -L.. -lloader $(ARCH_LIBS) -lstdc++
+	$(CC) test.c $(CFLAGS) -o test ./libDS_Filter.a ../libloader.a $(ARCH_LIBS) -lstdc++
 
 all:	$(LIBNAME)
 

mp3lib/Makefile

@@ -42,10 +42,10 @@ ifeq ($(TARGET_OS),OpenBSD)
 	./mp3lib_objfix.sh
 endif
 test1:	libMP3.a test.c
-	$(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. -L. -lMP3 -lm
+	$(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. ./libMP3.a -lm
 
 test2:	libMP3.a test2.c
-	$(CC) $(CFLAGS) test2.c ../libvo/aclib.c -o test2 -I.. -L. -lMP3 -lm
+	$(CC) $(CFLAGS) test2.c ../libvo/aclib.c -o test2 -I.. ./libMP3.a -lm
 
 all:	libMP3.a