libs: Get rid of the symlinks for the static libs.
This commit is contained in:
parent
eb8a40c368
commit
645cd6ff50
|
@ -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@
|
||||
|
|
|
@ -13,9 +13,7 @@ INSTALLSUBDIRS = \
|
|||
wine
|
||||
|
||||
SYMLINKS = \
|
||||
libwine.$(LIBEXT) \
|
||||
libwine_port.a \
|
||||
libwpp.a
|
||||
libwine.$(LIBEXT)
|
||||
|
||||
@MAKE_RULES@
|
||||
|
||||
|
@ -34,18 +32,9 @@ clean::
|
|||
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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue