Index: abi/src/config/abi_defs.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_defs.mk,v
retrieving revision 1.164
diff -u -r1.164 abi_defs.mk
--- abi/src/config/abi_defs.mk	2001/10/11 05:59:21	1.164
+++ abi/src/config/abi_defs.mk	2001/10/20 05:07:47
@@ -510,6 +510,7 @@
 LIBDIR			= $(OUTDIR)/obj
 BINDIR			= $(OUTDIR)/bin
 CANONDIR		= $(OUTDIR)/AbiSuite
+PLUGINDIR       = $(OUTDIR)/plugins
 
 PKGBASENAME		= abisuite-$(ABI_BUILD_VERSION)-$(OS_NAME)_$(OS_ARCH)
 
Index: abi/src/config/abi_rules.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_rules.mk,v
retrieving revision 1.34
diff -u -r1.34 abi_rules.mk
--- abi/src/config/abi_rules.mk	2001/08/10 05:43:00	1.34
+++ abi/src/config/abi_rules.mk	2001/10/20 05:07:47
@@ -38,17 +38,14 @@
 
 
 ifdef LIBRARY_NAME
-ifeq ($(OS_NAME), WIN32)
-LIBRARY		= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.lib
-SHARED_LIBRARY	= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
-IMPORT_LIBRARY	= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
-
-else
-
-LIBRARY		= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
-SHARED_LIBRARY	= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-
-endif
+ ifeq ($(OS_NAME), WIN32)
+  LIBRARY			= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.lib
+  IMPORT_LIBRARY	= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
+ else
+  LIBRARY			= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
+ endif
+ SHARED_LIBRARY		= $(LIBDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+ PLUGIN          	= $(PLUGINDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 endif
 
 ifndef TARGETS
@@ -182,6 +179,19 @@
 	@rm -f $@
 ifeq ($(OS_NAME), WIN32)
 	@$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) $(EXTRA_LIBS) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH) )
+else
+	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
+endif
+
+################################################################################
+
+$(PLUGIN): $(OBJS)
+	@$(MAKE_OBJDIR)
+	@rm -f $@
+ifeq ($(OS_NAME), WIN32)
+	@$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) \
+     $(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH) ) \
+     $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH) )
 else
 	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
 endif
Index: abi/src/config/platforms/win32.mk
===================================================================
RCS file: /cvsroot/abi/src/config/platforms/win32.mk,v
retrieving revision 1.26
diff -u -r1.26 win32.mk
--- abi/src/config/platforms/win32.mk	2001/09/19 13:32:41	1.26
+++ abi/src/config/platforms/win32.mk	2001/10/20 05:07:47
@@ -84,20 +84,31 @@
 DEFINES 	= -DDEBUG -D_DEBUG -UNDEBUG -D_CRTDBG_MAP_ALLOC -DSUPPORTS_UT_IDLE
 OBJ_DIR_SFX	= DBG
 OS_CFLAGS 	= -W3 -nologo -GF -Gy -MDd -DWIN32 -Zm200
-DLLFLAGS 	= -DEBUG -DEBUGTYPE:CV -OUT:"$@"
+DLLFLAGS 	= -DEBUG -DEBUGTYPE:CV -OUT:"$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))"
 LDFLAGS 	= -DEBUG -DEBUGTYPE:CV
-OS_DLLFLAGS 	= -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
 
 else
 
 DEFINES		= -UDEBUG -U_DEBUG -DNDEBUG -DSUPPORTS_UT_IDLE
 OBJ_DIR_SFX	= OBJ
 OS_CFLAGS 	= -W3 -nologo -GF -Gy -MD -DWIN32 -Zm200
-DLLFLAGS 	= -OUT:"$@"
+DLLFLAGS 	= -OUT:"$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))"
 LDFLAGS 	=
-OS_DLLFLAGS 	= -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
 
 endif
+
+OS_LIBS		= kernel32.lib \
+              user32.lib \
+              gdi32.lib \
+              winspool.lib \
+              comdlg32.lib \
+              advapi32.lib \
+			  shell32.lib \
+              uuid.lib \
+              comctl32.lib \
+              msvcprt.lib
 
 OS_CFLAGS 	+= $(OPTIMIZER) $(ARCH_FLAGS)
 
Index: abi/src/wp/Makefile
===================================================================
RCS file: /cvsroot/abi/src/wp/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- abi/src/wp/Makefile	2000/11/19 09:06:40	1.27
+++ abi/src/wp/Makefile	2001/10/20 05:07:49
@@ -23,7 +23,7 @@
 
 ## Note: main must be last
 
