Fossil SCM

Corrected path to mkbuiltin.c in Makefile.msc. Corrected, perhaps, build of tools/*.c, in Makefile.PellesCGMake.

stephan 2021-12-25 19:29 code-movement

Commit 1b1938e2133308d5046a7092c84c8e2ba075b500b0dc0283d95b8455e66d13b5

Parent 5e203da667e656c…

3 files changed +1 -1 +2 -1 +1 -1

M tools/makemake.tcl

+1 -1

		--- tools/makemake.tcl
		+++ tools/makemake.tcl
		@@ -1968,11 +1968,11 @@
1968	1968	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1969	1969
1970	1970	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1971	1971	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1972	1972
1973		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
	1973	+"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR_tools)\mkbuiltin.c"
1974	1974	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1975	1975
1976	1976	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1977	1977	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1978	1978
1979	1979

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -1968,11 +1968,11 @@
1968	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1969
1970	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1971	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1972
1973	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1974	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1975
1976	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1977	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1978
1979

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -1968,11 +1968,11 @@
1968	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1969
1970	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1971	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1972
1973	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR_tools)\mkbuiltin.c"
1974	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1975
1976	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1977	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1978
1979

M win/Makefile.PellesCGMake

+2 -1

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -54,10 +54,11 @@
54	54
55	55	# define the project directories
56	56	B=..
57	57	SRCDIR=$(B)/src/
58	58	SRCDIR_extsrc=$(B)/extsrc/
	59	+SRCDIR_tools=$(B)/tools/
59	60	WINDIR=$(B)/win/
60	61	ZLIBSRCDIR=../../zlib/
61	62
62	63	# define linker command and options
63	64	LINK=$(PellesCDir)/bin/polink.exe
		@@ -78,11 +79,11 @@
78	79
79	80	# define the special utilities files, needed to generate
80	81	# the automatically generated source files
81	82	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
82	83	UTILS_OBJ=$(UTILS:.exe=.obj)
83		-UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_extsrc)$(uf:.exe=.c))
	84	+UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_tools)$(uf:.exe=.c))
84	85
85	86	# define the SQLite files, which need special flags on compile
86	87	SQLITESRC=sqlite3.c
87	88	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf))
88	89	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
89	90

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -54,10 +54,11 @@
54
55	# define the project directories
56	B=..
57	SRCDIR=$(B)/src/
58	SRCDIR_extsrc=$(B)/extsrc/

59	WINDIR=$(B)/win/
60	ZLIBSRCDIR=../../zlib/
61
62	# define linker command and options
63	LINK=$(PellesCDir)/bin/polink.exe
	@@ -78,11 +79,11 @@
78
79	# define the special utilities files, needed to generate
80	# the automatically generated source files
81	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
82	UTILS_OBJ=$(UTILS:.exe=.obj)
83	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_extsrc)$(uf:.exe=.c))
84
85	# define the SQLite files, which need special flags on compile
86	SQLITESRC=sqlite3.c
87	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf))
88	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
89

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -54,10 +54,11 @@
54
55	# define the project directories
56	B=..
57	SRCDIR=$(B)/src/
58	SRCDIR_extsrc=$(B)/extsrc/
59	SRCDIR_tools=$(B)/tools/
60	WINDIR=$(B)/win/
61	ZLIBSRCDIR=../../zlib/
62
63	# define linker command and options
64	LINK=$(PellesCDir)/bin/polink.exe
	@@ -78,11 +79,11 @@
79
80	# define the special utilities files, needed to generate
81	# the automatically generated source files
82	UTILS=translate.exe mkindex.exe makeheaders.exe mkbuiltin.exe
83	UTILS_OBJ=$(UTILS:.exe=.obj)
84	UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR_tools)$(uf:.exe=.c))
85
86	# define the SQLite files, which need special flags on compile
87	SQLITESRC=sqlite3.c
88	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf))
89	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
90

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -1023,11 +1023,11 @@
1023	1023	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1024	1024
1025	1025	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1026	1026	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1027	1027
1028		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
	1028	+"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR_tools)\mkbuiltin.c"
1029	1029	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1030	1030
1031	1031	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1032	1032	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1033	1033
1034	1034

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1023,11 +1023,11 @@
1023	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1024
1025	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1026	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1027
1028	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1029	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1030
1031	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1032	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1033
1034

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1023,11 +1023,11 @@
1023	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1024
1025	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1026	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1027
1028	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR_tools)\mkbuiltin.c"
1029	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1030
1031	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1032	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1033
1034