[MPlayer-dev-eng] liba52

[Bohdan Horst]

imho in Makefile  local/native libs should be placed before external to
avoiid conflict

here is my proposal (need be checked/discussed ;)


--- Makefile	Sun Dec  9 22:56:56 2001
+++ /root/src/Makefile	Mon Dec 10 00:13:44 2001
@@ -28,17 +28,23 @@
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) # -Wall
-VO_LIBS = -Llibvo -lvo $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
+VO_LIBS = $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
+NATIVE_LIBS = -Llibvo -lvo
 ifeq ($(VO2),yes)
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo2 $(EXTRA_INC) # -Wall
-VO_LIBS = -Llibvo2 -lvo2 $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB)
+VO_LIBS = $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB)
+NATIVE_LIBS = -Llibvo2 -lvo2
 endif
 
-A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 -Lliba52 -la52 $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
+A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
+NATIVE_LIBS += -Lmp3lib -lMP3 -Llibac3 -lac3 -Lliba52 -la52
 
-OSDEP_LIBS = -Llinux -losdep
-PP_LIBS = -Lpostproc -lpostproc
-XA_LIBS = -Lxa -lxa
+NATIVE_LIBS += -Llinux -losdep
+NATIVE_LIBS += -Lpostproc -lpostproc
+NATIVE_LIBS += -Lxa -lxa
+NATIVE_LIBS += -Llibmpdemux -lmpdemux
+NATIVE_LIBS += -Llibmp1e -lmp1e
+NATIVE_LIBS += -Llibmpeg2 -lmpeg2
 
 # SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER)
 # OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
@@ -151,15 +157,16 @@
 MENCODER_DEP += Gui/libgui.a
 endif
 
+
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -Llibmp1e -lmp1e $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) -lm
+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(NATIVE_LIBS) -Llibao2 -lao2 $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) -lm
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
 
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux -Llibmp1e -lmp1e $(X_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm
+	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(NATIVE_LIBS) $(X_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm
 
 endif
 

-- 
 / irl:Bohdan 'Nexus' Horst | mailto:nexus at irc.pl | irc:Nexus \
{---------------------------^----------v----------^------------}
 \ http://www.physd.amu.edu.pl/~nexus/ | Instytut Fizyki  UAM /