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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 645cd6ff504be366db70f65243173252a202409f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=645cd6ff504be366db70f652...

Author: Alexandre Julliard 
Date:   Tue Jul 11 19:33:48 2006 +0200

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

---

Make.rules.in          |    3 ++-
 libs/Makefile.in       |   15 ++-------------
 tools/widl/Makefile.in |    4 ++--
 tools/wrc/Makefile.in  |    4 ++--
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index dea5fd0..6255888 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -82,7 +82,8 @@ RC16FLAGS    = -O res16 $(RCFLAGS)
 LDPATH       = @LDPATH@
 DLLDIR       = $(TOPOBJDIR)/dlls
 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

@SET_MAKE@
diff --git a/libs/Makefile.in b/libs/Makefile.in
index 7c513f6..ae5d5c7 100644
--- a/libs/Makefile.in
+++ b/libs/Makefile.in
@@ -13,9 +13,7 @@ INSTALLSUBDIRS = \
    wine

SYMLINKS = \
-	libwine.$(LIBEXT) \
-	libwine_port.a \
-	libwpp.a
+	libwine.$(LIBEXT)

@MAKE_RULES@

@@ -34,18 +32,9 @@ # Symlinks
 libwine.so libwine.so.1 libwine.dll libwine.dylib libwine.1.dylib libwine.a: wine/libwine.$(LIBEXT)
    $(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

wine/libwine.$(LIBEXT): wine
-port/libwine_port.a: port
-wpp/libwpp.a: wpp
-
-wine wine/__install__ wine/__install-lib__: libwine_port.a
+wine wine/__install__ wine/__install-lib__: port

### Dependencies:
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index fa0ebed..e2bd0cc 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -27,8 +27,8 @@ all: $(PROGRAMS) $(MANPAGES)

@MAKE_RULES@

-widl$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_port $(LEXLIB) $(LDFLAGS)
+widl$(EXEEXT): $(OBJS) $(LIBWPP)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LEXLIB) $(LDFLAGS)

parser.tab.c parser.tab.h: parser.y
    $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index b58c67e..5985502 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -26,8 +26,8 @@ all: $(PROGRAMS) $(MANPAGES)

@MAKE_RULES@

-wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR)/wpp -lwpp $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
+wrc$(EXEEXT): $(OBJS) $(LIBWPP)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBWINE) $(LIBPORT) $(LEXLIB) $(LDFLAGS)

parser.tab.c parser.tab.h: parser.y
    $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c