--- Begin Message ---
diff -ruNp 0old/buildall.bat 0new/buildall.bat
--- 0old/buildall.bat 2004-03-27 01:42:32.000000000 +0000
+++ 0new/buildall.bat 2004-04-05 04:45:58.000000000 +0000
@@ -3,62 +3,54 @@
:- $Id$
:----------------------------------------------------------
-:- batch file to build _many_ KERNELS, hope build works
+:- batch file to build _many_ KERNELS, hope build works.
:- takes 3 minutes on my(TE) Win2K/P700. your milage may vary :-)
:----------------------------------------------------------
if "%1" == "$SUMMARY" goto summary
-set onerror=if not "%%XERROR%%" == "" goto daswarwohlnix
+call config.bat
+if "%LAST%" == "" goto end
:***** MSCL kernels
-call config.bat
+if "%MSCL8_BASE%" == "" goto no_ms
+ call build.bat -r msc 386 fat16
+if "%XERROR%" == "" call build.bat -r msc 186 fat16
+if "%XERROR%" == "" call build.bat -r msc 86 fat16
+if "%XERROR%" == "" call build.bat -r msc 386 fat32
+if "%XERROR%" == "" call build.bat -r msc 186 fat32
+if "%XERROR%" == "" call build.bat -r msc 86 fat32
-if "%MS_BASE%" == "" goto no_ms
-call build -r msc 386 fat16
-%ONERROR%
-call build -r msc 186 fat16
-%ONERROR%
-call build -r msc 86 fat16
-%ONERROR%
-call build -r msc 386 fat32
-%ONERROR%
-call build -r msc 186 fat32
-%ONERROR%
-call build -r msc 86 fat32
-%ONERROR%
+if not "%XERROR%" == "" goto daswarwohlnix
:no_ms
:***** TC 2.01 kernels
if "%TC2_BASE%" == "" goto no_tc
-call build -r tc 186 fat16
-%ONERROR%
-call build -r tc 86 fat16
-%ONERROR%
-call build -r tc 186 fat32
-%ONERROR%
-call build -r tc 86 fat32
-%ONERROR%
+ call build.bat -r tc 186 fat16
+if "%XERROR%" == "" call build.bat -r tc 86 fat16
+if "%XERROR%" == "" call build.bat -r tc 186 fat32
+if "%XERROR%" == "" call build.bat -r tc 86 fat32
+
+if not "%XERROR%" == "" goto daswarwohlnix
:no_tc
:***** (Open) Watcom kernels
if "%WATCOM%" == "" goto no_wc
-call build -r wc 386 fat32
-%ONERROR%
-call build -r wc 386 fat16
-%ONERROR%
-call build -r wc 86 fat32
-%ONERROR%
-call build -r wc 86 fat16
-%ONERROR%
+ call build.bat -r wc 386 fat32
+if "%XERROR%" == "" call build.bat -r wc 386 fat16
+if "%XERROR%" == "" call build.bat -r wc 86 fat32
+if "%XERROR%" == "" call build.bat -r wc 86 fat16
+
+if not "%XERROR%" == "" goto daswarwohlnix
:no_wc
-
+
:***** now rebuild the default kernel
-call build -r
+call build.bat -r
+if not "%XERROR%" == "" goto daswarwohlnix
:**************************************************************
:* now we build a summary of all kernels HMA size + total size
@@ -70,30 +62,30 @@ set Sumfile=bin\ksummary.txt
set TempSumfile=bin\tsummary.txt
:****echo >%TempSumfile% Summary of all kernels build
-:****echo.|date >>%TempSumfile%
-:****echo.|time >>%TempSumfile%
+:****echo.|date >>%TempSumfile%
+:****echo.|time >>%TempSumfile%
:****for %%i in (bin\k*.map) do call %0 $SUMMARY %%i
-if exist %Sumfile% del %Sumfile%
-if exist %TempSumfile% del %TempSumfile%
+if exist %Sumfile% del %Sumfile%>nul
+if exist %TempSumfile% del %TempSumfile%>nul
>ktemp.bat
for %%i in (bin\k*.map) do echo call %0 $SUMMARY %%i >>ktemp.bat
sort <ktemp.bat >ktemps.bat
-call ktemps
-del ktemp.bat
-del ktemps.bat
+call ktemps.bat
+del ktemp.bat>nul
+del ktemps.bat>nul
echo >>%Sumfile% Summary of all kernels build
-echo.|date >>%Sumfile%
-echo.|time >>%Sumfile%
+echo.|date >>%Sumfile%
+echo.|time >>%Sumfile%
find <%TempSumfile% "H" >>%Sumfile%
-del %TempSumfile%
+del %TempSumfile%>nul
set TempSumfile=
set Sumfile=
goto end
-:summary
+:summary
echo H************************************************* %2 >>%TempSumfile%
find<%2 " HMA_TEXT"|find/V "HMA_TEXT_START"|find/V "HMA_TEXT_END">>%TempSumfile%
find<%2 " STACK">>%TempSumfile%
@@ -103,6 +95,5 @@ goto end
:daswarwohlnix
echo Sorry, something didn't work as expected :-(
-set ONERROR=
:end
diff -ruNp 0old/clean.bat 0new/clean.bat
--- 0old/clean.bat 2004-03-27 01:42:32.000000000 +0000
+++ 0new/clean.bat 2004-04-05 03:36:56.000000000 +0000
@@ -1,37 +1,45 @@
@echo off
-:- batch file to clean everything
+:- batch file to clean and clobber everything
:- $Id$
+if "%1" == "" %0 clean
+goto %1
+goto end
+
+:clean
+:clobber
if not exist config.bat echo You must copy CONFIG.B to CONFIG.BAT and edit it to
reflect your setup!
if not exist config.bat goto end
-call config
-call default
+call config.bat
+if not "%LAST%" == "" call defaults.bat
+if "%LAST%" == "" goto end
cd utils
-%MAKE% clean
+call %MAKE% %1
cd ..\lib
-%MAKE% clean
+call %MAKE% %1
cd ..\drivers
-%MAKE% clean
+call %MAKE% %1
cd ..\boot
-%MAKE% clean
+call %MAKE% %1
cd ..\sys
-%MAKE% clean
+call %MAKE% %1
cd ..\kernel
-%MAKE% clean
+call %MAKE% %1
cd ..\hdr
-if exist *.bak del *.bak
+if exist *.bak del *.bak>nul
cd ..
-if exist *.bak del *.bak
+if exist *.bak del *.bak>nul
+if "%1"=="clobber" if exist status.me del status.me>nul
:end
-default clearset
+defaults.bat clearset
diff -ruNp 0old/config.b 0new/config.b
--- 0old/config.b 2003-09-15 11:50:58.000000000 +0000
+++ 0new/config.b 2004-04-05 02:02:42.000000000 +0000
@@ -1,119 +1,127 @@
-:-
[EMAIL PROTECTED] off
+
:- batch file that is included in all other batch files for configuration
-:-
+:- $Id: config.b,v 1.11 2003/07/19 18:12:26 bartoldeman Exp $
-:-****************************************************************
-:- NOTICE! You must edit and rename this file to CONFIG.BAT! *
-:-****************************************************************
+:-----------------------------------------------------------------------
+:- NOTICE! You must edit and rename this file to CONFIG.BAT!
+:-----------------------------------------------------------------------
-:-*********************************************************************
-:- determine your compiler settings
-:-
-:- you have to
-:- search for XNASM - and set the path for NASM
-:- search for COMPILER - and set your compiler
-:- search for ??_BASE - and set the path to your compiler
+:- determine compiler(s) settings
:-
-:-*********************************************************************
+:- you REQUIRED to
+:- search for NASM - and set the path to NASM
+:- search for COMPILER - and set the default compiler type
+:- search for ??_BASE - and set the path to compiler(s)
+
+set LAST=
+
+:-----------------------------------------------------------------------
+:- define NASM executable. Remember - it should not be protected
+:- mode DJGPP version if you're using Windows NT/2k/XP to compile.
+:- also: DJGPP-nasm crashes when using protected mode Borland's make
-:-**********************************************************************
-:-- define where to find NASM - remember - it should not be protected
-:- mode DJGPP version if you're using Windows NT/2k/XP to compile
-:- also: DJGPP-nasm crashes when using protected mode Borland's make
-:-**********************************************************************
-
-set XNASM=c:\bin\nasm16
-
-:**********************************************************************
-:- define your COMPILER type here, pick one of them
-:**********************************************************************
+set NASM=c:\bin\nasm16
+
+:-----------------------------------------------------------------------
+:- define COMPILER type here, pick one of them
:- Turbo C 2.01
set COMPILER=TC2
:- Turbo C++ 1.01
-:- set COMPILER=TURBOCPP
+::set COMPILER=TURBOCPP
:- Turbo C 3.0
-:- set COMPILER=TC3
+::set COMPILER=TC3
:- Borland C
-:- set COMPILER=BC5
+::set COMPILER=BC5
:- Microsoft C
-:- set COMPILER=MSCL8
+::set COMPILER=MSCL8
:- Watcom C
-:- set COMPILER=WATCOM
+::set COMPILER=WATCOM
+
+:-----------------------------------------------------------------------
+:- where is the BASE dir of compiler(s).
+:- should be defined for each installed and used compiler.
-:-**********************************************************************
-:-- where is the BASE dir of your compiler(s) ??
-:-**********************************************************************
-
set TC2_BASE=c:\tc201
-:- set TP1_BASE=c:\tcpp
-:- set TC3_BASE=c:\tc3
-:- set BC5_BASE=c:\bc5
-:- set MS_BASE=c:\msvc
-
-:- if WATCOM maybe you need to set your WATCOM environment variables
-:- and path
-:- if not \%WATCOM% == \ goto watcom_defined
-:- set WATCOM=c:\watcom
-:- set PATH=%PATH%;%WATCOM%\binw
+::set TP1_BASE=c:\tcpp
+::set TC3_BASE=c:\tc3
+::set BC5_BASE=c:\bc5
+::set MSCL8_BASE=c:\msvc
+
+:- For Watcom you may need to set WATCOM environment variable and PATH
+::if not "%WATCOM%" == "" goto watcom_defined
+::set WATCOM=c:\watcom
+::set OLDPATH=%PATH%
+::set PATH=%PATH%;%WATCOM%\binw
:watcom_defined
-:-**********************************************************************
-:- where is UPX and which options to use?
-:-**********************************************************************
+:-----------------------------------------------------------------------
+:- where is UPX and which options to use
+:- (comment this out if you don't want to use it)
+
set XUPX=upx --8086 --best
-:- or use set XUPX=
-:- if you don't want to use it
-:-**********************************************************************
-:- (optionally) which linker to use:
-:- (otherwise will be determined automatically)
-:-
-:- WARNING TLINK needs to be in your PATH!
-:-**********************************************************************
+:-----------------------------------------------------------------------
+:- define which linker to use OR it will be determined AUTOMATICALLY.
+:- WARNING TLINK needs to be in PATH!
:- Turbo Link
-:- set XLINK=tlink /m/c/s/l
+::set LINK=tlink/m/c/s/l
:- Microsoft Link
-:- set XLINK=d:\qb\link /ma
-:- set XLINK=%MS_BASE%\bin\link /ONERROR:NOEXE /ma /nologo
+::set LINK=d:\qb\link/ma
+::set LINK=link/ONERROR:NOEXE /ma /nologo
:- WATCOM Link (wlinker is a batch file calling ms2wlink and wlink)
-:- set XLINK=..\utils\wlinker /ma /nologo
+::set LINK=..\utils\wlinker/ma/nologo
:- set path for Turbo Link - use OLDPATH to restore normal path
-:- set OLDPATH=%PATH%
-:- set PATH=%PATH%;%TC2_BASE%
+::set OLDPATH=%PATH%
+::set PATH=%PATH%;%TC2_BASE%
+
+:-----------------------------------------------------------------------
+:- define which librarian to use OR it will be determined AUTOMATICALLY.
-:**********************************************************************
-:* optionally define your MAKE type here, if not then
-:* it will be automatically determined, pick one of them
-:* use MS nmake if you want to compile with MSCL
-:**********************************************************************
+:- Turbo Lib
+::set LIBPLUS=+
+::set LIBTERM=
+::set LIBUTIL=tlib
+:- Microsoft Lib
+::set LIBPLUS=+
+::set LIBTERM=;
+::set LIBUTIL=lib/nologo
+:- WATCOM Lib
+::set LIBPLUS=
+::set LIBTERM=
+::set LIBUTIL=wlib -q
+
+:-----------------------------------------------------------------------
+:- define which MAKE to use OR it will be determined AUTOMATICALLY.
:- Borland MAKE
-:- set MAKE=%TC2_BASE%\make
+::set MAKE=make
+::set MAKE=maker -S
:- Watcom MAKE in MS mode
-:- set MAKE=%WATCOM%\binw\wmake /ms
+::set MAKE=wmake/ms
:- Microsoft MAKE
-:- set MAKE=%MS_BASE%\bin\nmake /nologo
+::set MAKE=nmake/nologo
-:**********************************************************************
-:* select your default target: required CPU and what FAT system to support
-:**********************************************************************
-
-set XCPU=86
-:- set XCPU=186
-:- set XCPU=386
+:-----------------------------------------------------------------------
+:- select default target: CPU type (default is 86) and
+:- what FAT system (default is 32) to support
+
+::set XCPU=86
+::set XCPU=186
+::set XCPU=386
-set XFAT=16
-:- set XFAT=32
+::set XFAT=16
+::set XFAT=32
:- Give extra compiler DEFINE flags here
:- such as -DDEBUG : extra DEBUG output
:- -DDOSEMU : printf output goes to dosemu log
-:- set ALLCFLAGS=-DDEBUG
+::set ALLCFLAGS=-DDEBUG
+:-----------------------------------------------------------------------
-:-
-:- $Id: config.b,v 1.11 2003/07/19 18:12:26 bartoldeman Exp $
-:-
+set LAST=1
+if not "%LAST%" == "1" defaults.bat clearset
diff -ruNp 0old/kernel/makefile 0new/kernel/makefile
--- 0old/kernel/makefile 2004-01-25 22:37:20.000000000 +0000
+++ 0new/kernel/makefile 2004-04-05 11:59:58.000000000 +0000
@@ -6,36 +6,18 @@
!include "../mkfiles/generic.mak"
-RELEASE = 1.00
-
-# Compiler and Options
-
-INCLUDE=..\hdr
-LIB= $(COMPILERBASE)\lib
-
-LIBPATH = .
-#AFLAGS = /Mx /DSTANDALONE=1 /I..\HDR
-
-LIBS =..\lib\device.lib ..\lib\libm.lib
-#INITCFLAGS =$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPIGROUP -zBIB \
-#-zGIGROUP -zSIGROUP
-#CFLAGS =$(ALLCFLAGS) -zAHMA -zCHMA_TEXT
+LIBS=..\lib\device.lib ..\lib\libm.lib
HDR=../hdr/
-# *Implicit Rules*
-# 'standard' compiles
-
-.c.obj :
- $(CC) $(CFLAGS) $<
-
-# *List Macros*
-
+# *List Macros*
+# Only 8 files per definition; this is limitation of DOS batch
+# files (only 9 directly accessible parameters).
OBJS1=kernel.obj entry.obj io.obj console.obj serial.obj printer.obj dsk.obj \
sysclk.obj
OBJS2=asmsupt.obj execrh.obj nlssupt.obj procsupt.obj dosidle.obj int2f.obj \
nls_hc.obj
-OBJS3= apisupt.obj intr.obj irqstack.obj blockio.obj chario.obj systime.obj \
+OBJS3=apisupt.obj intr.obj irqstack.obj blockio.obj chario.obj systime.obj \
error.obj
OBJS4=break.obj dosfns.obj fatdir.obj fatfs.obj fattab.obj fcbfns.obj \
inthndlr.obj
@@ -43,184 +25,132 @@ OBJS5=ioctl.obj dosnames.obj memmgr.obj
OBJS6=prf.obj misc.obj strings.obj syspack.obj lfnapi.obj
OBJS7=main.obj config.obj initoem.obj inithma.obj dyninit.obj iprf.obj \
initdisk.obj initclk.obj
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7)
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7)
# *Explicit Rules*
-production: ..\bin\kernel.sys
+production: ..\bin\$(TARGET).sys
-..\bin\kernel.sys: kernel.sys
+..\bin\$(TARGET).sys: kernel.sys
copy kernel.sys ..\bin
- copy kernel.sys ..\bin\$(THETARGET).sys
- copy kernel.map ..\bin\$(THETARGET).map
+ copy kernel.sys ..\bin\$(TARGET).sys
+ copy kernel.map ..\bin\$(TARGET).map
kernel.sys: kernel.exe ..\utils\exeflat.exe
$(XUPX) kernel.exe
..\utils\exeflat kernel.exe kernel.sys 0x60 -S0x10 -S0x8B $(UPXOPT)
-clobber: clean
+kernel.exe: $(TARGET).lnk $(OBJS) $(LIBS)
+ $(LINK) @$(TARGET).lnk;
+
+clobber: clean
-$(RM) kernel.exe kernel.sys status.me
clean:
- -$(RM) *.res *.obj *.bak *.crf *.xrf *.map *.lst *.cod *.err *.lnk
+ -$(RM) *.obj *.bak *.crf *.xrf *.map *.lst *.cod *.err *.lnk
# XXX: This is a very ugly way of linking the kernel, forced upon us by the
# inability of Turbo `make' 2.0 to perform command line redirection. -- ror4
ECHOTO=..\utils\echoto
-kernel.res: $(OBJS) $(LIBS)
- -$(RM) kernel.res
- $(ECHOTO) kernel.res $(OBJS1)+
- $(ECHOTO) kernel.res $(OBJS2)+
- $(ECHOTO) kernel.res $(OBJS3)+
- $(ECHOTO) kernel.res $(OBJS4)+
- $(ECHOTO) kernel.res $(OBJS5)+
- $(ECHOTO) kernel.res $(OBJS6)+
- $(ECHOTO) kernel.res $(OBJS7)
- $(ECHOTO) kernel.res kernel.exe
- $(ECHOTO) kernel.res kernel.map
- $(ECHOTO) kernel.res $(LIBS)
-
-kernel.exe: kernel.res $(OBJS) $(LIBS)
- $(LINK) @kernel.res;
+$(TARGET).lnk: turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).mak
+ -$(RM) *.lnk
+ $(ECHOTO) $(TARGET).lnk $(OBJS1)+
+ $(ECHOTO) $(TARGET).lnk $(OBJS2)+
+ $(ECHOTO) $(TARGET).lnk $(OBJS3)+
+ $(ECHOTO) $(TARGET).lnk $(OBJS4)+
+ $(ECHOTO) $(TARGET).lnk $(OBJS5)+
+ $(ECHOTO) $(TARGET).lnk $(OBJS6)+
+ $(ECHOTO) $(TARGET).lnk $(OBJS7)
+ $(ECHOTO) $(TARGET).lnk kernel.exe
+ $(ECHOTO) $(TARGET).lnk kernel.map
+ $(ECHOTO) $(TARGET).lnk $(LIBS)
# *Individual File Dependencies*
-kernel.obj: kernel.asm segs.inc ludivmul.inc
-
-console.obj: console.asm io.inc
-
-printer.obj: printer.asm io.inc
-
-serial.obj: serial.asm io.inc
-
-entry.obj: entry.asm segs.inc $(HDR)stacks.inc
-
-apisupt.obj: apisupt.asm segs.inc
-
-execrh.obj: execrh.asm segs.inc
-
-int2f.obj: int2f.asm segs.inc
-
-intr.obj: intr.asm segs.inc
-
-io.obj: io.asm segs.inc
-
-irqstack.obj: irqstack.asm
-
-nls_hc.obj: nls_hc.asm segs.inc
-
-nlssupt.obj: nlssupt.asm segs.inc
-
-procsupt.obj: procsupt.asm segs.inc $(HDR)stacks.inc
-
-dosidle.obj: dosidle.asm segs.inc
-
-# XXX: Special handling for initialization modules -- this is required because
-# TC 2.01 cannot handle `#pragma option' like TC 3 can. -- ror4
-
-INITHEADERS=init-mod.h init-dat.h
-
-CONFIGURATION = turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).MAK
-
-HEADERS=\
- $(HDR)portab.h $(HDR)device.h $(HDR)mcb.h $(HDR)pcb.h \
- $(HDR)fat.h $(HDR)fcb.h $(HDR)tail.h $(HDR)time.h $(HDR)process.h \
- $(HDR)dcb.h $(HDR)sft.h $(HDR)cds.h $(HDR)exe.h $(HDR)fnode.h \
- $(HDR)dirmatch.h $(HDR)file.h $(HDR)clock.h $(HDR)kbd.h $(HDR)error.h \
- $(HDR)version.h globals.h proto.h dyndata.h
-# XXX: I generated these using `gcc -MM' and `sed', so they may not be
-# completely correct... -- ror4
-
-blockio.obj: blockio.c $(HEADERS) $(CONFIGURATION)
-
-break.obj: break.c $(HEADERS) $(CONFIGURATION)
-
-chario.obj: chario.c $(HEADERS) $(CONFIGURATION)
-
-dosfns.obj: dosfns.c $(HEADERS) $(CONFIGURATION)
-
-dosnames.obj: dosnames.c $(HEADERS) $(CONFIGURATION)
-
-dsk.obj: dsk.c $(HEADERS) $(CONFIGURATION)
-
-error.obj: error.c $(HEADERS) $(CONFIGURATION)
-
-fatdir.obj: fatdir.c $(HEADERS) $(CONFIGURATION)
-
-fatfs.obj: fatfs.c $(HEADERS) $(CONFIGURATION)
-
-fattab.obj: fattab.c $(HEADERS) $(CONFIGURATION)
-
-fcbfns.obj: fcbfns.c $(HEADERS) $(CONFIGURATION)
-
-inthndlr.obj: inthndlr.c $(HEADERS) $(CONFIGURATION)
-
-ioctl.obj: ioctl.c $(HEADERS) $(CONFIGURATION)
-
-memmgr.obj: memmgr.c $(HEADERS) $(CONFIGURATION)
-
-misc.obj: misc.c $(HEADERS) $(CONFIGURATION)
-
-lfnapi.obj: lfnapi.c $(HEADERS) $(CONFIGURATION)
-
-newstuff.obj: newstuff.c $(HEADERS) $(CONFIGURATION)
-
-network.obj: network.c $(HEADERS) $(CONFIGURATION)
-
-nls.obj: nls.c $(HEADERS) $(CONFIGURATION)
-
-# \
-# 001-437.nls
-
-prf.obj: prf.c $(HDR)portab.h $(CONFIGURATION)
-
-strings.obj: strings.c $(CONFIGURATION)
-
-sysclk.obj: sysclk.c $(HEADERS) $(CONFIGURATION)
-
-syspack.obj: syspack.c $(HEADERS) $(CONFIGURATION)
-
-systime.obj: systime.c $(HEADERS) $(CONFIGURATION)
-
-task.obj: task.c $(HEADERS) $(CONFIGURATION)
+apisupt.obj: apisupt.asm segs.inc $(TARGET).lnk
+asmsupt.obj: asmsupt.asm segs.inc $(TARGET).lnk
+console.obj: console.asm io.inc $(TARGET).lnk
+dosidle.obj: dosidle.asm segs.inc $(TARGET).lnk
+entry.obj: entry.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk
+execrh.obj: execrh.asm segs.inc $(TARGET).lnk
+int2f.obj: int2f.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk
+intr.obj: intr.asm segs.inc $(TARGET).lnk
+io.obj: io.asm segs.inc $(TARGET).lnk
+irqstack.obj: irqstack.asm segs.inc $(TARGET).lnk
+kernel.obj: kernel.asm segs.inc ludivmul.inc $(TARGET).lnk
+nls_hc.obj: nls_hc.asm segs.inc $(TARGET).lnk
+nlssupt.obj: nlssupt.asm segs.inc $(TARGET).lnk
+printer.obj: printer.asm io.inc $(TARGET).lnk
+procsupt.obj: procsupt.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk
+serial.obj: serial.asm io.inc $(TARGET).lnk
+
+HEADERS=$(HDR)*.h dyndata.h globals.h proto.h
+INITHEADERS=$(HDR)*.h dyndata.h init-mod.h init-dat.h
+
+blockio.obj: blockio.c $(HEADERS) $(TARGET).lnk
+break.obj: break.c $(HEADERS) $(TARGET).lnk
+chario.obj: chario.c $(HEADERS) $(TARGET).lnk
+dosfns.obj: dosfns.c $(HEADERS) $(TARGET).lnk
+dosnames.obj: dosnames.c $(HEADERS) $(TARGET).lnk
+dsk.obj: dsk.c $(HEADERS) $(TARGET).lnk
+error.obj: error.c $(HEADERS) $(TARGET).lnk
+fatdir.obj: fatdir.c $(HEADERS) $(TARGET).lnk
+fatfs.obj: fatfs.c $(HEADERS) $(TARGET).lnk
+fattab.obj: fattab.c $(HEADERS) $(TARGET).lnk
+fcbfns.obj: fcbfns.c $(HEADERS) $(TARGET).lnk
+inthndlr.obj: inthndlr.c $(HEADERS) $(TARGET).lnk
+ioctl.obj: ioctl.c $(HEADERS) $(TARGET).lnk
+lfnapi.obj: lfnapi.c $(HEADERS) $(TARGET).lnk
+memmgr.obj: memmgr.c $(HEADERS) $(TARGET).lnk
+misc.obj: misc.c $(HEADERS) $(TARGET).lnk
+network.obj: network.c $(HEADERS) $(TARGET).lnk
+newstuff.obj: newstuff.c $(HEADERS) $(TARGET).lnk
+nls.obj: nls.c $(HEADERS) $(TARGET).lnk
+prf.obj: prf.c $(HDR)portab.h $(TARGET).lnk
+strings.obj: strings.c $(TARGET).lnk
+sysclk.obj: sysclk.c $(HEADERS) $(TARGET).lnk
+syspack.obj: syspack.c $(HEADERS) $(TARGET).lnk
+systime.obj: systime.c $(HEADERS) $(TARGET).lnk
+task.obj: task.c $(HEADERS) $(TARGET).lnk
# now the funny stuff :-)
# Files in the INIT segment
-# $(CC) $(INITCFLAGS) -c $*.c
-# patchobj $*.obj $(INITPATCH)
+# XXX: Special handling for initialization modules -- this is required because
+# TC 2.01 cannot handle `#pragma option' like TC 3 can. -- ror4
-config.obj: config.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
-
-initoem.obj: initoem.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
-
-main.obj: main.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
-
-inithma.obj: inithma.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
-
-dyninit.obj: dyninit.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
-
-initdisk.obj: initdisk.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
-
-initclk.obj: initclk.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
+config.obj: config.c $(INITHEADERS) $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
+
+dyninit.obj: dyninit.c $(INITHEADERS) $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
+
+initclk.obj: initclk.c $(INITHEADERS) $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
+
+initdisk.obj: initdisk.c $(INITHEADERS) $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
+
+inithma.obj: inithma.c $(INITHEADERS) $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
+
+initoem.obj: initoem.c $(INITHEADERS) $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
+
+main.obj: main.c $(INITHEADERS) $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
#the printf for INIT_TEXT - yet another special case, this file includes prf.c
-iprf.obj: iprf.c prf.c $(HDR)portab.h $(CONFIGURATION)
- $(CC) $(INITCFLAGS) $*.c
- $(INITPATCH) $*.obj
+
+iprf.obj: iprf.c prf.c $(HDR)portab.h $(TARGET).lnk
+ $(CC) $(INITCFLAGS) $*.c
+ $(INITPATCH) $*.obj
diff -ruNp 0old/kernel/nls_load.c 0new/kernel/nls_load.c
--- 0old/kernel/nls_load.c 2003-06-27 23:02:56.000000000 +0000
+++ 0new/kernel/nls_load.c 1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/****************************************************************/
-/* */
-/* nls_load.c */
-/* FreeDOS */
-/* */
-/* National Languge Support functions and data structures */
-/* Load an entry from FreeDOS COUNTRY.SYS file. */
-/* */
-/* Copyright (c) 2000 */
-/* Steffen Kaiser */
-/* All Rights Reserved */
-/* */
-/* This file is part of FreeDOS. */
-/* */
-/* DOS-C is free software; you can redistribute it and/or */
-/* modify it under the terms of the GNU General Public License */
-/* as published by the Free Software Foundation; either version */
-/* 2, or (at your option) any later version. */
-/* */
-/* DOS-C is distributed in the hope that it will be useful, but */
-/* WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */
-/* the GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public */
-/* License along with DOS-C; see the file COPYING. If not, */
-/* write to the Free Software Foundation, 675 Mass Ave, */
-/* Cambridge, MA 02139, USA. */
-/****************************************************************/
-
-#include "portab.h"
-#include "init-mod.h"
-
-#ifdef VERSION_STRINGS
-static BYTE *RcsId =
- "$Id: nls_load.c,v 1.8 2003/06/27 22:02:57 bartoldeman Exp $";
-#endif
-
-/** Setup the environment for shared source NLS_LOAD.SRC **/
-/**ska obsoleted #define cfgMemory Config.cfgCSYS_memory */
-/**ska obsoleted #define cfgFilename Config.cfgCSYS_fnam */
-#define cfgFilename nlsInfo.fname /* char FAR * */
-/**ska obsoleted #define cfgCountry Config.cfgCSYS_cntry */
-/**ska obsoleted #define cfgCodepage Config.cfgCSYS_cp */
-#define cfgData Config.cfgCSYS_data /* struct nlsCSys_loadPackage FAR * */
-#define getMem(bytes) KernelAlloc(bytes)
-#define openSYSFile(filename) open(filename, 0) /* read-only, binary */
-#define nlsStartOfChain nlsInfo.chain
-#define upCaseFct CharMapSrvc
-
-#include "nls_load.src"
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Freedos-kernel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freedos-kernel
--- End Message ---
