Changed internal/config.h -> roscfg.h in a number of files.

Use a proper prefix for executing programs in tools/Makefile.

svn path=/trunk/; revision=2205

diff --git a/reactos/include/ntdll/ldr.h b/reactos/include/ntdll/ldr.h
index 326b053..998584e 100644 (file)
--- a/reactos/include/ntdll/ldr.h
+++ b/reactos/include/ntdll/ldr.h
@@ -1,5 +1,5 @@
 #include <ntos/kdbgsyms.h>
-#include "../ntoskrnl/include/internal/config.h"
+#include <roscfg.h>
 
 typedef NTSTATUS STDCALL (*PEPFUNC)(PPEB);
 

diff --git a/reactos/ntoskrnl/cm/import.c b/reactos/ntoskrnl/cm/import.c
index 1100e9f..b25faee 100644 (file)
--- a/reactos/ntoskrnl/cm/import.c
+++ b/reactos/ntoskrnl/cm/import.c
@@ -1,4 +1,4 @@
-/* $Id: import.c,v 1.1 2001/08/29 05:06:31 rex Exp $
+/* $Id: import.c,v 1.2 2001/08/30 20:38:18 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -10,7 +10,7 @@
 #include <ctype.h>
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ob.h>
 #include <limits.h>
 #include <string.h>

diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c
index 2fa394f..3edef3b 100644 (file)
--- a/reactos/ntoskrnl/cm/ntfunc.c
+++ b/reactos/ntoskrnl/cm/ntfunc.c
@@ -7,7 +7,7 @@
 */
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ob.h>
 #include <limits.h>
 #include <string.h>

diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index bd0c4de..8f684d4 100644 (file)
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -7,7 +7,7 @@
 */
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ob.h>
 #include <limits.h>
 #include <string.h>

diff --git a/reactos/ntoskrnl/cm/registry.c b/reactos/ntoskrnl/cm/registry.c
index f443e5d..2ea9bff 100644 (file)
--- a/reactos/ntoskrnl/cm/registry.c
+++ b/reactos/ntoskrnl/cm/registry.c
@@ -1,4 +1,4 @@
-/* $Id: registry.c,v 1.63 2001/08/29 05:06:31 rex Exp $
+/* $Id: registry.c,v 1.64 2001/08/30 20:38:18 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -12,7 +12,7 @@
  */
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ob.h>
 #include <limits.h>
 #include <string.h>

diff --git a/reactos/ntoskrnl/cm/regobj.c b/reactos/ntoskrnl/cm/regobj.c
index 1171ffc..77ab6cf 100644 (file)
--- a/reactos/ntoskrnl/cm/regobj.c
+++ b/reactos/ntoskrnl/cm/regobj.c
@@ -7,7 +7,7 @@
 */
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ob.h>
 #include <limits.h>
 #include <string.h>

diff --git a/reactos/ntoskrnl/cm/rtlfunc.c b/reactos/ntoskrnl/cm/rtlfunc.c
index 544939b..3114f8e 100644 (file)
--- a/reactos/ntoskrnl/cm/rtlfunc.c
+++ b/reactos/ntoskrnl/cm/rtlfunc.c
@@ -7,7 +7,7 @@
 */
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ob.h>
 #include <limits.h>
 #include <string.h>

diff --git a/reactos/ntoskrnl/dbg/dbgctrl.c b/reactos/ntoskrnl/dbg/dbgctrl.c
index 4d310ef..237ca02 100644 (file)
--- a/reactos/ntoskrnl/dbg/dbgctrl.c
+++ b/reactos/ntoskrnl/dbg/dbgctrl.c
@@ -26,7 +26,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ldr.h>
 
 #define NDEBUG

diff --git a/reactos/ntoskrnl/ex/power.c b/reactos/ntoskrnl/ex/power.c
index 1bbec0a..c1fa724 100644 (file)
--- a/reactos/ntoskrnl/ex/power.c
+++ b/reactos/ntoskrnl/ex/power.c
@@ -12,7 +12,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ps.h>
 #include <internal/io.h>
 #include <internal/mm.h>

