Fossil SCM

applied patch from Steve Bennett for ticket [1d6a4c423bc8b116464].

stephan 2014-11-27 17:37 trunk

Commit 40f1b288cfa130e2bb3eaacf60076f347e25d278

Parent 194c3ff362a9243…

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

M Makefile.in

+1 -1

		--- Makefile.in
		+++ Makefile.in
		@@ -37,11 +37,11 @@
37	37	# care about testing the end result, this can be blank.
38	38	#
39	39	TCLSH = tclsh
40	40
41	41	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42		-TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
	42	+TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
43	43	INSTALLDIR = $(DESTDIR)@prefix@/bin
44	44	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
45	45	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
46	46
47	47	include $(SRCDIR)/main.mk
48	48

	--- Makefile.in
	+++ Makefile.in
	@@ -37,11 +37,11 @@
37	# care about testing the end result, this can be blank.
38	#
39	TCLSH = tclsh
40
41	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42	TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
43	INSTALLDIR = $(DESTDIR)@prefix@/bin
44	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
45	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
46
47	include $(SRCDIR)/main.mk
48

	--- Makefile.in
	+++ Makefile.in
	@@ -37,11 +37,11 @@
37	# care about testing the end result, this can be blank.
38	#
39	TCLSH = tclsh
40
41	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42	TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
43	INSTALLDIR = $(DESTDIR)@prefix@/bin
44	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
45	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
46
47	include $(SRCDIR)/main.mk
48

M src/main.mk

+1 -1

		--- src/main.mk
		+++ src/main.mk
		@@ -8,11 +8,11 @@
8	8	# to regenerate this file.
9	9	#
10	10	# This file is included by primary Makefile.
11	11	#
12	12
13		-XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) -I$(OBJDIR)
	13	+XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS)
14	14
15	15
16	16	SRC = \
17	17	$(SRCDIR)/add.c \
18	18	$(SRCDIR)/allrepo.c \
19	19

	--- src/main.mk
	+++ src/main.mk
	@@ -8,11 +8,11 @@
8	# to regenerate this file.
9	#
10	# This file is included by primary Makefile.
11	#
12
13	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) -I$(OBJDIR)
14
15
16	SRC = \
17	$(SRCDIR)/add.c \
18	$(SRCDIR)/allrepo.c \
19

	--- src/main.mk
	+++ src/main.mk
	@@ -8,11 +8,11 @@
8	# to regenerate this file.
9	#
10	# This file is included by primary Makefile.
11	#
12
13	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS)
14
15
16	SRC = \
17	$(SRCDIR)/add.c \
18	$(SRCDIR)/allrepo.c \
19

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -220,11 +220,11 @@
220	220	# to regenerate this file.
221	221	#
222	222	# This file is included by primary Makefile.
223	223	#
224	224
225		-XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) -I$(OBJDIR)
	225	+XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS)
226	226
227	227	}
228	228	writeln -nonewline "SRC ="
229	229	foreach s [lsort $src] {
230	230	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
231	231

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -220,11 +220,11 @@
220	# to regenerate this file.
221	#
222	# This file is included by primary Makefile.
223	#
224
225	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) -I$(OBJDIR)
226
227	}
228	writeln -nonewline "SRC ="
229	foreach s [lsort $src] {
230	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
231

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -220,11 +220,11 @@
220	# to regenerate this file.
221	#
222	# This file is included by primary Makefile.
223	#
224
225	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS)
226
227	}
228	writeln -nonewline "SRC ="
229	foreach s [lsort $src] {
230	writeln -nonewline " \\\n \$(SRCDIR)/$s.c"
231