Commit 645cd6ff authored by Alexandre Julliard's avatar Alexandre Julliard

libs: Get rid of the symlinks for the static libs.

parent eb8a40c3
...@@ -82,7 +82,8 @@ RC16FLAGS = -O res16 $(RCFLAGS) ...@@ -82,7 +82,8 @@ RC16FLAGS = -O res16 $(RCFLAGS)
LDPATH = @LDPATH@ LDPATH = @LDPATH@
DLLDIR = $(TOPOBJDIR)/dlls DLLDIR = $(TOPOBJDIR)/dlls
LIBDIR = $(TOPOBJDIR)/libs LIBDIR = $(TOPOBJDIR)/libs
LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port LIBPORT = $(TOPOBJDIR)/libs/port/libwine_port.a
LIBWPP = $(TOPOBJDIR)/libs/wpp/libwpp.a
LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine
@SET_MAKE@ @SET_MAKE@
......
...@@ -13,9 +13,7 @@ INSTALLSUBDIRS = \ ...@@ -13,9 +13,7 @@ INSTALLSUBDIRS = \
wine wine
SYMLINKS = \ SYMLINKS = \
libwine.$(LIBEXT) \ libwine.$(LIBEXT)
libwine_port.a \
libwpp.a
@MAKE_RULES@ @MAKE_RULES@
...@@ -34,18 +32,9 @@ clean:: ...@@ -34,18 +32,9 @@ clean::
libwine.so libwine.so.1 libwine.dll libwine.dylib libwine.1.dylib libwine.a: wine/libwine.$(LIBEXT) libwine.so libwine.so.1 libwine.dll libwine.dylib libwine.1.dylib libwine.a: wine/libwine.$(LIBEXT)
$(RM) $@ && $(LN_S) wine/$@ $@ $(RM) $@ && $(LN_S) wine/$@ $@
libwine_port.a: port/libwine_port.a
$(RM) $@ && $(LN_S) port/$@ $@
libwpp.a: wpp/libwpp.a
$(RM) $@ && $(LN_S) wpp/$@ $@
# Directory dependencies # Directory dependencies
wine/libwine.$(LIBEXT): wine wine/libwine.$(LIBEXT): wine
port/libwine_port.a: port wine wine/__install__ wine/__install-lib__: port
wpp/libwpp.a: wpp
wine wine/__install__ wine/__install-lib__: libwine_port.a
### Dependencies: ### Dependencies:
...@@ -27,8 +27,8 @@ all: $(PROGRAMS) $(MANPAGES) ...@@ -27,8 +27,8 @@ all: $(PROGRAMS) $(MANPAGES)
@MAKE_RULES@ @MAKE_RULES@
widl$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a widl$(EXEEXT): $(OBJS) $(LIBWPP)
$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_port $(LEXLIB) $(LDFLAGS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
parser.tab.c parser.tab.h: parser.y parser.tab.c parser.tab.h: parser.y
$(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c
......
...@@ -26,8 +26,8 @@ all: $(PROGRAMS) $(MANPAGES) ...@@ -26,8 +26,8 @@ all: $(PROGRAMS) $(MANPAGES)
@MAKE_RULES@ @MAKE_RULES@
wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a wrc$(EXEEXT): $(OBJS) $(LIBWPP)
$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR)/wpp -lwpp $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
parser.tab.c parser.tab.h: parser.y parser.tab.c parser.tab.h: parser.y
$(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c
......
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