diff --git a/reactos/ntoskrnl/hal/x86/enum.c b/reactos/ntoskrnl/hal/x86/enum.c
index 6f1a1fd..2544009 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/enum.c
+++ b/reactos/ntoskrnl/hal/x86/enum.c
@@ -1,4 +1,4 @@
-/* $Id: enum.c,v 1.1 2001/05/01 23:08:18 chorns Exp $
+/* $Id: enum.c,v 1.2 2001/08/30 20:38:18 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -12,7 +12,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 
 #define NDEBUG
 #include <internal/debug.h>

diff --git a/reactos/ntoskrnl/hal/x86/halinit.c b/reactos/ntoskrnl/hal/x86/halinit.c
index f377978..9b58c5a 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/halinit.c
+++ b/reactos/ntoskrnl/hal/x86/halinit.c
@@ -1,4 +1,4 @@
-/* $Id: halinit.c,v 1.22 2001/05/01 23:08:18 chorns Exp $
+/* $Id: halinit.c,v 1.23 2001/08/30 20:38:18 dwelch Exp $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -12,7 +12,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/hal/hal.h>
 #include <internal/ntoskrnl.h>
 

diff --git a/reactos/ntoskrnl/hal/x86/mp.c b/reactos/ntoskrnl/hal/x86/mp.c
index 957f45c..09dd227 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/mp.c
+++ b/reactos/ntoskrnl/hal/x86/mp.c
@@ -1,4 +1,4 @@
-/* $Id: mp.c,v 1.15 2001/04/26 14:26:22 phreak Exp $
+/* $Id: mp.c,v 1.16 2001/08/30 20:38:19 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -15,7 +15,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 
 #define NDEBUG
 #include <internal/debug.h>

diff --git a/reactos/ntoskrnl/include/internal/debug.h b/reactos/ntoskrnl/include/internal/debug.h
index 4349443..8ab9d1d 100644 (file)
--- a/reactos/ntoskrnl/include/internal/debug.h
+++ b/reactos/ntoskrnl/include/internal/debug.h
@@ -19,7 +19,7 @@
 #define __INTERNAL_DEBUG
 
 #include <internal/ntoskrnl.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/dbg.h>
 
 #define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;);  } while(0);

diff --git a/reactos/ntoskrnl/include/internal/module.h b/reactos/ntoskrnl/include/internal/module.h
index 388dcf2..1ef3ba3 100644 (file)
--- a/reactos/ntoskrnl/include/internal/module.h
+++ b/reactos/ntoskrnl/include/internal/module.h
@@ -3,7 +3,7 @@
 #define __MODULE_H
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <pe.h>
 #include <ntos/kdbgsyms.h>
 

diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index 488d10c..7ba8ec4 100644 (file)
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.31 2001/08/26 17:27:00 ekohl Exp $
+/* $Id: device.c,v 1.32 2001/08/30 20:38:19 dwelch Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -19,7 +19,7 @@
 #include <internal/id.h>
 #include <internal/ps.h>
 #include <internal/pool.h>
-#include <internal/config.h>
+#include <roscfg.h>
 
 #define NDEBUG
 #include <internal/debug.h>

diff --git a/reactos/ntoskrnl/kd/dlog.c b/reactos/ntoskrnl/kd/dlog.c
index 4969b38..9e0b0a7 100644 (file)
--- a/reactos/ntoskrnl/kd/dlog.c
+++ b/reactos/ntoskrnl/kd/dlog.c
@@ -1,4 +1,4 @@
-/* $Id: dlog.c,v 1.3 2001/05/01 23:08:19 chorns Exp $
+/* $Id: dlog.c,v 1.4 2001/08/30 20:38:19 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -13,7 +13,7 @@
 
 #include <ddk/ntddk.h>
 #include <internal/ntoskrnl.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/kd.h>
 #include <ntos/minmax.h>
 

diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c
index 0a490f0..22a618d 100644 (file)
--- a/reactos/ntoskrnl/kd/kdebug.c
+++ b/reactos/ntoskrnl/kd/kdebug.c
@@ -1,4 +1,4 @@
-/* $Id: kdebug.c,v 1.27 2001/06/21 04:12:19 rex Exp $
+/* $Id: kdebug.c,v 1.28 2001/08/30 20:38:19 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -13,7 +13,7 @@
 #include <internal/ntoskrnl.h>
 #include <internal/kd.h>
 #include <internal/mm.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include "../dbg/kdb.h"
 
 /* serial debug connection */

diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c
index 8ee7c3c..89d116c 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/exp.c
+++ b/reactos/ntoskrnl/ke/i386/exp.c
@@ -28,7 +28,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ntoskrnl.h>
 #include <internal/ke.h>
 #include <internal/i386/segment.h>

