Changes for the new build system, and unify prefix files.

cmd/macfe/Composer/build/Composer_DebugPrefix.h

@@ -23,7 +23,7 @@
 //			You typically won't need to change anything in this file.
 // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
 
-#include "Moz_DebugConfig.h"
+#include "MacPrefix_debug.h"
  
 // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
 //	¥	When we split out the procompiled headers seperately, we will not

cmd/macfe/Composer/build/Composer_Headers.pch

@@ -30,7 +30,7 @@
 //
 // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
 
-#include "Moz_Config.h"
+#include "MacPrefix.h"
 
 #ifdef powerc
 	#pragma precompile_target "Composer_HeadersPPC"

cmd/macfe/Composer/build/Composer_Headers.pch++

@@ -31,7 +31,7 @@
 //
 // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
 
-#include "Moz_Config.h"
+#include "MacPrefix.h"
 
 #ifdef powerc
 	#pragma precompile_target "Composer_HeadersPPC++"

cmd/macfe/Composer/build/Composer_Prefix.h

@@ -23,7 +23,7 @@
 //			You typically won't need to change anything in this file.
 // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
 
-#include "Moz_Config.h"
+#include "MacPrefix.h"
  
 // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ
 //	¥	When we split out the procompiled headers seperately, we will not

modules/libfont/macbuild/FontBroker.prefix

@@ -1,7 +1,19 @@
-#define MOZILLA_CLIENT 1
-#define MOCHA 1
-#define EDITOR 1
-#define LAYERS 1
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
 
-#include "IDE_Options.h"
-#include "NSCrossProductDefines.h"
+#include "MacPrefix.h"

modules/libfont/macbuild/FontBrokerDebug.prefix

@@ -1,4 +1,19 @@
-#define DEBUG 1
-#define TRACING 1
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
 
-#include "FontBroker.prefix"
+#include "MacPrefix_debug.h"

modules/xml/macbuild/XML.Prefix

@@ -23,4 +23,5 @@
 //
 //
 
-#include <OpenTransport.h>
+#include "MacPrefix.h"
+#include "XMLConfig.h"

modules/xml/macbuild/XMLDebug.Prefix

@@ -23,6 +23,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
-#include <OpenTransport.h>
+#include "MacPrefix_debug.h"
+#include "XMLConfig.h"