-DIRS=		ap impexp main
+DIRS=		ap impexp main plugins
 
 include $(ABI_ROOT)/src/config/abi_rules.mk

 
diff -uNr abiOrig/src/wp/plugins/Makefile abi/src/wp/plugins/Makefile
--- abiOrig/src/wp/plugins/Makefile	Wed Dec 31 18:00:00 1969
+++ abi/src/wp/plugins/Makefile	Fri Oct 19 13:54:34 2001
@@ -0,0 +1,28 @@
+#! gmake
+
+## AbiWord
+## Copyright (C) 1998 AbiSource, Inc.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation; either version 2
+## of the License, or (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+## 02111-1307, USA.
+
+ABI_ROOT:=$(shell pwd)/../../..
+
+include $(ABI_ROOT)/src/config/abi_defs_wp.mk
+
+DIRS=		test
+
+include $(ABI_ROOT)/src/config/abi_rules.mk
+


diff -uNr abiOrig/src/wp/plugins/test/Makefile abi/src/wp/plugins/test/Makefile
--- abiOrig/src/wp/plugins/test/Makefile	Wed Dec 31 18:00:00 1969
+++ abi/src/wp/plugins/test/Makefile	Fri Oct 19 14:33:06 2001
@@ -0,0 +1,38 @@
+#! gmake
+
+## AbiWord
+## Copyright (C) 1998 AbiSource, Inc.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation; either version 2
+## of the License, or (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+## 02111-1307, USA.
+
+ABI_ROOT:=$(shell pwd)/../../../..
+include $(ABI_ROOT)/src/config/abi_defs.mk
+
+DIRS=				xp
+
+LIBRARY_NAME=		AbiPluginTest
+LIBRARY_VERSION=	$(ABI_VERSION)
+TARGETS=			$(PLUGIN)
+
+OBJS=				$(OBJDIR)/plugin_test.$(OBJ_SUFFIX)
+
+ifeq ($(ABI_FE), Win32)
+	EXTRA_LIBS=		$(BINDIR)/AbiWord.$(LIB_SUFFIX)
+endif
+
+include $(ABI_ROOT)/src/config/abi_rules.mk
+
+build:: $(TARGETS)
diff -uNr abiOrig/src/wp/plugins/test/xp/Makefile abi/src/wp/plugins/test/xp/Makefile
--- abiOrig/src/wp/plugins/test/xp/Makefile	Wed Dec 31 18:00:00 1969
+++ abi/src/wp/plugins/test/xp/Makefile	Fri Oct 19 14:31:20 2001
@@ -0,0 +1,29 @@
+#! gmake
+
+## AbiWord
+## Copyright (C) 1998 AbiSource, Inc.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation; either version 2
+## of the License, or (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+## 02111-1307, USA.
+
+ABI_ROOT:=$(shell pwd)/../../../..
+include $(ABI_ROOT)/src/config/abi_defs.mk
+
+TARGETS=			$(OBJS)
+CPPSRCS= 			plugin_test.cpp
+
+include $(ABI_ROOT)/src/config/abi_rules.mk
+
+build:: $(TARGETS)


diff -uNr abiOrig/src/wp/plugins/test/xp/plugin_test.cpp abi/src/wp/plugins/test/xp/plugin_test.cpp
--- abiOrig/src/wp/plugins/test/xp/plugin_test.cpp	Wed Dec 31 18:00:00 1969
+++ abi/src/wp/plugins/test/xp/plugin_test.cpp	Fri Oct 19 13:30:46 2001
@@ -0,0 +1,54 @@
+/*
+ * MyDLLText - Abiword plugin for Testing Purposes
+ * Copyright (C) 2001 by Michael D. Pritchett
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "xap_Module.h"
+
+ABI_PLUGIN_DECLARE("AbiPluginTest")
+
+ABI_FAR_CALL
+int abi_plugin_register (XAP_ModuleInfo * mi)
+{
+    mi->name = "Tester";
+    mi->desc = "Plugin tester for testing the plugin manager and the diving make sysetm";
+    mi->version = "0.9.4";
+    mi->author = "Michael D. Pritchett";
+    mi->usage = "Usage:  None";
+
+    return 1;
+}
+
+
+ABI_FAR_CALL
+int abi_plugin_unregister (XAP_ModuleInfo * mi)
+{
+    mi->name = 0;
+    mi->desc = 0;
+    mi->version = 0;
+    mi->author = 0;
+    mi->usage = 0;
+    return 1;
+}
+
+
+ABI_FAR_CALL
+int abi_plugin_supports_version (UT_uint32 major, UT_uint32 minor, UT_uint32 release)
+{
+	return 1;
+}