diff --git a/reactos/ntoskrnl/ke/i386/irq.c b/reactos/ntoskrnl/ke/i386/irq.c
index 1747b27..3e37fdb 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/irq.c
+++ b/reactos/ntoskrnl/ke/i386/irq.c
@@ -1,4 +1,4 @@
-/* $Id: irq.c,v 1.14 2001/04/26 14:26:22 phreak Exp $
+/* $Id: irq.c,v 1.15 2001/08/30 20:38:19 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -19,7 +19,7 @@
 /* INCLUDES ****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ke.h>
 #include <internal/ps.h>
 #include <internal/i386/segment.h>

diff --git a/reactos/ntoskrnl/ke/i386/multiboot.S b/reactos/ntoskrnl/ke/i386/multiboot.S
index 2630caa..128b861 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/multiboot.S
+++ b/reactos/ntoskrnl/ke/i386/multiboot.S
@@ -1,4 +1,4 @@
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ntoskrnl.h>
 #include <internal/i386/segment.h>
 

diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c
index 4761dc7..8a744cf 100644 (file)
--- a/reactos/ntoskrnl/ke/spinlock.c
+++ b/reactos/ntoskrnl/ke/spinlock.c
@@ -1,4 +1,4 @@
-/* $Id: spinlock.c,v 1.10 2001/04/26 14:26:22 phreak Exp $
+/* $Id: spinlock.c,v 1.11 2001/08/30 20:38:19 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -17,7 +17,7 @@
 /* INCLUDES ****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 
 #include <internal/debug.h>
 

diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c
index b2ce0ca..2c898cf 100644 (file)
--- a/reactos/ntoskrnl/ldr/loader.c
+++ b/reactos/ntoskrnl/ldr/loader.c
@@ -1,4 +1,4 @@
-/* $Id: loader.c,v 1.87 2001/08/26 17:27:44 ekohl Exp $
+/* $Id: loader.c,v 1.88 2001/08/30 20:38:20 dwelch Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -25,7 +25,7 @@
 
 #include <limits.h>
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/module.h>
 #include <internal/ntoskrnl.h>
 #include <internal/io.h>

diff --git a/reactos/ntoskrnl/mm/mminit.c b/reactos/ntoskrnl/mm/mminit.c
index 649066e..2a9f227 100644 (file)
--- a/reactos/ntoskrnl/mm/mminit.c
+++ b/reactos/ntoskrnl/mm/mminit.c
@@ -1,4 +1,4 @@
-/* $Id: mminit.c,v 1.24 2001/08/13 16:39:01 ekohl Exp $
+/* $Id: mminit.c,v 1.25 2001/08/30 20:38:20 dwelch Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -12,7 +12,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/i386/segment.h>
 #include <internal/mm.h>
 #include <internal/ntoskrnl.h>

diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c
index 0ebe707..79bf546 100644 (file)
--- a/reactos/ntoskrnl/ob/object.c
+++ b/reactos/ntoskrnl/ob/object.c
@@ -1,4 +1,4 @@
-/* $Id: object.c,v 1.39 2001/06/16 14:10:55 ekohl Exp $
+/* $Id: object.c,v 1.40 2001/08/30 20:38:20 dwelch Exp $
  * 
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -12,7 +12,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/ob.h>
 #include <internal/ps.h>
 #include <internal/id.h>

diff --git a/reactos/ntoskrnl/po/power.c b/reactos/ntoskrnl/po/power.c
index c0c549e..31c15ff 100644 (file)
--- a/reactos/ntoskrnl/po/power.c
+++ b/reactos/ntoskrnl/po/power.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: power.c,v 1.3 2001/05/01 23:08:20 chorns Exp $
+/* $Id: power.c,v 1.4 2001/08/30 20:38:20 dwelch Exp $
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/po/power.c
  * PURPOSE:         Power Manager
@@ -26,7 +26,7 @@
  *   16/04/2001 CSH Stubs added
  */
 #include <ddk/ntddk.h>
-#include <internal/config.h>
+#include <roscfg.h>
 #include <internal/io.h>
 #include <internal/po.h>
 

diff --git a/reactos/rules.mak b/reactos/rules.mak
index dbbc379..54ad179 100644 (file)
--- a/reactos/rules.mak
+++ b/reactos/rules.mak
@@ -20,7 +20,8 @@ endif
 #
 ifeq ($(HOST),mingw32-linux)
 NASM_FORMAT = win32
-PREFIX = i586-mingw32-
+#PREFIX = i586-mingw32-
+PREFIX = /usr/mingw32-2.95.3-fc/bin/mingw32-pc-
 EXE_POSTFIX := 
 EXE_PREFIX := ./
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as

diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile
index 3bb0dd2..f026f90 100644 (file)
--- a/reactos/tools/Makefile
+++ b/reactos/tools/Makefile
@@ -14,7 +14,7 @@ all: $(TOOLS)
 
 buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h
        $(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c
-       buildno$(EXE_POSTFIX)
+       $(EXE_PREFIX)buildno$(EXE_POSTFIX)
 
 depends$(EXE_POSTFIX): depends.c
        $(HOST_CC) $(CFLAGS) -o depends$(EXE_POSTFIX) depends.c