Fossil SCM

Include main.mk in the makefile integration for the codecheck1 tool. Also fix dependency issue with the MinGW makefiles.

mistachkin 2014-10-21 02:09 UTC compile-time-print-checking
Commit 5ea84522ec867b34af8fe091170be4409ea8a363
Parent 5edc01934c5ca58…
5 files changed +1 -1 +3 -2 +4 -3 +1 -1 +1 -1
~ src/codecheck1.c ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/codecheck1.c
+1 -1
--- src/codecheck1.c
+++ src/codecheck1.c
@@ -433,11 +433,11 @@
433433
 int len;
434434
 const char *zStart;
435435
 char *z;
436436
 char *zCopy;
437437
 int nArg = 0;
438
- char **azArg = 0;
438
+ char const **azArg = 0;
439439
 int i, k;
440440
 int nErr = 0;
441441
 char *acType;
442442
443443
 szFName = token_length(zFCall, &eToken, &ln);
444444
--- src/codecheck1.c
+++ src/codecheck1.c
@@ -433,11 +433,11 @@
433 int len;
434 const char *zStart;
435 char *z;
436 char *zCopy;
437 int nArg = 0;
438 char **azArg = 0;
439 int i, k;
440 int nErr = 0;
441 char *acType;
442
443 szFName = token_length(zFCall, &eToken, &ln);
444
--- src/codecheck1.c
+++ src/codecheck1.c
@@ -433,11 +433,11 @@
433 int len;
434 const char *zStart;
435 char *z;
436 char *zCopy;
437 int nArg = 0;
438 char const **azArg = 0;
439 int i, k;
440 int nErr = 0;
441 char *acType;
442
443 szFName = token_length(zFCall, &eToken, &ln);
444
M src/main.mk
+3 -2
--- src/main.mk
+++ src/main.mk
@@ -360,11 +360,11 @@
360360
361361
 install: $(APPNAME)
362362
 mkdir -p $(INSTALLDIR)
363363
 mv $(APPNAME) $(INSTALLDIR)
364364
365
-codecheck: $(APPNAME) $(OBJDIR)/codecheck1
365
+codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
366366
 $(OBJDIR)/codecheck1 $(TRANS_SRC)
367367
368368
 $(OBJDIR):
369369
 -mkdir $(OBJDIR)
370370
@@ -436,11 +436,12 @@
436436
 $(OBJDIR)/th_lang.o \
437437
 $(OBJDIR)/th_tcl.o \
438438
 $(OBJDIR)/cson_amalgamation.o
439439
440440
441
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
441
+$(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ)
442
+ $(OBJDIR)/codecheck1 $(TRANS_SRC)
442443
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
443444
444445
 # This rule prevents make from using its default rules to try build
445446
 # an executable named "manifest" out of the file named "manifest.c"
446447
 #
447448
--- src/main.mk
+++ src/main.mk
@@ -360,11 +360,11 @@
360
361 install: $(APPNAME)
362 mkdir -p $(INSTALLDIR)
363 mv $(APPNAME) $(INSTALLDIR)
364
365 codecheck: $(APPNAME) $(OBJDIR)/codecheck1
366 $(OBJDIR)/codecheck1 $(TRANS_SRC)
367
368 $(OBJDIR):
369 -mkdir $(OBJDIR)
370
@@ -436,11 +436,12 @@
436 $(OBJDIR)/th_lang.o \
437 $(OBJDIR)/th_tcl.o \
438 $(OBJDIR)/cson_amalgamation.o
439
440
441 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
 
442 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
443
444 # This rule prevents make from using its default rules to try build
445 # an executable named "manifest" out of the file named "manifest.c"
446 #
447
--- src/main.mk
+++ src/main.mk
@@ -360,11 +360,11 @@
360
361 install: $(APPNAME)
362 mkdir -p $(INSTALLDIR)
363 mv $(APPNAME) $(INSTALLDIR)
364
365 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
366 $(OBJDIR)/codecheck1 $(TRANS_SRC)
367
368 $(OBJDIR):
369 -mkdir $(OBJDIR)
370
@@ -436,11 +436,12 @@
436 $(OBJDIR)/th_lang.o \
437 $(OBJDIR)/th_tcl.o \
438 $(OBJDIR)/cson_amalgamation.o
439
440
441 $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ)
442 $(OBJDIR)/codecheck1 $(TRANS_SRC)
443 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
444
445 # This rule prevents make from using its default rules to try build
446 # an executable named "manifest" out of the file named "manifest.c"
447 #
448
M src/makemake.tcl
+4 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -241,11 +241,11 @@
241241
242242
 install: $(APPNAME)
243243
 mkdir -p $(INSTALLDIR)
244244
 mv $(APPNAME) $(INSTALLDIR)
245245
246
-codecheck: $(APPNAME) $(OBJDIR)/codecheck1
246
+codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
247247
 $(OBJDIR)/codecheck1 $(TRANS_SRC)
248248
249249
 $(OBJDIR):
250250
 -mkdir $(OBJDIR)
251251
@@ -310,11 +310,12 @@
310310
 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
311311
 $(OBJDIR)/cson_amalgamation.o
