From 0fc20ac930e3d3f7f76caedbc526746d43658818 Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 24 Jun 2004 12:52:17 +0000
Subject: ranlib cleanup by Dan Christiansen

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12633 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Gui/Makefile          |  1 +
 Makefile              |  3 ---
 configure             |  2 ++
 darwinfixlib.sh       | 11 -----------
 input/Makefile        |  1 +
 liba52/Makefile       |  1 +
 libaf/Makefile        |  1 +
 libao2/Makefile       |  1 +
 libfaad2/Makefile     |  1 +
 libmenu/Makefile      |  1 +
 libmpdemux/Makefile   |  1 +
 libmpdvdkit2/Makefile |  1 +
 libmpeg2/Makefile     |  1 +
 loader/Makefile       |  1 +
 mp3lib/Makefile       |  2 ++
 osdep/Makefile        |  1 +
 postproc/Makefile     |  1 +
 vidix/Makefile        |  2 +-
 18 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100755 darwinfixlib.sh

diff --git a/Gui/Makefile b/Gui/Makefile
index 9da3353d95..1fd87559fe 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -27,6 +27,7 @@ OBJS = $(SRCS:.c=.o)
 $(LIB):	.depend	$(OBJS)
 	rm -f $(LIB)
 	$(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS)
+	$(RANLIB) $(LIB)
 
 all:	$(LIB)
 
diff --git a/Makefile b/Makefile
index 287d07ea0f..ac94103350 100644
--- a/Makefile
+++ b/Makefile
@@ -208,7 +208,6 @@ OBJS_MPLAYER += mplayer-rc.o
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	./darwinfixlib.sh $(MPLAYER_DEP)
     ifeq ($(TARGET_WIN32),yes)
 	windres -o mplayer-rc.o mplayer.rc
     endif
