[Mplayer-cvslog] CVS: main configure, 1.873, 1.874 Makefile, 1.288, 1.289 darwinfixlib.sh, 1.1, NONE

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv16243

Modified Files:
	configure Makefile 
Removed Files:
	darwinfixlib.sh 
Log Message:
ranlib cleanup by Dan Christiansen

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.873
retrieving revision 1.874
diff -u -r1.873 -r1.874
--- configure	24 Jun 2004 10:25:05 -0000	1.873
+++ configure	24 Jun 2004 12:52:14 -0000	1.874
@@ -1892,6 +1892,8 @@
 # If IRIX we must use ar instead of ranlib (not present on IRIX systems)
 if irix ; then
   _ranlib='ar -r'
+elif linux ; then
+  _ranlib='true'
 fi
 
 ######################

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- Makefile	18 Jun 2004 17:08:22 -0000	1.288
+++ Makefile	24 Jun 2004 12:52:14 -0000	1.289
@@ -208,7 +208,6 @@
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	./darwinfixlib.sh $(MPLAYER_DEP)
     ifeq ($(TARGET_WIN32),yes)
 	windres -o mplayer-rc.o mplayer.rc
     endif
@@ -223,12 +222,10 @@
 	$(CC) $(CFLAGS) -Wall -shared  -Wl,-rpath,/usr/local/lib -Wl,-Bsymbolic  -o mplayer.exe.so $(OBJS_MPLAYER) mplayer.exe.spec.c libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) -lwine -lm 
 
 mplayer_wine.so:	$(MPLAYER_DEP)
-	./darwinfixlib.sh $(MPLAYER_DEP)
 	$(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB) -lm
 
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
-	./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
 	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
 endif
 

--- darwinfixlib.sh DELETED ---