ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use libwine and libwine_unicode directly from their build directory 

instead of using symlinks.
This commit is contained in:
Alexandre Julliard 2000-12-06 00:05:14 +00:00
parent b018239fef
commit e2222fd8ff
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/Makedll.rules.in
View File

@ -16,7 +16,7 @@ IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT))
ALLNAMES = lib$(MODULE).so $(ALTNAMES:%=lib%.so)
SPEC_SRCS = $(ALTNAMES:%=%.spec)
ALL_OBJS = $(MODULE).spec.o $(OBJS)
ALL_LIBS = -L$(TOPOBJDIR) -lwine $(EXTRALIBS) $(LIBS)
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%=lib%.$(LIBEXT))

2
dlls/comctl32/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = comctl32
EXTRALIBS = -lwine_unicode
EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o

2
dlls/crtdll/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = crtdll
EXTRALIBS = -lwine_unicode
EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o

2
dlls/lzexpand/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = lz32
ALTNAMES = lzexpand
EXTRALIBS = -lwine_unicode
EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o

2
dlls/ntdll/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ntdll
SOVERSION = 1.0
EXTRALIBS = -lwine_unicode
EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
critsection.c \

2
dlls/shell32/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shell32
ALTNAMES = shell
EXTRALIBS = -lwine_unicode
EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o

2
dlls/shlwapi/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shlwapi
EXTRALIBS = -lwine_unicode
EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o

2
dlls/version/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = version
ALTNAMES = ver
EXTRALIBS = -lwine_unicode
EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o

2
if1632/Makefile.in
View File

@ -24,6 +24,6 @@ $(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
$(LDCOMBINE) $(OBJS) -o $@
asmrelay.s: $(WINEBUILD)
LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WINEBUILD) @DLLFLAGS@ -o $@ -relay
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay
### Dependencies:

2
libtest/Makefile.in
View File

@ -6,7 +6,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = none
PROGRAMS = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo
ALL_LIBS = -L$(TOPOBJDIR) -lwine $(LIBS)
ALL_LIBS = $(LIBWINE) $(LIBS)
C_SRCS = \
expand.c \

2
programs/Makeprog.rules.in
View File

@ -11,7 +11,7 @@
DEFS = @DLLFLAGS@ $(EXTRADEFS)
LDDLLFLAGS = @LDDLLFLAGS@
ALL_OBJS = $(MODULE).spec.o $(OBJS)
ALL_LIBS = -L$(TOPOBJDIR) -lwine $(EXTRALIBS) $(LIBS)
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
SYMBOLFILE = $(MODULE).tmp.o
all: $(MODULE)

2
programs/avitools/Makefile.in
View File

@ -6,7 +6,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = none
PROGRAMS = icinfo aviinfo aviplay
ALL_LIBS = -L$(TOPOBJDIR) -lwine $(LIBS)
ALL_LIBS = $(LIBWINE) $(LIBS)
SPEC_SRCS = \
icinfo.spec \

2
server/Makefile.in
View File

@ -44,7 +44,7 @@ all: $(PROGRAMS)
@MAKE_RULES@
wineserver: $(OBJS)
$(CC) -o $(PROGRAMS) $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LIBS) $(LDFLAGS)
$(CC) -o $(PROGRAMS) $(OBJS) $(LIBUNICODE) $(LIBS) $(LDFLAGS)
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)

8
tools/winebuild/Makefile.in
View File

@ -22,11 +22,11 @@ all: $(PROGRAMS)
@MAKE_RULES@
winebuild: $(OBJS) $(TOPOBJDIR)/libwine_unicode.$(LIBEXT)
$(CC) $(CFLAGS) -o winebuild $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LDFLAGS)
winebuild: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
$(CC) $(CFLAGS) -o winebuild $(OBJS) $(LIBUNICODE) $(LDFLAGS)
$(TOPOBJDIR)/libwine_unicode.$(LIBEXT):
cd $(TOPOBJDIR) && $(MAKE) libwine_unicode.$(LIBEXT)
$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
cd `dirname $@` && $(MAKE) `basename $@`
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)

8
tools/wmc/Makefile.in
View File

@ -24,11 +24,11 @@ mcl.o: y.tab.h
@MAKE_RULES@
wmc: $(OBJS) $(TOPOBJDIR)/libwine_unicode.$(LIBEXT)
$(CC) $(CFLAGS) -o wmc $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LEXLIB) $(LDFLAGS)
wmc: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
$(CC) $(CFLAGS) -o wmc $(OBJS) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
$(TOPOBJDIR)/libwine_unicode.$(LIBEXT):
cd $(TOPOBJDIR) && $(MAKE) libwine_unicode.$(LIBEXT)
$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
cd `dirname $@` && $(MAKE) `basename $@`
y.tab.c y.tab.h: mcy.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/mcy.y

8
tools/wrc/Makefile.in
View File

@ -27,11 +27,11 @@ all: $(PROGRAMS)
@MAKE_RULES@
wrc: $(OBJS) $(TOPOBJDIR)/libwine_unicode.$(LIBEXT)
$(CC) $(CFLAGS) -o wrc $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LEXLIB) $(LDFLAGS)
wrc: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
$(CC) $(CFLAGS) -o wrc $(OBJS) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
$(TOPOBJDIR)/libwine_unicode.$(LIBEXT):
cd $(TOPOBJDIR) && $(MAKE) libwine_unicode.$(LIBEXT)
$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
cd `dirname $@` && $(MAKE) `basename $@`
y.tab.c y.tab.h: parser.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y