@@ -223,12 +222,10 @@ mplayer.exe.so:	$(MPLAYER_DEP) mplayer.exe.spec.c
 	$(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
 
diff --git a/configure b/configure
index 65f0cd11dd..4ae51590a7 100755
--- a/configure
+++ b/configure
@@ -1892,6 +1892,8 @@ fi
 # 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
 
 ######################
diff --git a/darwinfixlib.sh b/darwinfixlib.sh
deleted file mode 100755
index 6196ebd8aa..0000000000
--- a/darwinfixlib.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-if [ `uname -s` = 'Darwin' ]; then
-  echo "Fixing libs with ranlib for Darwin (MacOSX)"
-  for i in $* ; do
-    if (echo $i | grep \\.a) >/dev/null 2>&1; then
-      echo "ranlib $i"
-      (ranlib $i) >/dev/null 2>&1
-    fi
-  done
-fi
-exit 0
diff --git a/input/Makefile b/input/Makefile
index bc4a720811..e0d6890cbd 100644
--- a/input/Makefile
+++ b/input/Makefile
@@ -16,6 +16,7 @@ CFLAGS  = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
diff --git a/liba52/Makefile b/liba52/Makefile
index 63cb29d3ef..ed5d1cffc6 100644
--- a/liba52/Makefile
+++ b/liba52/Makefile
@@ -17,6 +17,7 @@ CFLAGS  = $(MLIB_INC) $(OPTFLAGS)
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 test:        $(LIBNAME) test.c
 	$(CC) $(CFLAGS)  test.c ../cpudetect.c -o test ./liba52.a -lm
diff --git a/libaf/Makefile b/libaf/Makefile
index f0864dcc19..2abee8c79e 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -19,6 +19,7 @@ endif
 
 $(LIBNAME):     $(OBJS) Makefile
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 $(OBJS):af.h control.h dsp.h filter.h window.h af_mp.h
 
diff --git a/libao2/Makefile b/libao2/Makefile
index 2b1eb3f6b1..1fdd7f4c77 100644
--- a/libao2/Makefile
+++ b/libao2/Makefile
@@ -17,6 +17,7 @@ CFLAGS  = $(OPTFLAGS) -I. -I.. $(ARTS_INC) $(ESD_INC) $(SDL_INC) $(X11_INC) $(EX
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
diff --git a/libfaad2/Makefile b/libfaad2/Makefile
index 6e8e5ab93b..ad9716cd60 100644
--- a/libfaad2/Makefile
+++ b/libfaad2/Makefile
@@ -17,6 +17,7 @@ CFLAGS  = -I. $(OPTFLAGS)
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:	$(LIBNAME)
 
diff --git a/libmenu/Makefile b/libmenu/Makefile
index d0649918c5..5a7996d284 100644
--- a/libmenu/Makefile
+++ b/libmenu/Makefile
@@ -20,6 +20,7 @@ CFLAGS  = $(OPTFLAGS) -I. -I.. -I../libmpcodecs $(EXTRA_INC) -Wall
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 1a2b18dc72..0d23886c27 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -57,6 +57,7 @@ all:	$(LIBNAME)
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 test:	$(LIBNAME) test.c
 	$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test ./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o ../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o ../m_option.o ../subreader.o $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
diff --git a/libmpdvdkit2/Makefile b/libmpdvdkit2/Makefile
index d03dd63a0d..0fb8bf8c73 100644
--- a/libmpdvdkit2/Makefile
+++ b/libmpdvdkit2/Makefile
@@ -33,6 +33,7 @@ default: $(LIB).a
 
 $(LIB).a: $(OBJS)
 	$(AR) rc $(LIB).a $(OBJS)
+	$(RANLIB) $(LIB).a
 
 $(LIB).so: $(OBJS)
 	$(CC) -o $(LIB).so -shared -rdynamic $(OBJS)
diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile
index e9bbba3dc3..b7e93d796b 100644
--- a/libmpeg2/Makefile
+++ b/libmpeg2/Makefile
@@ -22,6 +22,7 @@ endif
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:	$(LIBNAME)
 
diff --git a/loader/Makefile b/loader/Makefile
index ebf576c89d..1947d1f451 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -36,6 +36,7 @@ ifeq ($(TARGET_OS),OpenBSD)
 	./loader_objfix.sh
 endif
 	$(AR) -r libloader.a $(LIB_OBJECTS) stubs.o
+	$(RANLIB) libloader.a
 
 dep:
 	echo "dependency not required/supported"
diff --git a/mp3lib/Makefile b/mp3lib/Makefile
index 5399c4663b..508d576358 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -47,6 +47,8 @@ decode_i586.o: decode_i586.c
 
 libMP3.a:	$(OBJS)
 	$(AR) r libMP3.a $(OBJS)
+	$(RANLIB) libMP3.a
+
 test1:	libMP3.a test.c
 	$(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. ./libMP3.a ../mp_msg-mencoder.o ../cpudetect.o -lm
 
diff --git a/osdep/Makefile b/osdep/Makefile
index 6460c0f7d1..d0f99220f1 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -41,6 +41,7 @@ CFLAGS  = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
 
 $(LIBNAME):     $(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)
 
 all:    $(LIBNAME)
 
diff --git a/postproc/Makefile b/postproc/Makefile
index 9dc3eb604b..b030c72854 100644
--- a/postproc/Makefile
+++ b/postproc/Makefile
@@ -20,6 +20,7 @@ all:    $(SWSLIB)
 
 $(SWSLIB):     $(SWSOBJS)
 	$(AR) r $(SWSLIB) $(SWSOBJS)
+	$(RANLIB) $(SWSLIB)
 
 clean:
 	rm -f *.o *.a *~ *.so cs_test swscale-example
diff --git a/vidix/Makefile b/vidix/Makefile
index ae2c65f5e7..a99d6e76e8 100644
--- a/vidix/Makefile
+++ b/vidix/Makefile
@@ -21,7 +21,7 @@ all:	$(SUBDIRS) $(LIBNAME)
 
 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
-
+	$(RANLIB) $(LIBNAME)
 
 clean:
 	rm -f *.o *.a *~
-- 
cgit v1.2.3