Moved the wpp library from tools/ to libs/.

Make.rules.in

@@ -68,6 +68,7 @@ WIDL         = $(TOOLSDIR)/tools/widl/widl
 WRCFLAGS     = --nostdinc $(INCLUDES) $(EXTRAWRCFLAGS)
 LDPATH       = @LDPATH@
 DLLDIR       = $(TOPOBJDIR)/dlls
+LIBDIR       = $(TOPOBJDIR)/libs
 LIBPORT      = -L$(TOPOBJDIR)/libs/port -lwine_port
 LIBUNICODE   = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode
 LIBUUID      = -L$(TOPOBJDIR)/libs/uuid -lwine_uuid

configure.ac

@@ -1500,6 +1500,7 @@ libs/port/Makefile
 libs/unicode/Makefile
 libs/uuid/Makefile
 libs/wine/Makefile
+libs/wpp/Makefile
 miscemu/Makefile
 programs/Makefile
 programs/avitools/Makefile
@@ -1537,7 +1538,6 @@ tools/winapi/Makefile
 tools/winebuild/Makefile
 tools/winedump/Makefile
 tools/wmc/Makefile
-tools/wpp/Makefile
 tools/wrc/Makefile])
 
 AC_OUTPUT

libs/Makefile.in

@@ -8,22 +8,58 @@ SUBDIRS = \
 	port \
 	unicode \
 	uuid \
-	wine
+	wine \
+	wpp
 
 INSTALLSUBDIRS = \
 	unicode \
 	uuid \
 	wine
 
+SYMLINKS = \
+	libwine.$(LIBEXT) \
+	libwine_port.a \
+	libwine_unicode.$(LIBEXT) \
+	libwine_uuid.a \
+	libwpp.a
+
 @MAKE_RULES@
 
-all: $(SUBDIRS)
+ALL_SYMLINKS =  $(SYMLINKS) $(SYMLINKS:.so=.so.1) $(SYMLINKS:.dll=.a)
+
+all: $(SUBDIRS) $(ALL_SYMLINKS)
 
 install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__)
 install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__)
 
-# Inter-dll dependencies
+clean::
+	$(RM) $(ALL_SYMLINKS)
+
+# Symlinks
+
+libwine.so libwine.so.1 libwine.dll libwine.a: wine/libwine.$(LIBEXT)
+	$(RM) $@ && $(LN_S) wine/$@ $@
+
+libwine_unicode.so libwine_unicode.so.1 libwine_unicode.dll libwine_unicode.a: unicode/libwine_unicode.$(LIBEXT)
+	$(RM) $@ && $(LN_S) unicode/$@ $@
+
+libwine_port.a: port/libwine_port.a
+	$(RM) $@ && $(LN_S) port/$@ $@
+
+libwine_uuid.a: uuid/libwine_uuid.a
+	$(RM) $@ && $(LN_S) uuid/$@ $@
+
+libwpp.a: wpp/libwpp.a
+	$(RM) $@ && $(LN_S) wpp/$@ $@
+
+# Directory dependencies
+
+wine/libwine.$(LIBEXT): wine
+unicode/libwine_unicode.$(LIBEXT): unicode
+port/libwine_port.a: port
+uuid/libwine_uuid.a: uuid
+wpp/libwpp.a: wpp
 
-wine wine/__install__ wine/__install-lib__: port
+wine wine/__install__ wine/__install-lib__: libwine_port.a
 
 ### Dependencies:

tools/wpp/Makefile.in → libs/wpp/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 LEXOPT    = -Cf #-w -b
 YACCOPT   = #-v
-MODULE    = none
+MODULE    = libwpp.a
 
 C_SRCS = \
 	preproc.c \
@@ -13,11 +13,11 @@ C_SRCS = \
 EXTRA_SRCS = ppy.y ppl.l
 EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
 
-all: libwpp.a
+all: $(MODULE)
 
 @MAKE_RULES@
 
-libwpp.a: $(OBJS)
+$(MODULE): $(OBJS)
 	$(RM) $@
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@

tools/wpp/wpp.c → libs/wpp/wpp.c

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 #include "wpp_private.h"
-#include "wpp.h"
+#include "wine/wpp.h"
 
 int ppdebug;
 

tools/Makefile.in

@@ -24,7 +24,6 @@ SUBDIRS = \
 	winebuild \
 	winedump \
 	wmc \
-	wpp \
 	wrc
 
 INSTALLSUBDIRS = $(SUBDIRS)
@@ -37,8 +36,6 @@ all: $(PROGRAMS) $(SUBDIRS)
 
 @MAKE_RULES@
 
-widl wrc: wpp
-
 makedep: makedep.o
 	$(CC) $(CFLAGS) -o makedep makedep.o
 

tools/widl/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 LEXOPT    = -Cf #-w -b
 YACCOPT   = #-v
 EXEEXT    = @EXEEXT@
-EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
 
 PROGRAMS = widl$(EXEEXT)
 MODULE   = none
@@ -23,8 +22,8 @@ all: $(PROGRAMS)
 
 @MAKE_RULES@
 
-widl$(EXEEXT): $(OBJS) $(TOPOBJDIR)/tools/wpp/libwpp.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
+widl$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
+	$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_port $(LEXLIB) $(LDFLAGS)
 
 y.tab.c y.tab.h: parser.y
 	$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y

tools/widl/parser.l

@@ -48,7 +48,7 @@ uuid	{hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12}
 #include "widl.h"
 #include "utils.h"
 #include "parser.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
 
 #include "y.tab.h"
 

tools/widl/widl.c

@@ -37,7 +37,7 @@
 #include "utils.h"
 #include "parser.h"
 #include "proxy.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
 
 /* future options to reserve characters for: */
 /* a = alignment of structures */

tools/winewrapper

@@ -64,9 +64,9 @@ topdir=`cd "$topdir" && pwd`
 
 if [ -n "$LD_LIBRARY_PATH" ]
 then
-  LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs/wine:$topdir/libs/unicode:$LD_LIBRARY_PATH"
+  LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs:$LD_LIBRARY_PATH"
 else
-  LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs/wine:$topdir/libs/unicode"
+  LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs"
 fi
 WINEDLLPATH="$topdir/dlls:$topdir/programs"
 WINESERVER="$topdir/server/wineserver"

tools/wrc/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 LEXOPT    = -Cf #-w -b
 YACCOPT   = #-v
 EXEEXT    = @EXEEXT@
-EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
 
 PROGRAMS = wrc$(EXEEXT)
 MODULE   = none
@@ -27,8 +26,8 @@ all: $(PROGRAMS)
 
 @MAKE_RULES@
 
-wrc$(EXEEXT): $(OBJS) $(TOPOBJDIR)/tools/wpp/libwpp.a
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS)
+wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a
+	$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS)
 
 y.tab.c y.tab.h: parser.y
 	$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y

tools/wrc/parser.y

@@ -136,7 +136,7 @@
 #include "utils.h"
 #include "newstruc.h"
 #include "dumpres.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
 #include "parser.h"
 #include "windef.h"
 #include "winbase.h"

tools/wrc/wrc.c

@@ -42,7 +42,7 @@
 #include "genres.h"
 #include "newstruc.h"
 #include "parser.h"
-#include "../wpp/wpp.h"
+#include "wine/wpp.h"
 
 #ifndef INCLUDEDIR
 #define INCLUDEDIR "/usr/local/include/wine"