- Got rid of non-carbon stuff
- Use precompiled headers
- Rationalized naming scheme
diff --git a/Mac/mwerks/mwerks_carbonplugin_config.h b/Mac/mwerks/mwerks_carbonplugin_config.h
deleted file mode 100644
index f28cfd3..0000000
--- a/Mac/mwerks/mwerks_carbonplugin_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-** Config file for dynamically-loaded ppc/cfm68k plugin modules.
-*/
-#define ACCESSOR_CALLS_ARE_FUNCTIONS 1
-#define OPAQUE_TOOLBOX_STRUCTS 1
-#define TARGET_API_MAC_CARBON 1
-#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
-#define USE_TOOLBOX_OBJECT_GLUE /* Use glue routines for accessing PyArg_Parse/Py_BuildValue helpers */
-
-#define USE_GUSI2 /* Stdio implemented with GUSI */
-#define USE_GUSI
-#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
-#define USE_MSL /* Use MSL libraries */
-#ifdef USE_MSL
-#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
-#include <ansi_prefix.mac.h>
-#endif
-#ifndef Py_DEBUG
-#define NDEBUG
-#endif
diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h
deleted file mode 100644
index 4c1196d..0000000
--- a/Mac/mwerks/mwerks_nonshared_config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-** Configuration file for standalone 68k/ppc Python.
-**
-** Note: enabling the switches below is not enough to enable the
-** specific features, you may also need different sets of sources.
-*/
-
-#define USE_GUSI2 /* Stdio implemented with GUSI 2 */
-#define USE_GUSI
-#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
-#define USE_TOOLBOX /* Include toolbox modules in core Python */
-#define USE_QT /* Include quicktime modules in core Python */
-#define USE_WASTE /* Include waste module in core Python */
-#define USE_MACSPEECH /* Include macspeech module in core Python */
-#define USE_IMG /* Include img modules in core Python */
-#define USE_MACCTB /* Include ctb module in core Python */
-#define USE_TK /* Include _tkinter module in core Python */
-#define MAC_TCL /* This *must* be on if USE_TK is on */
-/* #define USE_MAC_SHARED_LIBRARY /* Enable code to add shared-library resources */
-/* #define USE_MAC_APPLET_SUPPORT /* Enable code to run a PYC resource */
-/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
-#define USE_GDBM /* Include the gdbm module */
-#define USE_ZLIB /* Include the zlib module */
-#define USE_IC /* Include Internet Config module */
-#define USE_PYEXPAT /* Include Pyexpat module */
-#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
-#ifndef USE_MSL_MALLOC
-/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
-#endif
-#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
-
-#ifdef USE_MSL
-#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
-#include <ansi_prefix.mac.h>
-#endif
-/* Missing declarations. Should these go to pyport.h? */
-#ifdef USE_GUSI2
-#include <stdio.h>
-extern int fileno(FILE *);
-#endif
-#ifndef Py_DEBUG
-#define NDEBUG
-#endif
diff --git a/Mac/mwerks/mwerks_nscarbon.pch b/Mac/mwerks/mwerks_nscarbon.pch
new file mode 100644
index 0000000..7482755
--- /dev/null
+++ b/Mac/mwerks/mwerks_nscarbon.pch
@@ -0,0 +1,7 @@
+#pragma once on
+
+#pragma precompile_target "mwerks_nscarbon_pch"
+
+#include "mwerks_nscarbon_config.h"
+#include <Carbon.h>
+#include "Python.h"
diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h
index 2e7e1f9..40f498c 100644
--- a/Mac/mwerks/mwerks_nscarbon_config.h
+++ b/Mac/mwerks/mwerks_nscarbon_config.h
@@ -1,5 +1,5 @@
/*
-** Configuration file for standalone 68k/ppc Python.
+** Configuration file for standalone Carbon Python.
**
** Note: enabling the switches below is not enough to enable the
** specific features, you may also need different sets of sources.
diff --git a/Mac/mwerks/mwerks_plugin_config.h b/Mac/mwerks/mwerks_plugin_config.h
deleted file mode 100644
index 3822378..0000000
--- a/Mac/mwerks/mwerks_plugin_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-** Config file for dynamically-loaded ppc/cfm68k plugin modules.
-*/
-
-/* #define USE_GUSI1 /* Stdio implemented with GUSI */
-#define USE_GUSI2 /* Stdio implemented with GUSI */
-#if defined(USE_GUSI2)
-#define USE_GUSI
-#endif
-#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
-#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
-#define USE_TOOLBOX_OBJECT_GLUE /* Use glue routines for accessing PyArg_Parse/Py_BuildValue helpers */
-#define USE_MSL /* Use MSL libraries */
-#ifdef USE_MSL
-#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
-#include <ansi_prefix.mac.h>
-#endif
-#ifndef Py_DEBUG
-#define NDEBUG
-#endif
diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h
deleted file mode 100644
index 4fcc835..0000000
--- a/Mac/mwerks/mwerks_shared_config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-** Configuration file for dynamically loaded cfm68k/ppc PythonCore,
-** interpreter and Applet.
-**
-** Note: enabling the switches below is not enough to enable the
-** specific features, you may also need different sets of sources.
-*/
-
-#define USE_GUSI2 /* Stdio implemented with GUSI */
-#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
-#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
-/* #define USE_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
-/* #define USE_TOOLBOX /* Include all toolbox modules in core Python */
-/* #define USE_QT /* Include quicktime modules in core Python */
-/* #define USE_WASTE /* Include waste module in core Python */
-/* #define USE_MACSPEECH /* Include macspeech module in core Python */
-/* #define USE_IMG /* Include img modules in core Python */
-/* #define USE_MACCTB /* Include ctb module in core Python */
-/* #define USE_STDWIN /* Include stdwin module in core Python */
-/* #define USE_MACTCP /* Include mactcp (*not* socket) modules in core */
-/* #define USE_TK /* Include _tkinter module in core Python */
-/* #define MAC_TCL /* This *must* be on if USE_TK is on */
-#define USE_MAC_SHARED_LIBRARY /* Enable code to add shared-library resources */
-#define USE_MAC_APPLET_SUPPORT /* Enable code to run a PYC resource */
-#define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
-/* #define USE_GDBM /* Include the gdbm module */
-/* #define USE_ZLIB /* Include the zlib module */
-#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
-#define USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */
-
-#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
-#ifndef USE_MSL_MALLOC
-/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
-#endif
-
-#ifdef USE_MSL
-#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
-#include <ansi_prefix.mac.h>
-#endif
-/* Missing declarations. Should these go to pyport.h? */
-#ifdef USE_GUSI2
-#include <stdio.h>
-extern int fileno(FILE *);
-#endif
-#ifndef Py_DEBUG
-#define NDEBUG
-#endif
diff --git a/Mac/mwerks/mwerks_shcarbon.pch b/Mac/mwerks/mwerks_shcarbon.pch
new file mode 100644
index 0000000..8f2352b
--- /dev/null
+++ b/Mac/mwerks/mwerks_shcarbon.pch
@@ -0,0 +1,7 @@
+#pragma once on
+
+#pragma precompile_target "mwerks_shcarbon_pch"
+
+#include "mwerks_shcarbon_config.h"
+#include <Carbon.h>
+#include "Python.h"
diff --git a/Mac/mwerks/mwerks_shcarbon_config.h b/Mac/mwerks/mwerks_shcarbon_config.h
index 0360d09..d155b3b 100644
--- a/Mac/mwerks/mwerks_shcarbon_config.h
+++ b/Mac/mwerks/mwerks_shcarbon_config.h
@@ -1,6 +1,6 @@
/*
-** Configuration file for dynamically loaded cfm68k/ppc PythonCore,
-** interpreter and Applet.
+** Configuration file for dynamically loaded Carbon PythonCore,
+** interpreter and extension modules.
**
** Note: enabling the switches below is not enough to enable the
** specific features, you may also need different sets of sources.
diff --git a/Mac/mwerks/mwerks_shlib_config.h b/Mac/mwerks/mwerks_shlib_config.h
deleted file mode 100644
index 5f060ad..0000000
--- a/Mac/mwerks/mwerks_shlib_config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define HAVE_CONFIG_H
-#define USE_STDWIN
-#define USE_MAC_SHARED_LIBRARY
diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h
deleted file mode 100644
index 603ab40..0000000
--- a/Mac/mwerks/mwerks_small_config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-** Configuration file for small standalone 68k/ppc Python.
-**
-** Note: enabling the switches below is not enough to enable the
-** specific features, you may also need different sets of sources.
-*/
-
-#define USE_GUSI2 /* Stdio implemented with GUSI 2 */
-#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
-#define USE_TOOLBOX /* Include toolbox modules in core Python */
-#define USE_QT /* Include quicktime modules in core Python */
-/* #define USE_WASTE /* Include waste module in core Python */
-#define USE_MACSPEECH /* Include macspeech module in core Python */
-/* #define USE_IMG /* Include img modules in core Python */
-#define USE_MACCTB /* Include ctb module in core Python */
-/* #define USE_STDWIN /* Include stdwin module in core Python */
-/* #define USE_MACTCP /* Include mactcp (*not* socket) modules in core */
-/* #define USE_TK /* Include _tkinter module in core Python */
-/* #define MAC_TCL /* This *must* be on if USE_TK is on */
-/* #define USE_MAC_SHARED_LIBRARY /* Enable code to add shared-library resources */
-/* #define USE_MAC_APPLET_SUPPORT /* Enable code to run a PYC resource */
-/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
-/* #define USE_GDBM /* Include the gdbm module */
-/* #define USE_ZLIB /* Include the zlib module */
-#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
-#define WITH_HOTSHOT /* Enable hotshot profiler */
-
-#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
-#ifndef USE_MSL_MALLOC
-/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
-#endif
-
-#ifdef USE_MSL
-#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
-#include <ansi_prefix.mac.h>
-#endif
-/* Missing declarations. Should these go to pyport.h? */
-#ifdef USE_GUSI2
-#include <stdio.h>
-extern int fileno(FILE *);
-#endif
-#ifndef Py_DEBUG
-#define NDEBUG
-#endif
diff --git a/Mac/mwerks/mwerks_smcarbon.pch b/Mac/mwerks/mwerks_smcarbon.pch
new file mode 100644
index 0000000..9025cee
--- /dev/null
+++ b/Mac/mwerks/mwerks_smcarbon.pch
@@ -0,0 +1,7 @@
+#pragma once on
+
+#pragma precompile_target "mwerks_smcarbon_pch"
+
+#include "mwerks_smcarbon_config.h"
+#include <Carbon.h>
+#include "Python.h"
diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_smcarbon_config.h
similarity index 96%
rename from Mac/mwerks/mwerks_carbon_config.h
rename to Mac/mwerks/mwerks_smcarbon_config.h
index f3c8de9..6b134bd 100644
--- a/Mac/mwerks/mwerks_carbon_config.h
+++ b/Mac/mwerks/mwerks_smcarbon_config.h
@@ -1,5 +1,5 @@
/*
-** Configuration file for small standalone 68k/ppc Python.
+** Configuration file for small standalone Carbon Python.
**
** Note: enabling the switches below is not enough to enable the
** specific features, you may also need different sets of sources.