Fossil SCM

Bump version of OpenSSL in the MinGW makefiles. Also, remove superfluous subst operations from the MinGW makefiles.

mistachkin 2012-08-08 03:28 trunk
Commit 0324ed61fb152f01974fa47883eab397c9370892
Parent a4249d2180521bd…
3 files changed +6 -6 +6 -6 +6 -6
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+6 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -374,12 +374,12 @@
374374
 #### The directories where the OpenSSL include and library files are located.
375375
 # The recommended usage here is to use the Sysinternals junction tool
376376
 # to create a hard link between an "openssl-1.x" sub-directory of the
377377
 # Fossil source code directory and the target OpenSSL source directory.
378378
 #
379
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1a/include
380
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1a
379
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1c/include
380
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1c
381381
382382
 #### Either the directory where the Tcl library is installed or the Tcl
383383
 # source code directory resides (depending on the value of the macro
384384
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
385385
 # this directory must have "include" and "lib" sub-directories. If
@@ -505,14 +505,14 @@
505505
 foreach s [lsort $src] {
506506
 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
507507
 }
508508
 writeln "\n"
509509
 writeln "APPNAME = ${name}.exe"
510
-writeln {TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
511
-MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
512
-MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
513
-VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
510
+writeln {TRANSLATE = $(OBJDIR)/translate.exe
511
+MAKEHEADERS = $(OBJDIR)/makeheaders.exe
512
+MKINDEX = $(OBJDIR)/mkindex.exe
513
+VERSION = $(OBJDIR)/version.exe
514514
 }
515515
516516
 writeln {
517517
 all: $(OBJDIR) $(APPNAME)
518518
519519
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -374,12 +374,12 @@
374 #### The directories where the OpenSSL include and library files are located.
375 # The recommended usage here is to use the Sysinternals junction tool
376 # to create a hard link between an "openssl-1.x" sub-directory of the
377 # Fossil source code directory and the target OpenSSL source directory.
378 #
379 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1a/include
380 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1a
381
382 #### Either the directory where the Tcl library is installed or the Tcl
383 # source code directory resides (depending on the value of the macro
384 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
385 # this directory must have "include" and "lib" sub-directories. If
@@ -505,14 +505,14 @@
505 foreach s [lsort $src] {
506 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
507 }
508 writeln "\n"
509 writeln "APPNAME = ${name}.exe"
510 writeln {TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
511 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
512 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
513 VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
514 }
515
516 writeln {
517 all: $(OBJDIR) $(APPNAME)
518
519
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -374,12 +374,12 @@
374 #### The directories where the OpenSSL include and library files are located.
375 # The recommended usage here is to use the Sysinternals junction tool
376 # to create a hard link between an "openssl-1.x" sub-directory of the
377 # Fossil source code directory and the target OpenSSL source directory.
378 #
379 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1c/include
380 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1c
381
382 #### Either the directory where the Tcl library is installed or the Tcl
383 # source code directory resides (depending on the value of the macro
384 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
385 # this directory must have "include" and "lib" sub-directories. If
@@ -505,14 +505,14 @@
505 foreach s [lsort $src] {
506 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
507 }
508 writeln "\n"
509 writeln "APPNAME = ${name}.exe"
510 writeln {TRANSLATE = $(OBJDIR)/translate.exe
511 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
512 MKINDEX = $(OBJDIR)/mkindex.exe
513 VERSION = $(OBJDIR)/version.exe
514 }
515
516 writeln {
517 all: $(OBJDIR) $(APPNAME)
518
519
M win/Makefile.mingw
+6 -6
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -55,12 +55,12 @@
5555
 #### The directories where the OpenSSL include and library files are located.
5656
 # The recommended usage here is to use the Sysinternals junction tool
5757
 # to create a hard link between an "openssl-1.x" sub-directory of the
5858
 # Fossil source code directory and the target OpenSSL source directory.
5959
 #
60
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1a/include
61
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1a
60
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1c/include
61
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1c
6262
6363
 #### Either the directory where the Tcl library is installed or the Tcl
6464
 # source code directory resides (depending on the value of the macro
6565
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
6666
 # this directory must have "include" and "lib" sub-directories. If
@@ -468,14 +468,14 @@
468468
 $(OBJDIR)/xfer.o \
469469
 $(OBJDIR)/xfersetup.o \
470470
 $(OBJDIR)/zip.o
471471
472472
 APPNAME = fossil.exe
473
-TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
474
-MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
475
-MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
476
-VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
473
+TRANSLATE = $(OBJDIR)/translate.exe
474
+MAKEHEADERS = $(OBJDIR)/makeheaders.exe
475
+MKINDEX = $(OBJDIR)/mkindex.exe
476
+VERSION = $(OBJDIR)/version.exe
477477
478478
479479
 all: $(OBJDIR) $(APPNAME)
480480
481481
 $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
482482
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -55,12 +55,12 @@
55 #### The directories where the OpenSSL include and library files are located.
56 # The recommended usage here is to use the Sysinternals junction tool
57 # to create a hard link between an "openssl-1.x" sub-directory of the
58 # Fossil source code directory and the target OpenSSL source directory.
59 #
60 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1a/include
61 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1a
62
63 #### Either the directory where the Tcl library is installed or the Tcl
64 # source code directory resides (depending on the value of the macro
65 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
66 # this directory must have "include" and "lib" sub-directories. If
@@ -468,14 +468,14 @@
468 $(OBJDIR)/xfer.o \
469 $(OBJDIR)/xfersetup.o \
470 $(OBJDIR)/zip.o
471
472 APPNAME = fossil.exe
473 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
474 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
475 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
476 VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
477
478
479 all: $(OBJDIR) $(APPNAME)
480
481 $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
482
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -55,12 +55,12 @@
55 #### The directories where the OpenSSL include and library files are located.
56 # The recommended usage here is to use the Sysinternals junction tool
57 # to create a hard link between an "openssl-1.x" sub-directory of the
58 # Fossil source code directory and the target OpenSSL source directory.
59 #
60 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1c/include
61 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1c
62
63 #### Either the directory where the Tcl library is installed or the Tcl
64 # source code directory resides (depending on the value of the macro
65 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
66 # this directory must have "include" and "lib" sub-directories. If
@@ -468,14 +468,14 @@
468 $(OBJDIR)/xfer.o \
469 $(OBJDIR)/xfersetup.o \
470 $(OBJDIR)/zip.o
471
472 APPNAME = fossil.exe
473 TRANSLATE = $(OBJDIR)/translate.exe
474 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
475 MKINDEX = $(OBJDIR)/mkindex.exe
476 VERSION = $(OBJDIR)/version.exe
477
478
479 all: $(OBJDIR) $(APPNAME)
480
481 $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
482
M win/Makefile.mingw.mistachkin
+6 -6
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -55,12 +55,12 @@
5555
 #### The directories where the OpenSSL include and library files are located.
5656
 # The recommended usage here is to use the Sysinternals junction tool
5757
 # to create a hard link between an "openssl-1.x" sub-directory of the
5858
 # Fossil source code directory and the target OpenSSL source directory.
5959
 #
60
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1a/include
61
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1a
60
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1c/include
61
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1c
6262
6363
 #### Either the directory where the Tcl library is installed or the Tcl
6464
 # source code directory resides (depending on the value of the macro
6565
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
6666
 # this directory must have "include" and "lib" sub-directories. If
@@ -468,14 +468,14 @@
468468
 $(OBJDIR)/xfer.o \
469469
 $(OBJDIR)/xfersetup.o \
470470
 $(OBJDIR)/zip.o
471471
472472
 APPNAME = fossil.exe
473
-TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
474
-MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
475
-MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
476
-VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
473
+TRANSLATE = $(OBJDIR)/translate.exe
474
+MAKEHEADERS = $(OBJDIR)/makeheaders.exe
475
+MKINDEX = $(OBJDIR)/mkindex.exe
476
+VERSION = $(OBJDIR)/version.exe
477477
478478
479479
 all: $(OBJDIR) $(APPNAME)
480480
481481
 $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
482482
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -55,12 +55,12 @@
55 #### The directories where the OpenSSL include and library files are located.
56 # The recommended usage here is to use the Sysinternals junction tool
57 # to create a hard link between an "openssl-1.x" sub-directory of the
58 # Fossil source code directory and the target OpenSSL source directory.
59 #
60 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1a/include
61 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1a
62
63 #### Either the directory where the Tcl library is installed or the Tcl
64 # source code directory resides (depending on the value of the macro
65 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
66 # this directory must have "include" and "lib" sub-directories. If
@@ -468,14 +468,14 @@
468 $(OBJDIR)/xfer.o \
469 $(OBJDIR)/xfersetup.o \
470 $(OBJDIR)/zip.o
471
472 APPNAME = fossil.exe
473 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
474 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
475 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
476 VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
477
478
479 all: $(OBJDIR) $(APPNAME)
480
481 $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
482
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -55,12 +55,12 @@
55 #### The directories where the OpenSSL include and library files are located.
56 # The recommended usage here is to use the Sysinternals junction tool
57 # to create a hard link between an "openssl-1.x" sub-directory of the
58 # Fossil source code directory and the target OpenSSL source directory.
59 #
60 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.1c/include
61 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.1c
62
63 #### Either the directory where the Tcl library is installed or the Tcl
64 # source code directory resides (depending on the value of the macro
65 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
66 # this directory must have "include" and "lib" sub-directories. If
@@ -468,14 +468,14 @@
468 $(OBJDIR)/xfer.o \
469 $(OBJDIR)/xfersetup.o \
470 $(OBJDIR)/zip.o
471
472 APPNAME = fossil.exe
473 TRANSLATE = $(OBJDIR)/translate.exe
474 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
475 MKINDEX = $(OBJDIR)/mkindex.exe
476 VERSION = $(OBJDIR)/version.exe
477
478
479 all: $(OBJDIR) $(APPNAME)
480
481 $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc
482

Keyboard Shortcuts

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