Commit 3b2c2cdb authored by Alexandre Julliard's avatar Alexandre Julliard

libs: Get rid of the libwine symlinks.

parent 523e46de
......@@ -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:
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment