Skip to content

Commit e1fe8a0

Browse files
jmalakPerditionC
jmalak
authored and
PerditionC
committed
build: remove redundant rules
handle echo...bat batch file more transparent way
1 parent 03bb3d5 commit e1fe8a0

File tree

13 files changed

+54
-58
lines changed

13 files changed

+54
-58
lines changed

‎clean.bat‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ call %0 strings\ strings.h strings.err strings.dat
1414
call %0 strings\ strings.lib strings.lst strings.log
1515
call %0 strings\strings\ strings.lib strings.lst strings.rsp makefile
1616
call %0 criter\ criter criter1 context.def context.inc context.h_c
17-
call %0 cmd\ cmds.lib cmds.lst cmds.rsp echolib.bat
18-
call %0 lib\ freecom.lib freecom.lst freecom.rsp echolib.bat
19-
call %0 shell\ command.exe command.map command.rsp echoto.bat
17+
call %0 cmd\ cmds.lib cmds.lst cmds.rsp
18+
call %0 lib\ freecom.lib freecom.lst freecom.rsp
19+
call %0 shell\ command.exe command.map command.rsp
2020
call %0 tools\ makefile.mak
2121

22-
call %0 strings\*. cfg obj exe
22+
call %0 strings\*. obj exe
2323
call %0 strings\strings\*. c obj
24-
call %0 tools\*. icd cfg obj map exe com
25-
call %0 utils\*. cfg obj map exe
24+
call %0 tools\*. icd obj map exe com
25+
call %0 utils\*. obj map exe
2626

2727
for %%i in (cmd lib shell criter) do if exist %%i\*.obj del %%i\*.obj>nul
28-
for %%i in (cmd lib shell criter) do if exist %%i\*.cfg del %%i\*.cfg>nul
28+
for %%i in (cmd lib shell string tools utils) do if exist %%i\*.cfg del %%i\*.cfg>nul
29+
for %%i in (cmd lib shell string tools utils) do if exist %%i\echoto.bat del %%i\echoto.bat>nul
30+
for %%i in (cmd lib shell string tools utils) do if exist %%i\echolib.bat del %%i\echolib.bat>nul
2931

3032
:end
3133

‎cmd/makefile.mak‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ OBJS4 = history.obj if.obj lfnfor.obj memory.obj mkdir.obj path.obj pause.obj
1212
OBJS5 = popd.obj prompt.obj pushd.obj rem.obj ren.obj rmdir.obj set.obj
1313
OBJS6 = shift.obj time.obj truename.obj type.obj verify.obj which.obj
1414

15-
echolib.bat : ../scripts/echolib.bat
16-
$(CP) ..$(DIRSEP)scripts$(DIRSEP)echolib.bat .
17-
18-
cmds.rsp : echolib.bat makefile.mak
15+
cmds.rsp : $(ECHOLIBDEP) makefile.mak
1916
$(RMFILES) cmds.rsp
2017
$(ECHOLIB) cmds.rsp $(OBJS1)
2118
$(ECHOLIB) cmds.rsp $(OBJS2)

‎config.std‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
# defaults for DOS; can be overridden in compiler makefiles
22
DIRSEP = \ #a backslash
3-
RMFILES = ..\scripts\rmfiles
4-
RMFILES2 = ..\..\scripts\rmfiles
5-
ECHOTO0 = echoto
6-
ECHOTO = $(TOP)\scripts\echoto
3+
ECHOTO = echoto
4+
ECHOTODEP = echoto.bat
5+
LIBLIST = ,
6+
ECHOLIB = echolib
7+
ECHOLIBDEP = echolib.bat
78
CP = copy
89
CLO =
10+
SCRIPTS_PATH = ..\scripts
11+
!if $(TOP2LVL)0 == 10
12+
SCRIPTS_PATH = ..\..\scripts
13+
!endif
14+
RMFILES = $(SCRIPTS_PATH)\rmfiles
915

