Index: src/af/gr/Makefile.am
===================================================================
--- src/af/gr/Makefile.am	(revision 23315)
+++ src/af/gr/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 
-DIST_SUBDIRS = cocoa gtk win xp
+DIST_SUBDIRS = @MAINTAINED_SUBDIRS@
 SUBDIRS = @TOOLKIT@ xp
 
 noinst_LTLIBRARIES = libgr.la
Index: src/af/xap/Makefile.am
===================================================================
--- src/af/xap/Makefile.am	(revision 23315)
+++ src/af/xap/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 
-DIST_SUBDIRS = cocoa gtk win xp
+DIST_SUBDIRS = @MAINTAINED_SUBDIRS@
 SUBDIRS = @TOOLKIT@ xp
 
 noinst_LTLIBRARIES = libxap.la
Index: src/af/ev/Makefile.am
===================================================================
--- src/af/ev/Makefile.am	(revision 23315)
+++ src/af/ev/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 
-DIST_SUBDIRS = cocoa gtk win xp
+DIST_SUBDIRS = @MAINTAINED_SUBDIRS@
 SUBDIRS = @TOOLKIT@ xp
 
 noinst_LTLIBRARIES = libev.la
Index: src/wp/ap/Makefile.am
===================================================================
--- src/wp/ap/Makefile.am	(revision 23315)
+++ src/wp/ap/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 
-DIST_SUBDIRS = cocoa gtk win xp
+DIST_SUBDIRS = @MAINTAINED_SUBDIRS@
 SUBDIRS = @TOOLKIT@ xp
 
 noinst_LTLIBRARIES = libap.la
Index: src/wp/impexp/Makefile.am
===================================================================
--- src/wp/impexp/Makefile.am	(revision 23315)
+++ src/wp/impexp/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 
-DIST_SUBDIRS = cocoa gtk win xp
+DIST_SUBDIRS = @MAINTAINED_SUBDIRS@
 SUBDIRS = @TOOLKIT@ xp
 
 noinst_LTLIBRARIES = libimpexp.la
Index: src/wp/main/cocoa/Makefile.am
===================================================================
--- src/wp/main/cocoa/Makefile.am	(revision 0)
+++ src/wp/main/cocoa/Makefile.am	(revision 0)
@@ -0,0 +1,10 @@
+
+# TODO dist subdirs in a smarter way (omitting the .svn)
+
+EXTRA_DIST = \
+	AbiWord.app \
+	bundle \
+	bundle.mk \
+	CocoaMain.cpp \
+	MainMenu.nib
+
Index: src/wp/main/gtk/Makefile.am
===================================================================
--- src/wp/main/gtk/Makefile.am	(revision 0)
+++ src/wp/main/gtk/Makefile.am	(revision 0)
@@ -0,0 +1,6 @@
+
+EXTRA_DIST = \
+	libabiword.cpp \
+	libabiword.h \
+	UnixMain.cpp
+
Index: src/wp/main/xp/Makefile.am
===================================================================
--- src/wp/main/xp/Makefile.am	(revision 0)
+++ src/wp/main/xp/Makefile.am	(revision 0)
@@ -0,0 +1,4 @@
+
+EXTRA_DIST = \
+	abi_ver.cpp
+
Index: src/wp/main/Makefile.am
===================================================================
--- src/wp/main/Makefile.am	(revision 0)
+++ src/wp/main/Makefile.am	(revision 0)
@@ -0,0 +1,6 @@
+
+DIST_SUBDIRS = @MAINTAINED_SUBDIRS@
+
+EXTRA_DIST = \
+	README.TXT
+
Index: src/wp/main/win/Makefile.am
===================================================================
--- src/wp/main/win/Makefile.am	(revision 0)
+++ src/wp/main/win/Makefile.am	(revision 0)
@@ -0,0 +1,6 @@
+
+EXTRA_DIST = \
+	AbiWord.exe.MANIFEST \
+	Win32Main.cpp \
+	Win32Main.rc
+
Index: src/wp/Makefile.am
===================================================================
--- src/wp/Makefile.am	(revision 23315)
+++ src/wp/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
 
-# TODO dist "main"
-
+DIST_SUBDIRS = ap impexp main
 SUBDIRS = ap impexp
 
 noinst_LTLIBRARIES = libwp.la
Index: configure.in
===================================================================
--- configure.in	(revision 23315)
+++ configure.in	(working copy)
@@ -68,11 +68,17 @@
 AC_PROG_LIBTOOL
 AC_PROG_LN_S
 
+MAINTAINED_SUBDIRS='gtk win xp'
+AC_SUBST([MAINTAINED_SUBDIRS])
+
 AC_MSG_CHECKING([for platform and toolkit])
 case ${target_os} in
   *darwin*)
     PLATFORM="unix"
-    TOOLKIT="cocoa"
+    TOOLKIT="gtk"
+    #use this if you are fixing the native OSX port
+    #TOOLKIT="cocoa"
+    #MAINTAINED_SUBDIRS='cocoa gtk win xp'
     ;;
   *mingw*)
     PLATFORM="win"
@@ -600,13 +606,11 @@
   src/Makefile
   src/af/Makefile
   src/af/ev/Makefile
-  src/af/ev/cocoa/Makefile
   src/af/ev/gtk/Makefile
   src/af/ev/win/bmp/Makefile
   src/af/ev/win/Makefile
   src/af/ev/xp/Makefile
   src/af/gr/Makefile
-  src/af/gr/cocoa/Makefile
   src/af/gr/gtk/Makefile
   src/af/gr/win/Makefile
   src/af/gr/xp/Makefile
@@ -618,7 +622,6 @@
   src/af/util/xp/Makefile
   src/af/util/xp/t/Makefile
   src/af/xap/Makefile
-  src/af/xap/cocoa/Makefile
   src/af/xap/gtk/Makefile
   src/af/xap/gtk/t/Makefile
   src/af/xap/win/Makefile
@@ -636,23 +639,36 @@
   src/text/ptbl/xp/t/Makefile
   src/wp/Makefile
   src/wp/ap/Makefile
-  src/wp/ap/cocoa/Makefile
   src/wp/ap/gtk/Makefile
   src/wp/ap/win/Makefile
   src/wp/ap/xp/Makefile
   src/wp/ap/xp/ToolbarIcons/Makefile
   src/wp/impexp/Makefile
-  src/wp/impexp/cocoa/Makefile
   src/wp/impexp/gtk/Makefile
   src/wp/impexp/win/Makefile
   src/wp/impexp/xp/Makefile
+  src/wp/main/Makefile
+  src/wp/main/gtk/Makefile
+  src/wp/main/win/Makefile
+  src/wp/main/xp/Makefile
   user/Makefile
   user/wp/Makefile
   user/wp/strings/Makefile
   user/wp/templates/Makefile
 )
 
+if test "$TOOLKIT" == "cocoa"; then
 AC_OUTPUT(
+  src/af/ev/cocoa/Makefile
+  src/af/gr/cocoa/Makefile
+  src/af/xap/cocoa/Makefile
+  src/wp/ap/cocoa/Makefile
+  src/wp/impexp/cocoa/Makefile
+  src/wp/main/cocoa/Makefile
+)
+fi
+
+AC_OUTPUT(
   m4_include([plugin-makefiles.m4])
 )