Module: wine Branch: master Commit: 3b2c2cdbb3995abddd660f1f569e27f0055ad206 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b2c2cdbb3995abddd660f1f...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jul 11 21:32:52 2006 +0200
libs: Get rid of the libwine symlinks.
---
libs/Makefile.in | 16 +--------------- tools/winewrapper | 8 ++++---- 2 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/libs/Makefile.in b/libs/Makefile.in index ae5d5c7..3b17bd1 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -12,29 +12,15 @@ SUBDIRS = \ INSTALLSUBDIRS = \ wine
-SYMLINKS = \ - libwine.$(LIBEXT) - @MAKE_RULES@
-ALL_SYMLINKS = $(SYMLINKS) $(SYMLINKS:.so=.so.1) $(SYMLINKS:.dylib=.1.dylib) $(SYMLINKS:.dll=.a) - -all: $(SUBDIRS) $(ALL_SYMLINKS) +all: $(SUBDIRS)
install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__)
-clean:: - $(RM) $(ALL_SYMLINKS) - -# Symlinks - -libwine.so libwine.so.1 libwine.dll libwine.dylib libwine.1.dylib libwine.a: wine/libwine.$(LIBEXT) - $(RM) $@ && $(LN_S) wine/$@ $@ - # Directory dependencies
-wine/libwine.$(LIBEXT): wine wine wine/__install__ wine/__install-lib__: port
### Dependencies: diff --git a/tools/winewrapper b/tools/winewrapper index 9bf58d5..13be936 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -66,17 +66,17 @@ if [ "`uname -s`" = "Darwin" ] then if [ -n "$DYLD_LIBRARY_PATH" ] then - DYLD_LIBRARY_PATH="$topdir/libs:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="$topdir/libs/wine:$DYLD_LIBRARY_PATH" else - DYLD_LIBRARY_PATH="$topdir/libs" + DYLD_LIBRARY_PATH="$topdir/libs/wine" fi export DYLD_LIBRARY_PATH else if [ -n "$LD_LIBRARY_PATH" ] then - LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$topdir/libs/wine:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$topdir/libs" + LD_LIBRARY_PATH="$topdir/libs/wine" fi export LD_LIBRARY_PATH fi