Fossil SCM

Remove temporary pqueue_insert renaming hack from the various Makefiles.

mistachkin 2012-06-14 13:00 UTC trunk
Commit 4006ee4f23609e60c09f0cb2fce0f239bdc3b003
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -416,11 +416,10 @@
416416
#
417417
TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
418418
419419
# With HTTPS support
420420
ifdef FOSSIL_ENABLE_SSL
421
-TCC += -Dpqueue_insert=pqueue_insert_fossil
422421
TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
423422
endif
424423
425424
# With Tcl support
426425
ifdef FOSSIL_ENABLE_TCL
427426
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -416,11 +416,10 @@
416 #
417 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
418
419 # With HTTPS support
420 ifdef FOSSIL_ENABLE_SSL
421 TCC += -Dpqueue_insert=pqueue_insert_fossil
422 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
423 endif
424
425 # With Tcl support
426 ifdef FOSSIL_ENABLE_TCL
427
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -416,11 +416,10 @@
416 #
417 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
418
419 # With HTTPS support
420 ifdef FOSSIL_ENABLE_SSL
 
421 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
422 endif
423
424 # With Tcl support
425 ifdef FOSSIL_ENABLE_TCL
426
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -97,11 +97,10 @@
9797
#
9898
TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
9999
100100
# With HTTPS support
101101
ifdef FOSSIL_ENABLE_SSL
102
-TCC += -Dpqueue_insert=pqueue_insert_fossil
103102
TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
104103
endif
105104
106105
# With Tcl support
107106
ifdef FOSSIL_ENABLE_TCL
108107
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -97,11 +97,10 @@
97 #
98 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99
100 # With HTTPS support
101 ifdef FOSSIL_ENABLE_SSL
102 TCC += -Dpqueue_insert=pqueue_insert_fossil
103 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
104 endif
105
106 # With Tcl support
107 ifdef FOSSIL_ENABLE_TCL
108
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -97,11 +97,10 @@
97 #
98 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99
100 # With HTTPS support
101 ifdef FOSSIL_ENABLE_SSL
 
102 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
103 endif
104
105 # With Tcl support
106 ifdef FOSSIL_ENABLE_TCL
107
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -97,11 +97,10 @@
9797
#
9898
TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
9999
100100
# With HTTPS support
101101
ifdef FOSSIL_ENABLE_SSL
102
-TCC += -Dpqueue_insert=pqueue_insert_fossil
103102
TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
104103
endif
105104
106105
# With Tcl support
107106
ifdef FOSSIL_ENABLE_TCL
108107
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -97,11 +97,10 @@
97 #
98 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99
100 # With HTTPS support
101 ifdef FOSSIL_ENABLE_SSL
102 TCC += -Dpqueue_insert=pqueue_insert_fossil
103 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
104 endif
105
106 # With Tcl support
107 ifdef FOSSIL_ENABLE_TCL
108
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -97,11 +97,10 @@
97 #
98 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
99
100 # With HTTPS support
101 ifdef FOSSIL_ENABLE_SSL
 
102 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
103 endif
104
105 # With Tcl support
106 ifdef FOSSIL_ENABLE_TCL
107

Keyboard Shortcuts

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