ranlib cleanup by Dan Christiansen

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12633 b3059339-0415-0410-9bf9-f77b7e298cf2
2025-03-20 02:09:52 +00:00 · 2004-06-24 12:52:17 +00:00 · 2004-06-24 12:52:17 +00:00 · 0fc20ac930
commit 0fc20ac930
parent 310d9a47c1
18 changed files with 18 additions and 15 deletions
--- 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)

--- a/3
+++ b/3
@ -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

--- a/2
+++ b/2
@ -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

 ######################
--- a/darwinfixlib.sh
+++ b/darwinfixlib.sh
@ -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
--- 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)

--- 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
--- 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

--- 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)

--- a/libfaad2/Makefile
+++ b/libfaad2/Makefile
@ -17,6 +17,7 @@ CFLAGS  = -I. $(OPTFLAGS)

 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)

 all:	$(LIBNAME)

--- 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)

--- 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
--- 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)
--- a/libmpeg2/Makefile
+++ b/libmpeg2/Makefile
@ -22,6 +22,7 @@ endif

 $(LIBNAME):	$(OBJS)
 	$(AR) r $(LIBNAME) $(OBJS)
+	$(RANLIB) $(LIBNAME)

 all:	$(LIBNAME)

--- 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"
--- 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

--- 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)

--- 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
--- 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 *~