Fossil SCM

Remove GNU-isms from the Makefile. Ticket [1927cbd979].

drh 2010-02-08 22:00 trunk
Commit fcd7ecb7f1d7d4e86e468725009cfdc3f7531248
1 file changed +1 -7
+1 -7
--- Makefile
+++ Makefile
@@ -29,15 +29,11 @@
2929
# for building intermediate code-generator tools.
3030
#
3131
#TCC = gcc -O6
3232
#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
3333
TCC = gcc -g -Os -Wall
34
-
35
-# With HTTPS support
36
-ifdef FOSSIL_ENABLE_SSL
37
-TCC += -DFOSSIL_ENABLE_SSL=1
38
-endif
34
+TCC = gcc -g -Os -Wall -DFOSSIL_ENABLE_SSL
3935
4036
#### Extra arguments for linking the finished binary. Fossil needs
4137
# to link against the Z-Lib compression library. There are no
4238
# other dependencies. We sometimes add the -static option here
4339
# so that we can build a static executable that will run in a
@@ -49,13 +45,11 @@
4945
# Solaris 10 needs:
5046
# LIB += -lsocket -lnsl
5147
# My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11.
5248
#
5349
# OpenSSL:
54
-ifdef FOSSIL_ENABLE_SSL
5550
LIB += -lcrypto -lssl
56
-endif
5751
5852
#### Tcl shell for use in running the fossil testsuite.
5953
#
6054
TCLSH = tclsh
6155
6256
--- Makefile
+++ Makefile
@@ -29,15 +29,11 @@
29 # for building intermediate code-generator tools.
30 #
31 #TCC = gcc -O6
32 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
33 TCC = gcc -g -Os -Wall
34
35 # With HTTPS support
36 ifdef FOSSIL_ENABLE_SSL
37 TCC += -DFOSSIL_ENABLE_SSL=1
38 endif
39
40 #### Extra arguments for linking the finished binary. Fossil needs
41 # to link against the Z-Lib compression library. There are no
42 # other dependencies. We sometimes add the -static option here
43 # so that we can build a static executable that will run in a
@@ -49,13 +45,11 @@
49 # Solaris 10 needs:
50 # LIB += -lsocket -lnsl
51 # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11.
52 #
53 # OpenSSL:
54 ifdef FOSSIL_ENABLE_SSL
55 LIB += -lcrypto -lssl
56 endif
57
58 #### Tcl shell for use in running the fossil testsuite.
59 #
60 TCLSH = tclsh
61
62
--- Makefile
+++ Makefile
@@ -29,15 +29,11 @@
29 # for building intermediate code-generator tools.
30 #
31 #TCC = gcc -O6
32 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
33 TCC = gcc -g -Os -Wall
34 TCC = gcc -g -Os -Wall -DFOSSIL_ENABLE_SSL
 
 
 
 
35
36 #### Extra arguments for linking the finished binary. Fossil needs
37 # to link against the Z-Lib compression library. There are no
38 # other dependencies. We sometimes add the -static option here
39 # so that we can build a static executable that will run in a
@@ -49,13 +45,11 @@
45 # Solaris 10 needs:
46 # LIB += -lsocket -lnsl
47 # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11.
48 #
49 # OpenSSL:
 
50 LIB += -lcrypto -lssl
 
51
52 #### Tcl shell for use in running the fossil testsuite.
53 #
54 TCLSH = tclsh
55
56

Keyboard Shortcuts

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