eff52c1ccbd… — Fossil SCM

M BUILD.txt

+23 -17

		--- BUILD.txt
		+++ BUILD.txt
		@@ -1,22 +1,21 @@
1		-To do a complete build on most unix systems, just type:
2		-
3		- make
4		-
5		-If you have an unusual unix system for which the standard Makefile
6		-will not work, or if you want to do some non-standard options, you can
7		-also run:
	1	+To do a complete build, just type:
8	2
9	3	./configure; make
10	4
11		-The ./configure script builds GNUmakefile which will be used in place
12		-of Makefile. Run "./configure --help" for a listing of the available
13		-options.
	5	+The ./configure script builds Makefile from Makefile.in based on
	6	+your system and any options you select (run "./configure --help"
	7	+for a listing of the available options.)
	8	+
	9	+If you wish to use the original Makefile with no configuration, you can
	10	+instead use:
	11	+
	12	+ make -f Makefile.classic
14	13
15	14	On a windows box, use one of the Makefiles in the win/ subdirectory,
16	15	according to your compiler and environment. If you have GCC and MSYS
17		-installed on your system, the consider:
	16	+installed on your system, then consider:
18	17
19	18	make -f win/Makefile.mingw
20	19
21	20	If you have VC++ installed on your system, then consider:
22	21
		@@ -31,24 +30,31 @@
31	30
32	31	BUILDING OUTSIDE THE SOURCE TREE
33	32
34	33	An out of source build is pretty easy:
35	34
36		- 1. Make a new directory to do the builds in.
37		- 2. Copy "Makefile" from the source into the build directory and
38		- modify the SRCDIR macro along the lines of:
	35	+ 1. Make and change to a new directory to do the builds in.
	36	+ 2. Run the "configure" script from this directory.
	37	+ 3. Type: "make"
	38	+
	39	+For example:
39	40
40		- SRCDIR=../src
41		-
42		- 3. type: "make"
	41	+ mkdir build
	42	+ cd build
	43	+ ../configure
	44	+ make
43	45
44	46	This will now keep all generates files seperate from the maintained
45	47	source code.
46	48
47	49	--------------------------------------------------------------------------
48	50
49	51	Here are some notes on what is happening behind the scenes:
	52	+
	53	+* The configure script (if used) examines the options given
	54	+ and runs various tests with the C compiler to create Makefile
	55	+ from the Makefile.in template as well as autoconfig.h
50	56
51	57	* The Makefile just sets up a few macros and then invokes the
52	58	real makefile in src/main.mk. The src/main.mk makefile is
53	59	automatically generated by a TCL script found at src/makemake.tcl.
54	60	Do not edit src/main.mk directly. Update src/makemake.tcl and
55	61
56	62	DELETED GNUmakefile.in
57	63	DELETED Makefile
58	64	ADDED Makefile.classic
59	65	ADDED Makefile.in

	--- BUILD.txt
	+++ BUILD.txt
	@@ -1,22 +1,21 @@
1	To do a complete build on most unix systems, just type:
2
3	make
4
5	If you have an unusual unix system for which the standard Makefile
6	will not work, or if you want to do some non-standard options, you can
7	also run:
8
9	./configure; make
10
11	The ./configure script builds GNUmakefile which will be used in place
12	of Makefile. Run "./configure --help" for a listing of the available
13	options.





14
15	On a windows box, use one of the Makefiles in the win/ subdirectory,
16	according to your compiler and environment. If you have GCC and MSYS
17	installed on your system, the consider:
18
19	make -f win/Makefile.mingw
20
21	If you have VC++ installed on your system, then consider:
22
	@@ -31,24 +30,31 @@
31
32	BUILDING OUTSIDE THE SOURCE TREE
33
34	An out of source build is pretty easy:
35
36	1. Make a new directory to do the builds in.
37	2. Copy "Makefile" from the source into the build directory and
38	modify the SRCDIR macro along the lines of:


39
40	SRCDIR=../src
41
42	3. type: "make"

