Mercurial > mplayer.hg
changeset 12632:80973aa180a5
ranlib cleanup by Dan Christiansen
| author | alex |
|---|---|
| date | Thu, 24 Jun 2004 12:52:17 +0000 |
| parents | 6cbccc0c7d7b |
| children | 702b39f72394 |
| files | Gui/Makefile Makefile configure darwinfixlib.sh input/Makefile liba52/Makefile libaf/Makefile libao2/Makefile libfaad2/Makefile libmenu/Makefile libmpdemux/Makefile libmpdvdkit2/Makefile libmpeg2/Makefile loader/Makefile mp3lib/Makefile osdep/Makefile postproc/Makefile vidix/Makefile |
| diffstat | 18 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/Gui/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -27,6 +27,7 @@ $(LIB): .depend $(OBJS) rm -f $(LIB) $(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS) + $(RANLIB) $(LIB) all: $(LIB)
--- a/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -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
--- a/configure Thu Jun 24 12:01:53 2004 +0000 +++ b/configure Thu Jun 24 12:52:17 2004 +0000 @@ -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 ######################
--- a/darwinfixlib.sh Thu Jun 24 12:01:53 2004 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 Thu Jun 24 12:01:53 2004 +0000 +++ b/input/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -16,6 +16,7 @@ $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) + $(RANLIB) $(LIBNAME) all: $(LIBNAME)
--- a/liba52/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/liba52/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -17,6 +17,7 @@ $(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 Thu Jun 24 12:01:53 2004 +0000 +++ b/libaf/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -19,6 +19,7 @@ $(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 Thu Jun 24 12:01:53 2004 +0000 +++ b/libao2/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -17,6 +17,7 @@ $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) + $(RANLIB) $(LIBNAME) all: $(LIBNAME)
--- a/libfaad2/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/libfaad2/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -17,6 +17,7 @@ $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) + $(RANLIB) $(LIBNAME) all: $(LIBNAME)
--- a/libmenu/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/libmenu/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -20,6 +20,7 @@ $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) + $(RANLIB) $(LIBNAME) all: $(LIBNAME)
--- a/libmpdemux/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/libmpdemux/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -57,6 +57,7 @@ $(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 Thu Jun 24 12:01:53 2004 +0000 +++ b/libmpdvdkit2/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -33,6 +33,7 @@ $(LIB).a: $(OBJS) $(AR) rc $(LIB).a $(OBJS) + $(RANLIB) $(LIB).a $(LIB).so: $(OBJS) $(CC) -o $(LIB).so -shared -rdynamic $(OBJS)
--- a/libmpeg2/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/libmpeg2/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -22,6 +22,7 @@ $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) + $(RANLIB) $(LIBNAME) all: $(LIBNAME)
--- a/loader/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/loader/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -36,6 +36,7 @@ ./loader_objfix.sh endif $(AR) -r libloader.a $(LIB_OBJECTS) stubs.o + $(RANLIB) libloader.a dep: echo "dependency not required/supported"
--- a/mp3lib/Makefile Thu Jun 24 12:01:53 2004 +0000 +++ b/mp3lib/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -47,6 +47,8 @@ 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 Thu Jun 24 12:01:53 2004 +0000 +++ b/osdep/Makefile Thu Jun 24 12:52:17 2004 +0000 @@ -41,6 +41,7 @@ $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) + $(RANLIB) $(LIBNAME) all: $(LIBNAME)