1016
## Where the pre-compiled SUPPL files are located
1117
## See DOCS\SUPPL.TXT for more information about this library
@@ -55,14 +61,20 @@ MMODEL = $(FIXSTRS_MMODEL)
5561
##
5662
## (*) Note: Should be detected by CONFIG.H automatically for Turbo C
5763
## and Borland C compilers.
58-
$(CFG): $(CFG_DEPENDENCIES) $(TOP)/config.mak
64+
$(CFG): $(ECHOTODEP) $(CFG_DEPENDENCIES) $(TOP)/config.mak
5965
$(RMFILES) $(CFG)
6066
$(ECHOTO) $(CFG) $(CFLAGS1)
6167
$(ECHOTO) $(CFG) $(CFLAGS2)
6268
$(ECHOTO) $(CFG) $(INCLUDEPATH)
6369
$(ECHOTO) $(CFG) -m$(SHELL_MMODEL_COMP) $(MMODEL)
6470
$(ECHOTO) $(CFG) $(DEBUG) $(__XMS_SWAP)
6571

72+
echoto.bat: $(SCRIPTS_PATH)\echoto.bat
73+
$(CP) $(SCRIPTS_PATH)\echoto.bat .
74+
75+
echolib.bat: $(SCRIPTS_PATH)\echolib.bat
76+
$(CP) $(SCRIPTS_PATH)\echolib.bat .
77+
6678
# *Implicit Rules*
6779
.asm.obj:
6880
$(NASM) -f obj $(NASMFLAGS) -DMODEL=$(SHELL_MMODEL) -DCOMPILER=$(COMPILER) $(__XMS_SWAP) $<

‎lib/makefile.mak‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ OBJS34 = err71.obj err72.obj err73.obj err74.obj err75.obj err76.obj err77.obj
4444
OBJS35 = err78.obj err79.obj err80.obj err81.obj err82.obj err83.obj err84.obj
4545
OBJS36 = err85.obj err86.obj err87.obj
4646

47-
echolib.bat : ../scripts/echolib.bat
48-
$(CP) ..$(DIRSEP)scripts$(DIRSEP)echolib.bat .
49-
50-
freecom.rsp : echolib.bat makefile.mak
47+
freecom.rsp : $(ECHOLIBDEP) makefile.mak
5148
$(RMFILES) freecom.rsp
5249
$(ECHOLIB) freecom.rsp $(OBJS1)
5350
$(ECHOLIB) freecom.rsp $(OBJS2)

‎mkfiles/bc5.mak‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ CL = $(CC)
99
AR = $(BINPATH)\Tlib /C
1010
LD_RSP = command.rsp
1111
LD = $(BINPATH)\Tlink /m/s/l /c/d /i @$(LD_RSP)
12-
LIBLIST = ,
13-
ECHOLIB = echolib
1412

1513
OBJC0 = $(LIBPATH)\c0$(SHELL_MMODEL).obj
1614
LIBC = $(LIBPATH)\c$(SHELL_MMODEL).lib

‎mkfiles/gcc.mak‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Linux only for now
22
DIRSEP = /
3-
RMFILES = rm -f
4-
RMFILES2 = rm -f
53
ECHOTO = echo >>
6-
ECHOTO0 = echo >>
4+
ECHOTODEP =
5+
LIBLIST = >
6+
ECHOLIB = echo >>
7+
ECHOLIBDEP =
8+
RMFILES = rm -f
79
CP = cp
810
LIBC = -li86
911
NASMFLAGS := $(NASMFLAGS) -felf
@@ -16,8 +18,6 @@ CL = ia16-elf-gcc -mcmodel=small
1618
CLO = -o $@
1719
AR = ia16-elf-ar crsv
1820
LD = $(CL) $(CFLAGS1) -o command.exe $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) command.ld $(LIBS) $(LIBC) -Wl,-Map,command.map
19-
LIBLIST = >
20-
ECHOLIB = echo >>
2121

2222
CFG = gcc.cfg
2323
CFLAGS1 = -Os -Wall -Werror -Wno-pointer-to-int-cast -Wno-incompatible-pointer-types -mregparmcall -fno-builtin -fno-strict-aliasing -Wno-format -mfar-function-if-far-return-type -fno-caller-saves -fno-optimize-sibling-calls -fno-move-loop-invariants -fno-tree-loop-optimize -fno-rerun-cse-after-loop

