Fossil SCM

Minor makefile consistency fix.

mistachkin 2016-04-22 20:02 trunk
Commit 6c4a0a0ae51c14419e035341faff9a495a92744c
1 file changed +3 -3
+3 -3
--- src/main.mk
+++ src/main.mk
@@ -508,12 +508,12 @@
508508
509509
# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
510510
# to 1. If it is set to 1, then there is no need to build or link
511511
# the sqlite3.o object. Instead, the system SQLite will be linked
512512
# using -lsqlite3.
513
-SQLITE3_OBJ.1 =
514513
SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
514
+SQLITE3_OBJ.1 =
515515
SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
516516
517517
# The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
518518
# set to 1. If it is set to 1, the miniz library included in the
519519
# source tree should be used; otherwise, it should not.
@@ -533,16 +533,16 @@
533533
534534
# The USE_SEE variable may be undefined, 0 or 1. If undefined or
535535
# 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
536536
# the source tree) is used and extra flags are provided to enable
537537
# the SQLite Encryption Extension.
538
-SQLITE3_SRC.1 = sqlite3-see.c
539538
SQLITE3_SRC.0 = sqlite3.c
539
+SQLITE3_SRC.1 = sqlite3-see.c
540540
SQLITE3_SRC. = sqlite3.c
541541
SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
542
-SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
543542
SEE_FLAGS.0 =
543
+SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
544544
SEE_FLAGS. =
545545
SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
546546
547547
548548
EXTRAOBJ = \
549549
--- src/main.mk
+++ src/main.mk
@@ -508,12 +508,12 @@
508
509 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
510 # to 1. If it is set to 1, then there is no need to build or link
511 # the sqlite3.o object. Instead, the system SQLite will be linked
512 # using -lsqlite3.
513 SQLITE3_OBJ.1 =
514 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
 
515 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
516
517 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
518 # set to 1. If it is set to 1, the miniz library included in the
519 # source tree should be used; otherwise, it should not.
@@ -533,16 +533,16 @@
533
534 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
535 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
536 # the source tree) is used and extra flags are provided to enable
537 # the SQLite Encryption Extension.
538 SQLITE3_SRC.1 = sqlite3-see.c
539 SQLITE3_SRC.0 = sqlite3.c
 
540 SQLITE3_SRC. = sqlite3.c
541 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
542 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
543 SEE_FLAGS.0 =
 
544 SEE_FLAGS. =
545 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
546
547
548 EXTRAOBJ = \
549
--- src/main.mk
+++ src/main.mk
@@ -508,12 +508,12 @@
508
509 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
510 # to 1. If it is set to 1, then there is no need to build or link
511 # the sqlite3.o object. Instead, the system SQLite will be linked
512 # using -lsqlite3.
 
513 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
514 SQLITE3_OBJ.1 =
515 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
516
517 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
518 # set to 1. If it is set to 1, the miniz library included in the
519 # source tree should be used; otherwise, it should not.
@@ -533,16 +533,16 @@
533
534 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
535 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
536 # the source tree) is used and extra flags are provided to enable
537 # the SQLite Encryption Extension.
 
538 SQLITE3_SRC.0 = sqlite3.c
539 SQLITE3_SRC.1 = sqlite3-see.c
540 SQLITE3_SRC. = sqlite3.c
541 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
542 SEE_FLAGS.0 =
543 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
544 SEE_FLAGS. =
545 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
546
547
548 EXTRAOBJ = \
549

Keyboard Shortcuts

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