Fossil SCM

Tweak the previous commit and put extra headers at the end.

florian 2023-04-22 14:46 trunk

Commit 391927155a44ebdf8e0def32a4c355ff9ca6d19d4150a22342d41a926087d42c

Parent c2f56d2bc82be04…

2 files changed +6 -4 +2 -2

M tools/makemake.tcl

+6 -4

		--- tools/makemake.tcl
		+++ tools/makemake.tcl
		@@ -2049,17 +2049,19 @@
2049	2049	foreach s [lsort $extra_files] {
2050	2050	writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2051	2051	set redir {>>}
2052	2052	}
2053	2053
2054		-set extra_h(builtin) " \"\$(OX)\\builtin_data.h\" "
2055		-set extra_h(dispatch) " \"\$(OX)\\page_index.h\" "
2056		-set extra_h(main) { }
	2054	+foreach s [lsort $src] {
	2055	+ set extra_h($s) {}
	2056	+}
	2057	+set extra_h(builtin) " \"\$(OX)\\builtin_data.h\""
	2058	+set extra_h(dispatch) " \"\$(OX)\\page_index.h\""
2057	2059
2058	2060	writeln ""
2059	2061	foreach s [lsort $src] {
2060		- writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}_.c\"$extra_h($s)\"\$(OX)\\${s}.h\""
	2062	+ writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}_.c\" \"\$(OX)\\${s}.h\"$extra_h($s)"
2061	2063	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}_.c\"\n"
2062	2064	writeln "\"\$(OX)\\${s}_.c\" : \"\$(SRCDIR)\\$s.c\""
2063	2065	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2064	2066	}
2065	2067
2066	2068

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -2049,17 +2049,19 @@
2049	foreach s [lsort $extra_files] {
2050	writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2051	set redir {>>}
2052	}
2053
2054	set extra_h(builtin) " \"\$(OX)\\builtin_data.h\" "
2055	set extra_h(dispatch) " \"\$(OX)\\page_index.h\" "
2056	set extra_h(main) { }


2057
2058	writeln ""
2059	foreach s [lsort $src] {
2060	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}_.c\"$extra_h($s)\"\$(OX)\\${s}.h\""
2061	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}_.c\"\n"
2062	writeln "\"\$(OX)\\${s}_.c\" : \"\$(SRCDIR)\\$s.c\""
2063	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2064	}
2065
2066

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -2049,17 +2049,19 @@
2049	foreach s [lsort $extra_files] {
2050	writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2051	set redir {>>}
2052	}
2053
2054	foreach s [lsort $src] {
2055	set extra_h($s) {}
2056	}
2057	set extra_h(builtin) " \"\$(OX)\\builtin_data.h\""
2058	set extra_h(dispatch) " \"\$(OX)\\page_index.h\""
2059
2060	writeln ""
2061	foreach s [lsort $src] {
2062	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}_.c\" \"\$(OX)\\${s}.h\"$extra_h($s)"
2063	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}_.c\"\n"
2064	writeln "\"\$(OX)\\${s}_.c\" : \"\$(SRCDIR)\\$s.c\""
2065	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2066	}
2067
2068

M win/Makefile.msc

+2 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -1313,11 +1313,11 @@
1313	1313	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse_.c"
1314	1314
1315	1315	"$(OX)\browse_.c" : "$(SRCDIR)\browse.c"
1316	1316	"$(OBJDIR)\translate$E" $** > $@
1317	1317
1318		-"$(OX)\builtin$O" : "$(OX)\builtin_.c" "$(OX)\builtin_data.h" "$(OX)\builtin.h"
	1318	+"$(OX)\builtin$O" : "$(OX)\builtin_.c" "$(OX)\builtin.h" "$(OX)\builtin_data.h"
1319	1319	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin_.c"
1320	1320
1321	1321	"$(OX)\builtin_.c" : "$(SRCDIR)\builtin.c"
1322	1322	"$(OBJDIR)\translate$E" $** > $@
1323	1323
		@@ -1451,11 +1451,11 @@
1451	1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd_.c"
1452	1452
1453	1453	"$(OX)\diffcmd_.c" : "$(SRCDIR)\diffcmd.c"
1454	1454	"$(OBJDIR)\translate$E" $** > $@
1455	1455
1456		-"$(OX)\dispatch$O" : "$(OX)\dispatch_.c" "$(OX)\page_index.h" "$(OX)\dispatch.h"
	1456	+"$(OX)\dispatch$O" : "$(OX)\dispatch_.c" "$(OX)\dispatch.h" "$(OX)\page_index.h"
1457	1457	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch_.c"
1458	1458
1459	1459	"$(OX)\dispatch_.c" : "$(SRCDIR)\dispatch.c"
1460	1460	"$(OBJDIR)\translate$E" $** > $@
1461	1461
1462	1462

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1313,11 +1313,11 @@
1313	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse_.c"
1314
1315	"$(OX)\browse_.c" : "$(SRCDIR)\browse.c"
1316	"$(OBJDIR)\translate$E" $** > $@
1317
1318	"$(OX)\builtin$O" : "$(OX)\builtin_.c" "$(OX)\builtin_data.h" "$(OX)\builtin.h"
1319	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin_.c"
1320
1321	"$(OX)\builtin_.c" : "$(SRCDIR)\builtin.c"
1322	"$(OBJDIR)\translate$E" $** > $@
1323
	@@ -1451,11 +1451,11 @@
1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd_.c"
1452
1453	"$(OX)\diffcmd_.c" : "$(SRCDIR)\diffcmd.c"
1454	"$(OBJDIR)\translate$E" $** > $@
1455
1456	"$(OX)\dispatch$O" : "$(OX)\dispatch_.c" "$(OX)\page_index.h" "$(OX)\dispatch.h"
1457	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch_.c"
1458
1459	"$(OX)\dispatch_.c" : "$(SRCDIR)\dispatch.c"
1460	"$(OBJDIR)\translate$E" $** > $@
1461
1462

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1313,11 +1313,11 @@
1313	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse_.c"
1314
1315	"$(OX)\browse_.c" : "$(SRCDIR)\browse.c"
1316	"$(OBJDIR)\translate$E" $** > $@
1317
1318	"$(OX)\builtin$O" : "$(OX)\builtin_.c" "$(OX)\builtin.h" "$(OX)\builtin_data.h"
1319	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin_.c"
1320
1321	"$(OX)\builtin_.c" : "$(SRCDIR)\builtin.c"
1322	"$(OBJDIR)\translate$E" $** > $@
1323
	@@ -1451,11 +1451,11 @@
1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd_.c"
1452
1453	"$(OX)\diffcmd_.c" : "$(SRCDIR)\diffcmd.c"
1454	"$(OBJDIR)\translate$E" $** > $@
1455
1456	"$(OX)\dispatch$O" : "$(OX)\dispatch_.c" "$(OX)\dispatch.h" "$(OX)\page_index.h"
1457	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch_.c"
1458
1459	"$(OX)\dispatch_.c" : "$(SRCDIR)\dispatch.c"
1460	"$(OBJDIR)\translate$E" $** > $@
1461
1462