# HG changeset patch
# User michael
# Date 1110540871 0
# Node ID 50e07cfe1e4f8a9b4f517d2c3b64492171772cbf
# Parent  d7109f709265a8c92d0fe33fb9703de962e3896e
fix lib order and remove nonsense avcodec double linking

diff -r d7109f709265 -r 50e07cfe1e4f Makefile
--- a/Makefile	Wed Mar 09 02:12:44 2005 +0000
+++ b/Makefile	Fri Mar 11 11:34:31 2005 +0000
@@ -55,8 +55,6 @@
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
 PPOBJS+= beosaudio.o
 EXTRALIBS+=-lbe -lmedia
-# this should be the default !
-EXTRALIBS+=-lavcodec -L../libavcodec
 endif
 
 ifeq ($(CONFIG_NETWORK),yes)
@@ -78,11 +76,11 @@
 LIB= $(LIBPREF)avformat$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 SLIB= $(SLIBPREF)avformat$(SLIBSUF)
+
+AVCLIBS+=-lavcodec -L../libavcodec
+ifeq ($(CONFIG_MP3LAME),yes)
+AVCLIBS+=-lmp3lame
 endif
-
-EXTRALIBS+=-lavcodec -L../libavcodec
-ifeq ($(CONFIG_MP3LAME),yes)
-EXTRALIBS+=-lmp3lame
 endif
 
 SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
@@ -96,10 +94,10 @@
 
 $(SLIB): $(OBJS)
 ifeq ($(CONFIG_WIN32),yes)
-	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
+	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
 	-lib /machine:i386 /def:$(@:.dll=.def)
 else
-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
+	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
 endif
 
 depend: $(SRCS)