43
44	This will now keep all generates files seperate from the maintained
45	source code.
46
47	--------------------------------------------------------------------------
48
49	Here are some notes on what is happening behind the scenes:




50
51	* The Makefile just sets up a few macros and then invokes the
52	real makefile in src/main.mk. The src/main.mk makefile is
53	automatically generated by a TCL script found at src/makemake.tcl.
54	Do not edit src/main.mk directly. Update src/makemake.tcl and
55
56	ELETED GNUmakefile.in
57	ELETED Makefile
58	DDED Makefile.classic
59	DDED Makefile.in

	--- BUILD.txt
	+++ BUILD.txt
	@@ -1,22 +1,21 @@
1	To do a complete build, just type:






2
3	./configure; make
4
5	The ./configure script builds Makefile from Makefile.in based on
6	your system and any options you select (run "./configure --help"
7	for a listing of the available options.)
8
9	If you wish to use the original Makefile with no configuration, you can
10	instead use:
11
12	make -f Makefile.classic
13
14	On a windows box, use one of the Makefiles in the win/ subdirectory,
15	according to your compiler and environment. If you have GCC and MSYS
16	installed on your system, then consider:
17
18	make -f win/Makefile.mingw
19
20	If you have VC++ installed on your system, then consider:
21
	@@ -31,24 +30,31 @@
30
31	BUILDING OUTSIDE THE SOURCE TREE
32
33	An out of source build is pretty easy:
34
35	1. Make and change to a new directory to do the builds in.
36	2. Run the "configure" script from this directory.
37	3. Type: "make"
38
39	For example:
40
41	mkdir build
42	cd build
43	../configure
44	make
45
46	This will now keep all generates files seperate from the maintained
47	source code.
48
49	--------------------------------------------------------------------------
50
51	Here are some notes on what is happening behind the scenes:
52
53	* The configure script (if used) examines the options given
54	and runs various tests with the C compiler to create Makefile
55	from the Makefile.in template as well as autoconfig.h
56
57	* The Makefile just sets up a few macros and then invokes the
58	real makefile in src/main.mk. The src/main.mk makefile is
59	automatically generated by a TCL script found at src/makemake.tcl.
60	Do not edit src/main.mk directly. Update src/makemake.tcl and
61
62	ELETED GNUmakefile.in
63	ELETED Makefile
64	DDED Makefile.classic
65	DDED Makefile.in

D GNUmakefile.in

-45

		--- a/GNUmakefile.in
		+++ b/GNUmakefile.in
		@@ -1,45 +0,0 @@
1		-#!/usr/bin/make
2		-#
3		-# This is the top-level makefile for Fossil when the build is occurring
4		-# on a unix platform. This works out-of-the-box on most unix platforms.
5		-# But you are free to vary some of the definitions if desired.
6		-#
7		-#### The toplevel directory of the source tree. Fossil can be built
8		-# in a directory that is separate from the source tree. Just change
9		-# the following to point from the build directory to the src/ folder.
10		-#
11		-SRCDIR = @srcdir@/src
12		-
13		-#### The directory into which object code files should be written.
14		-#
15		-#
16		-OBJDIR = ./bld
17		-
18		-#### C Compiler and options for use in building executables that
19		-# will run on the platform that is doing the build. This is used
20		-# to compile code-generator programs as part of the build process.
21		-# See TCC below for the C compiler for building the finished binary.
22		-#
23		-BCC = @CC_FOR_BUILD@
24		-
25		-#### The suffix to add to final executable file. When cross-compiling
26		-# to windows, make this ".exe". Otherwise leave it blank.
27		-#
28		-E = @EXEEXT@
29		-
30		-TCC = @CC@
31		-
32		-#### Tcl shell for use in running the fossil testsuite. If you do not
33		-# care about testing the end result, this can be blank.
34		-#
35		-TCLSH = tclsh
36		-
37		-LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
38		-TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
39		-INSTALLDIR = $(DESTDIR)@prefix@/bin
40		-USE_SYSTEM_SQLFORM_CHECK_KIND = disable
41		-
42		-include $(SRCDIR)/main.mk
43		-
44		-distclean: clean
45		- rm -f autoconfi

	--- a/GNUmakefile.in
	+++ b/GNUmakefile.in
	@@ -1,45 +0,0 @@
