Changes for new build system, and unified prefix files.

jpeg/macbuild/JPEG.Prefix

@@ -22,4 +22,5 @@
 //
 //
 
-#include "JPEGConfig.h"
+#include "MacPrefix.h"
+#include "JPEGConfig.h"

jpeg/macbuild/JPEGConfig.h

@@ -16,6 +16,4 @@
  * Reserved.
  */
 
-#define EDITOR 1
-#undef HAVE_BOOLEAN 
-#include "IDE_Options.h"
+#undef HAVE_BOOLEAN

jpeg/macbuild/JPEGDebug.Prefix

@@ -22,6 +22,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
+#include "MacPrefix_debug.h"
 #include "JPEGConfig.h"

js/jsj/macbuild/JSJ.Prefix

@@ -23,4 +23,5 @@
 //
 //
 
+#include "MacPrefix.h"
 #include "JSJConfig.h"

js/jsj/macbuild/JSJConfig.h

@@ -16,10 +16,5 @@
  * Reserved.
  */
 /* ** */
-#define EDITOR 1
 
-#include "NSCrossProductDefines.h"
-#include "IDE_Options.h"
-
-
-#define MOZILLA_CLIENT 1
+/* Nuthin' to do. */

js/jsj/macbuild/JSJDebug.Prefix

@@ -23,6 +23,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
+#include "MacPrefix_debug.h"
 #include "JSJConfig.h"

js/macbuild/JavaScript.Prefix

@@ -23,4 +23,5 @@
 //
 //
 
-#include "JavaScriptConfig.h"
+#include "MacPrefix.h"
+#include "JavaScriptConfig.h"

js/macbuild/JavaScriptConfig.h

@@ -16,11 +16,4 @@
  * Reserved.
  */
 
-#define EDITOR 1
-
-#include "NSCrossProductDefines.h"
-#include "IDE_Options.h"
-
-//#define JAVA
-
-#define MOZILLA_CLIENT 1
+/* Nuthin' to do */

js/macbuild/JavaScriptDebug.Prefix

@@ -23,6 +23,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
-#include "JavaScriptConfig.h"
+#include "MacPrefix_debug.h"
+#include "JavaScriptConfig.h"

modules/rdf/macbuild/RDF.Prefix

@@ -23,5 +23,5 @@
 //
 //
 
+#include "MacPrefix_debug.h"
 #include "RDFConfig.h"
-#include <OpenTransport.h>

modules/rdf/macbuild/RDFConfig.h

@@ -16,7 +16,3 @@
  * Reserved.
  */
 #define CGLUESUPPORTED 0 // turn off C glue support to avoid conflict on create() in RDF
-
-#include "IDE_Options.h"
-#include "NSCrossProductDefines.h"
-#define MOZILLA_CLIENT 1

modules/rdf/macbuild/RDFDebug.Prefix

@@ -1,3 +1,21 @@
+/* -*- 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.
+ */
+
 //
 //	RDFDebug.Prefix
 //
@@ -5,7 +23,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
+#include "MacPrefix_debug.h"
 #include "RDFConfig.h"
-#include <OpenTransport.h>

nav-java/stubs/macbuild/NavJavaStubs.prefix

@@ -1,14 +1,4 @@
 /* This is a Mac only file */
 
-#include "IDE_Options.h"
-#include "NSCrossProductDefines.h"
-
-#define MOZILLA_CLIENT 1
-#define MOCHAFILE 1
-#define COMPILER 0
-#define LAYERS 1
-#define VERSION_NUMBER "40"
-#define JAR_NAME "java"##VERSION_NUMBER##".jar"
-//#define JAVA 1
-#define EDITOR 1
-#define MOCHA 1
+#include "MacPrefix.h"
+#include "JavaDefines.h"

sun-java/stubs/macbuild/JavaStubs.prefix

@@ -1,14 +1,4 @@
 /* This is a Mac only file */
 
-#include "IDE_Options.h"
-#include "NSCrossProductDefines.h"
-
-#define MOZILLA_CLIENT 1
-#define MOCHAFILE 1
-#define COMPILER 0
-#define LAYERS 1
-#define VERSION_NUMBER "40"
-#define JAR_NAME "java"##VERSION_NUMBER##".jar"
-//#define JAVA 1
-#define EDITOR 1
-#define MOCHA 1
+#include "MacPrefix.h"
+#include "JavaDefines.h"