‎mkfiles/tc2.mak‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ CL = $(CC)
77
AR = $(BINPATH)\Tlib /C
88
LD_RSP = command.rsp
99
LD = $(BINPATH)\Tlink /m/s/l /c/d @$(LD_RSP)
10-
LIBLIST = ,
11-
ECHOLIB = echolib
1210

1311
OBJC0 = $(LIBPATH)\c0$(SHELL_MMODEL).obj
1412
LIBC = $(LIBPATH)\c$(SHELL_MMODEL).lib

‎mkfiles/turbocpp.mak‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ CL = $(CC)
99
AR = $(BINPATH)\Tlib /C
1010
LD_RSP = command.rsp
1111
LD = $(BINPATH)\Tlink /m/s/l /c/d @$(LD_RSP)
12-
LIBLIST = ,
13-
ECHOLIB = echolib
1412

1513
OBJC0 = $(LIBPATH)\c0$(SHELL_MMODEL).obj
1614
LIBC = $(LIBPATH)\c$(SHELL_MMODEL).lib

‎mkfiles/watcom.mak‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
!ifdef __LINUX__
22
DIRSEP = /
33
RMFILES = rm -f
4-
RMFILES2 = rm -f
54
ECHOTO = echo >>
6-
ECHOTO0 = echo >>
5+
ECHOTODEP =
76
CP = cp
87
!endif
8+
LIBLIST = >
9+
ECHOLIB = echo >>
10+
ECHOLIBDEP =
911

1012
!ifdef __NT__
1113
!ifdef %ProgramFiles(x86)
@@ -31,8 +33,6 @@ INCLUDEPATH = -I$(CC_BASE_PATH)$(DIRSEP)h
3133
CC = $(BINPATH)$(DIRSEP)wcc -zq -fo=.obj
3234
CL = $(BINPATH)$(DIRSEP)wcl -zq -fo=.obj -bcl=dos
3335
AR = $(BINPATH)$(DIRSEP)wlib -n -c
34-
LIBLIST = >
35-
ECHOLIB = echo >>
3636

3737
CFG = watcomc.cfg
3838
CFLAGS1 = -os-s-wx

‎shell/makefile.mak‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,16 @@ LIBS = ..$(DIRSEP)cmd$(DIRSEP)cmds.lib ..$(DIRSEP)lib$(DIRSEP)freecom.lib \
2929
..$(DIRSEP)strings$(DIRSEP)strings.lib \
3030
$(SUPPL_LIB_PATH)$(DIRSEP)suppl_$(SHELL_MMODEL).lib
3131

32-
echoto.bat: ../scripts/echoto.bat
33-
$(CP) ..$(DIRSEP)scripts$(DIRSEP)echoto.bat .
34-
35-
command.rsp : echoto.bat
32+
command.rsp : $(ECHOTODEP)
3633
$(RMFILES) command.rsp
37-
$(ECHOTO0) command.rsp $(OBJ1)+
38-
$(ECHOTO0) command.rsp $(OBJ2)+
39-
$(ECHOTO0) command.rsp $(OBJ3)+
40-
$(ECHOTO0) command.rsp $(OBJ4)
41-
$(ECHOTO0) command.rsp command.exe
42-
$(ECHOTO0) command.rsp command.map
43-
$(ECHOTO0) command.rsp $(LIBS)+
44-
$(ECHOTO0) command.rsp $(LIBC)
34+
$(ECHOTO) command.rsp $(OBJ1)+
35+
$(ECHOTO) command.rsp $(OBJ2)+
36+
$(ECHOTO) command.rsp $(OBJ3)+
37+
$(ECHOTO) command.rsp $(OBJ4)
38+
$(ECHOTO) command.rsp command.exe
39+
$(ECHOTO) command.rsp command.map
40+
$(ECHOTO) command.rsp $(LIBS)+
41+
$(ECHOTO) command.rsp $(LIBC)
4542

4643
command.exe : $(CFG) $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(LIBS) $(LD_RSP)
4744
$(LD)

0 commit comments

Comments
 (0)