1	#!/usr/bin/make
2	#
3	# This is the top-level makefile for Fossil when the build is occurring
4	# on a unix platform. This works out-of-the-box on most unix platforms.
5	# But you are free to vary some of the definitions if desired.
6	#
7	#### The toplevel directory of the source tree. Fossil can be built
8	# in a directory that is separate from the source tree. Just change
9	# the following to point from the build directory to the src/ folder.
10	#
11	SRCDIR = @srcdir@/src
12
13	#### The directory into which object code files should be written.
14	#
15	#
16	OBJDIR = ./bld
17
18	#### C Compiler and options for use in building executables that
19	# will run on the platform that is doing the build. This is used
20	# to compile code-generator programs as part of the build process.
21	# See TCC below for the C compiler for building the finished binary.
22	#
23	BCC = @CC_FOR_BUILD@
24
25	#### The suffix to add to final executable file. When cross-compiling
26	# to windows, make this ".exe". Otherwise leave it blank.
27	#
28	E = @EXEEXT@
29
30	TCC = @CC@
31
32	#### Tcl shell for use in running the fossil testsuite. If you do not
33	# care about testing the end result, this can be blank.
34	#
35	TCLSH = tclsh
36
37	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
38	TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
39	INSTALLDIR = $(DESTDIR)@prefix@/bin
40	USE_SYSTEM_SQLFORM_CHECK_KIND = disable
41
42	include $(SRCDIR)/main.mk
43
44	distclean: clean
45	rm -f autoconfi

	--- a/GNUmakefile.in
	+++ b/GNUmakefile.in
	@@ -1,45 +0,0 @@

D Makefile

-3

		--- a/Makefile
		+++ b/Makefile
		@@ -1,3 +0,0 @@
1		-#!/usr/bin/make
2		-#
3		-# This is tg the build. This is used

	--- a/Makefile
	+++ b/Makefile
	@@ -1,3 +0,0 @@
1	#!/usr/bin/make
2	#
3	# This is tg the build. This is used

	--- a/Makefile
	+++ b/Makefile
	@@ -1,3 +0,0 @@

M Makefile.classic

No diff available

M Makefile.in

+7 -43

		--- a/Makefile.in
		+++ b/Makefile.in
		@@ -1,45 +1,9 @@
1		-#!/usr/bin/make
2		-#
3		-# This is the top-level makefile for Fossil when the build is occurring
4		-# on a unix platform. This works out-of-the-box on most unix platforms.
5		-# But you are free to vary some of the definitions if desired.
6		-#
7		-#### The toplevel directory of the source tree. Fossil can be built
8		-# in a directory that is separate from the source tree. Just change
9		-# the following to point from the build directory to the src/ folder.
10		-#
11		-SRCDIR = @srcdir@/src
12		-
13		-#### The directory into which object code files should be written.
	1	+ -D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzz -D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzzSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -D_HAVE_SQLITE_ssitclsh -DFOSSIL_ENABLE_LEGACY_MV_RM=1@CFLAGS@@CFLAGS@Rdi make source