312312
 }]
313313
314314
 writeln {
315
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
315
+$(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ)
316
+ $(OBJDIR)/codecheck1 $(TRANS_SRC)
316317
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
317318
318319
 # This rule prevents make from using its default rules to try build
319320
 # an executable named "manifest" out of the file named "manifest.c"
320321
 #
@@ -897,11 +898,11 @@
897898
898899
 ifdef FOSSIL_BUILD_SSL
899900
 APPTARGETS += openssl
900901
 endif
901902
902
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
903
+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
903904
 $(CODECHECK1) $(TRANS_SRC)
904905
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
905906
906907
 # This rule prevents make from using its default rules to try build
907908
 # an executable named "manifest" out of the file named "manifest.c"
908909
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -241,11 +241,11 @@
241
242 install: $(APPNAME)
243 mkdir -p $(INSTALLDIR)
244 mv $(APPNAME) $(INSTALLDIR)
245
246 codecheck: $(APPNAME) $(OBJDIR)/codecheck1
247 $(OBJDIR)/codecheck1 $(TRANS_SRC)
248
249 $(OBJDIR):
250 -mkdir $(OBJDIR)
251
@@ -310,11 +310,12 @@
310 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
311 $(OBJDIR)/cson_amalgamation.o
312 }]
313
314 writeln {
315 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
 
316 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
317
318 # This rule prevents make from using its default rules to try build
319 # an executable named "manifest" out of the file named "manifest.c"
320 #
@@ -897,11 +898,11 @@
897
898 ifdef FOSSIL_BUILD_SSL
899 APPTARGETS += openssl
900 endif
901
902 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
903 $(CODECHECK1) $(TRANS_SRC)
904 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
905
906 # This rule prevents make from using its default rules to try build
907 # an executable named "manifest" out of the file named "manifest.c"
908
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -241,11 +241,11 @@
241
242 install: $(APPNAME)
243 mkdir -p $(INSTALLDIR)
244 mv $(APPNAME) $(INSTALLDIR)
245
246 codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
247 $(OBJDIR)/codecheck1 $(TRANS_SRC)
248
249 $(OBJDIR):
250 -mkdir $(OBJDIR)
251
@@ -310,11 +310,12 @@
310 $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
311 $(OBJDIR)/cson_amalgamation.o
312 }]
313
314 writeln {
315 $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ)
316 $(OBJDIR)/codecheck1 $(TRANS_SRC)
317 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
318
319 # This rule prevents make from using its default rules to try build
320 # an executable named "manifest" out of the file named "manifest.c"
321 #
@@ -897,11 +898,11 @@
898
899 ifdef FOSSIL_BUILD_SSL
900 APPTARGETS += openssl
901 endif
902
903 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
904 $(CODECHECK1) $(TRANS_SRC)
905 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
906
907 # This rule prevents make from using its default rules to try build
908 # an executable named "manifest" out of the file named "manifest.c"
909
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -820,11 +820,11 @@
820820
821821
 ifdef FOSSIL_BUILD_SSL
822822
 APPTARGETS += openssl
823823
 endif
824824
825
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
825
+$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826826
 $(CODECHECK1) $(TRANS_SRC)
827827
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828828
829829
 # This rule prevents make from using its default rules to try build
830830
 # an executable named "manifest" out of the file named "manifest.c"
831831
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -820,11 +820,11 @@
820
821 ifdef FOSSIL_BUILD_SSL
822 APPTARGETS += openssl
823 endif
824
825 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826 $(CODECHECK1) $(TRANS_SRC)
827 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828
829 # This rule prevents make from using its default rules to try build
830 # an executable named "manifest" out of the file named "manifest.c"
831
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -820,11 +820,11 @@
820
821 ifdef FOSSIL_BUILD_SSL
822 APPTARGETS += openssl
823 endif
824
825 $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826 $(CODECHECK1) $(TRANS_SRC)
827 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828
829 # This rule prevents make from using its default rules to try build
830 # an executable named "manifest" out of the file named "manifest.c"
831
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -820,11 +820,11 @@
820820
821821
 ifdef FOSSIL_BUILD_SSL
822822
 APPTARGETS += openssl
823823
 endif
824824
825
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
825
+$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826826
 $(CODECHECK1) $(TRANS_SRC)
827827
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828828
829829
 # This rule prevents make from using its default rules to try build
830830
 # an executable named "manifest" out of the file named "manifest.c"
831831
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -820,11 +820,11 @@
820
821 ifdef FOSSIL_BUILD_SSL
822 APPTARGETS += openssl
823 endif
824
825 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826 $(CODECHECK1) $(TRANS_SRC)
827 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828
829 # This rule prevents make from using its default rules to try build
830 # an executable named "manifest" out of the file named "manifest.c"
831
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -820,11 +820,11 @@
820
821 ifdef FOSSIL_BUILD_SSL
822 APPTARGETS += openssl
823 endif
824
825 $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826 $(CODECHECK1) $(TRANS_SRC)
827 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828
829 # This rule prevents make from using its default rules to try build
830 # an executable named "manifest" out of the file named "manifest.c"
831

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button