Fossil SCM

Fix a missing dependency in the makefiles. Ticket [e5b941cb0c90ba]

drh 2011-06-28 00:17 UTC trunk
Commit 5392b5c28b1ac1468994b48eca0185664ca37ee8
Parent 745db63526e5bc2…
3 files changed +1 -1 +2 -2 +1 -1
~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -892,11 +892,11 @@
892892
893893
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
894894
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
895895
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
896896
897
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c
897
+$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
898898
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
899899
900900
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
901901
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
902902
903903
--- src/main.mk
+++ src/main.mk
@@ -892,11 +892,11 @@
892
893 $(OBJDIR)/zip.h: $(OBJDIR)/headers
894 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
895 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
896
897 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c
898 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
899
900 $(OBJDIR)/th.o: $(SRCDIR)/th.c
901 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
902
903
--- src/main.mk
+++ src/main.mk
@@ -892,11 +892,11 @@
892
893 $(OBJDIR)/zip.h: $(OBJDIR)/headers
894 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
895 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
896
897 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
898 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
899
900 $(OBJDIR)/th.o: $(SRCDIR)/th.c
901 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
902
903
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -246,11 +246,11 @@
246246
 append opt " -Dlocaltime=fossil_localtime"
247247
 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
248248
 set SQLITE_OPTIONS $opt
249249
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
250250
251
-writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c"
251
+writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
252252
 set opt {-Dmain=sqlite3_shell}
253253
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
254254
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
255255
256256
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
@@ -458,11 +458,11 @@
458458
459459
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
460460
 set opt $SQLITE_OPTIONS
461461
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
462462
463
-writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c"
463
+writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
464464
 set opt {-Dmain=sqlite3_shell}
465465
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
466466
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
467467
468468
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
469469
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -246,11 +246,11 @@
246 append opt " -Dlocaltime=fossil_localtime"
247 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
248 set SQLITE_OPTIONS $opt
249 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
250
251 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c"
252 set opt {-Dmain=sqlite3_shell}
253 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
254 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
255
256 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
@@ -458,11 +458,11 @@
458
459 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
460 set opt $SQLITE_OPTIONS
461 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
462
463 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c"
464 set opt {-Dmain=sqlite3_shell}
465 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
466 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
467
468 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
469
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -246,11 +246,11 @@
246 append opt " -Dlocaltime=fossil_localtime"
247 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
248 set SQLITE_OPTIONS $opt
249 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
250
251 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
252 set opt {-Dmain=sqlite3_shell}
253 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
254 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
255
256 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
@@ -458,11 +458,11 @@
458
459 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
460 set opt $SQLITE_OPTIONS
461 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
462
463 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
464 set opt {-Dmain=sqlite3_shell}
465 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
466 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
467
468 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
469
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -970,11 +970,11 @@
970970
971971
 zip.h: $(OBJDIR)/headers
972972
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
973973
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
974974
975
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c
975
+$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
976976
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
977977
978978
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
979979
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
980980
981981
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -970,11 +970,11 @@
970
971 zip.h: $(OBJDIR)/headers
972 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
973 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
974
975 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c
976 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
977
978 $(OBJDIR)/th.o: $(SRCDIR)/th.c
979 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
980
981
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -970,11 +970,11 @@
970
971 zip.h: $(OBJDIR)/headers
972 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
973 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
974
975 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
976 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
977
978 $(OBJDIR)/th.o: $(SRCDIR)/th.c
979 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
980
981

Keyboard Shortcuts

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