diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-03-02 16:00:43 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-03-02 16:00:43 +0000 |
| commit | 7aaa05ad169d681d526e16f760b62d093aa9317e (patch) | |
| tree | 6dbcdc4a025efbae8b48713dd6e19f218629be9b | |
| parent | a4171a41ce1bdd134777543a943325a1e8b301b3 (diff) | |
bug #258 Add support for shared libraries with three levels of versions,
i.e major, minor, and teeny.
| -rw-r--r-- | darwinLib.rules | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/darwinLib.rules b/darwinLib.rules index 64dc680..eeccc3c 100644 --- a/darwinLib.rules +++ b/darwinLib.rules @@ -43,7 +43,7 @@ XCOMM $XFree86: xc/config/cf/darwinLib.rules,v 1.9 2003/10/11 09:40:12 herrb Exp install:: Concat(lib,libname.rev.dylib) @@\ MakeDir($(DESTDIR)dest) @@\ $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\ - @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ + @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) && \ @@\ $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) @@\ @if $(SOSYMLINK); then (set -x; \ @@\ @@ -62,7 +62,7 @@ AllTarget(Concat(lib,libname.rev.dylib)) @@\ @@\ Concat(lib,libname.rev.dylib): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ - @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ + @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\ $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ @@ -76,7 +76,7 @@ Concat(lib,libname.rev.dylib): solist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ + @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) @@ -91,7 +91,7 @@ AllTarget(Concat(lib,libname.rev.dylib)) @@\ @@\ Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ - @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ + @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\ $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ @@ -105,7 +105,7 @@ Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ + @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) @@ -120,7 +120,7 @@ AllTarget(Concat(lib,libname.rev.dylib)) @@\ @@\ Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ - @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ + @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ set -x; (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\ $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ @@ -134,7 +134,7 @@ Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ + @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) |