14	2	#
15	3	#
16		-OBJDIR = ./bld
17		-
18		-#### C Compiler and options for use in building executables that
19		-# will run on the platform that is doing the build. This is used
20		-# to compile code-generator programs as part of the build process.
21		-# See TCC below for the C compiler for building the finished binary.
22		-#
23		-BCC = @CC_FOR_BUILD@
24		-
25		-#### The suffix to add to final executable file. When cross-compiling
26		-# to windows, make this ".exe". Otherwise leave it blank.
27		-#
28		-E = @EXEEXT@
29		-
30		-TCC = @CC@
31		-
32		-#### Tcl shell for use in running the fossil testsuite. If you do not
33		-# care about testing the end result, this can be blank.
34		-#
35		-TCLSH = tclsh
36		-
37		-LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
38		-TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
39		-INSTALLDIR = $(DESTDIR)@prefix@/bin
40		-USE_SYSTEM_SQLFORM_CHECK_KIND = disable
41		-
42		-include $(SRCDIR)/main.mk
43		-
44		-distclean: clean
45		- rm -f autoconfi
	4	+OBJDIR = ./@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzz -D_HAVE_SQLITE_ssil-@FOSSILendif
	5	+ifeq ($(findstriSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzz -D_HAVE_SQLITE$(MAKE) reconfig
	6	+endif
	7	+@AUTOREMAKE@ && $(MAKE)
	8	+endif
	9	+FOSSIL_ENABLE_M +

	--- a/Makefile.in
	+++ b/Makefile.in
	@@ -1,45 +1,9 @@
1	#!/usr/bin/make
2	#
3	# This is the top-level makefile for Fossil when the build is occurring
4	# on a unix platform. This works out-of-the-box on most unix platforms.
5	# But you are free to vary some of the definitions if desired.
6	#
7	#### The toplevel directory of the source tree. Fossil can be built
8	# in a directory that is separate from the source tree. Just change
9	# the following to point from the build directory to the src/ folder.
10	#
11	SRCDIR = @srcdir@/src
12
13	#### The directory into which object code files should be written.
14	#
15	#
16	OBJDIR = ./bld
17
18	#### C Compiler and options for use in building executables that
19	# will run on the platform that is doing the build. This is used
20	# to compile code-generator programs as part of the build process.
21	# See TCC below for the C compiler for building the finished binary.
22	#
23	BCC = @CC_FOR_BUILD@
24
25	#### The suffix to add to final executable file. When cross-compiling
26	# to windows, make this ".exe". Otherwise leave it blank.
27	#
28	E = @EXEEXT@
29
30	TCC = @CC@
31
32	#### Tcl shell for use in running the fossil testsuite. If you do not
33	# care about testing the end result, this can be blank.
34	#
35	TCLSH = tclsh
36
37	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
38	TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
39	INSTALLDIR = $(DESTDIR)@prefix@/bin
40	USE_SYSTEM_SQLFORM_CHECK_KIND = disable
41
42	include $(SRCDIR)/main.mk
43
44	distclean: clean
45	rm -f autoconfi

	--- a/Makefile.in
	+++ b/Makefile.in
	@@ -1,45 +1,9 @@
1	-D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzz -D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -D_HAVE_SQLITE_ssil-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzzSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX-@FOSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -D_HAVE_SQLITE_ssitclsh -DFOSSIL_ENABLE_LEGACY_MV_RM=1@CFLAGS@@CFLAGS@Rdi make source












2	#
3	#
4	OBJDIR = ./@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzz -D_HAVE_SQLITE_ssil-@FOSSILendif
5	ifeq ($(findstriSSIL_CI_PFX@P@1BE,N:fossil:@FOSSIL_CI_PFX -fuzz -D_HAVE_SQLITE$(MAKE) reconfig
6	endif
7	@AUTOREMAKE@ && $(MAKE)
8	endif
9	FOSSIL_ENABLE_M +

M auto.def

+1 -1

		--- auto.def
		+++ auto.def
		@@ -166,7 +166,7 @@
166	166	if {![cc-check-functions getpassphrase]} {
167	167	# Haiku needs this
168	168	cc-check-function-in-lib getpass bsd
169	169	}
170	170
171		-make-template GNUmakefile.in
	171	+make-template Makefile.in
172	172	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
173	173

	--- auto.def
	+++ auto.def
	@@ -166,7 +166,7 @@
166	if {![cc-check-functions getpassphrase]} {
167	# Haiku needs this
168	cc-check-function-in-lib getpass bsd
169	}
170
171	make-template GNUmakefile.in
172	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
173

	--- auto.def
	+++ auto.def
	@@ -166,7 +166,7 @@
166	if {![cc-check-functions getpassphrase]} {
167	# Haiku needs this
168	cc-check-function-in-lib getpass bsd
169	}
170
171	make-template Makefile.in
172	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
173

Fossil SCM

Keyboard Shortcuts