Link the tools and the server against libwine so we can use the
portability functions in there.
diff --git a/Makefile.in b/Makefile.in
index ea5210d..67ea3ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,7 +142,7 @@
$(LIBPROGRAMS): tools dlls wine
-server tools: unicode/libwine_unicode.$(LIBEXT)
+server tools: $(LIBRARIES)
dlls: tools $(LIBRARIES)
diff --git a/configure b/configure
index d76c3f1..f6f7405 100755
--- a/configure
+++ b/configure
@@ -9639,11 +9639,11 @@
if test "$LIBEXT" = "so"; then
DLLFLAGS="-fPIC"
DLLEXT=".so"
- LDPATH="LD_LIBRARY_PATH=\"\$(TOPOBJDIR)/unicode:\$\$LD_LIBRARY_PATH\""
+ LDPATH="LD_LIBRARY_PATH=\"\$(TOPOBJDIR)/library:\$(TOPOBJDIR)/unicode:\$\$LD_LIBRARY_PATH\""
elif test "$LIBEXT" = "dll"; then
#DLLFLAGS="-fPIC" # -fPIC doesn't work(at least in cygwin-b20) - FIXME
DLLEXT=""
- LDPATH="PATH=\"\$(TOPOBJDIR)/unicode:\$\$PATH\""
+ LDPATH="PATH=\"\$(TOPOBJDIR)/library:\$(TOPOBJDIR)/unicode:\$\$PATH\""
fi
@@ -12380,6 +12380,8 @@
ac_config_commands="$ac_config_commands dlls/wineps/data"
+ac_config_commands="$ac_config_commands dlls/winsock/tests"
+
ac_config_commands="$ac_config_commands include/wine"
ac_config_commands="$ac_config_commands programs/regapi/tests"
@@ -13035,6 +13037,7 @@
"dlls/user/resources" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;;
"dlls/user/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/tests" ;;
"dlls/wineps/data" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps/data" ;;
+ "dlls/winsock/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/winsock/tests" ;;
"include/wine" ) CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;;
"programs/regapi/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/regapi/tests" ;;
"programs/winetest/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/winetest/tests" ;;
@@ -13706,6 +13709,8 @@
echo "$as_me: creating dlls/user/tests" >&6;} && mkdir "dlls/user/tests") ;;
dlls/wineps/data ) test -d "dlls/wineps/data" || ({ echo "$as_me:$LINENO: creating dlls/wineps/data" >&5
echo "$as_me: creating dlls/wineps/data" >&6;} && mkdir "dlls/wineps/data") ;;
+ dlls/winsock/tests ) test -d "dlls/winsock/tests" || ({ echo "$as_me:$LINENO: creating dlls/winsock/tests" >&5
+echo "$as_me: creating dlls/winsock/tests" >&6;} && mkdir "dlls/winsock/tests") ;;
include/wine ) test -d "include/wine" || ({ echo "$as_me:$LINENO: creating include/wine" >&5
echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;;
programs/regapi/tests ) test -d "programs/regapi/tests" || ({ echo "$as_me:$LINENO: creating programs/regapi/tests" >&5
diff --git a/configure.ac b/configure.ac
index 7dac5fc..ed9417a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -767,11 +767,11 @@
if test "$LIBEXT" = "so"; then
DLLFLAGS="-fPIC"
DLLEXT=".so"
- LDPATH="LD_LIBRARY_PATH=\"\$(TOPOBJDIR)/unicode:\$\$LD_LIBRARY_PATH\""
+ LDPATH="LD_LIBRARY_PATH=\"\$(TOPOBJDIR)/library:\$(TOPOBJDIR)/unicode:\$\$LD_LIBRARY_PATH\""
elif test "$LIBEXT" = "dll"; then
#DLLFLAGS="-fPIC" # -fPIC doesn't work(at least in cygwin-b20) - FIXME
DLLEXT=""
- LDPATH="PATH=\"\$(TOPOBJDIR)/unicode:\$\$PATH\""
+ LDPATH="PATH=\"\$(TOPOBJDIR)/library:\$(TOPOBJDIR)/unicode:\$\$PATH\""
fi
AC_SUBST(DLLFLAGS)
@@ -1227,6 +1227,7 @@
WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
WINE_CONFIG_EXTRA_DIR(dlls/user/tests)
WINE_CONFIG_EXTRA_DIR(dlls/wineps/data)
+WINE_CONFIG_EXTRA_DIR(dlls/winsock/tests)
WINE_CONFIG_EXTRA_DIR(include/wine)
WINE_CONFIG_EXTRA_DIR(programs/regapi/tests)
WINE_CONFIG_EXTRA_DIR(programs/winetest/tests)
diff --git a/server/Makefile.in b/server/Makefile.in
index d62c3d9..7c1d051 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -48,7 +48,7 @@
@MAKE_RULES@
wineserver: $(OBJS)
- $(CC) -o $(PROGRAMS) $(OBJS) $(LIBUNICODE) $(LIBS) $(LDFLAGS)
+ $(CC) -o $(PROGRAMS) $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LIBS) $(LDFLAGS)
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d4fc3aa..fb4eca9 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__ -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\""
+DEFS = -D__WINE__ -DNO_LIBWINE -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
index 67fce56..5bbb830 100644
--- a/tools/winebuild/Makefile.in
+++ b/tools/winebuild/Makefile.in
@@ -22,11 +22,8 @@
@MAKE_RULES@
-winebuild: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
- $(CC) $(CFLAGS) -o winebuild $(OBJS) $(LIBUNICODE) $(LDFLAGS)
-
-$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
- cd `dirname $@` && $(MAKE) `basename $@`
+winebuild: $(OBJS)
+ $(CC) $(CFLAGS) -o winebuild $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LDFLAGS)
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)
diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in
index 06b1103..a12e524 100644
--- a/tools/winedump/Makefile.in
+++ b/tools/winedump/Makefile.in
@@ -22,7 +22,7 @@
@MAKE_RULES@
winedump: $(OBJS)
- $(CC) $(CFLAGS) -o winedump $(OBJS) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o winedump $(OBJS) $(LIBWINE) $(LDFLAGS)
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index cccb6c5..025fff5 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -24,11 +24,8 @@
@MAKE_RULES@
-wmc: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
- $(CC) $(CFLAGS) -o wmc $(OBJS) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
-
-$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
- cd `dirname $@` && $(MAKE) `basename $@`
+wmc: $(OBJS)
+ $(CC) $(CFLAGS) -o wmc $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
y.tab.c y.tab.h: mcy.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/mcy.y
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index f9d4cd1..b52821e 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -27,11 +27,8 @@
@MAKE_RULES@
-wrc: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
- $(CC) $(CFLAGS) -o wrc $(OBJS) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
-
-$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
- cd `dirname $@` && $(MAKE) `basename $@`
+wrc: $(OBJS)
+ $(CC) $(CFLAGS) -o wrc $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
y.tab.c y.tab.h: parser.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y
