Fossil SCM

In the MinGW makefile, instead of attempting to auto-detect if the Windows command prompt is being used, rely on the manually set USE_WINDOWS variable instead.

mistachkin 2012-09-03 03:00 trunk
Commit 7bf4c290a5a16b33279e5bbb49e752281181bebc
Parent ce55bc43bdb3b88…
3 files changed +38 -16 +38 -16 +38 -16
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+38 -16
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -335,10 +335,11 @@
335335
336336
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337337
 # By default, this is an empty string (i.e. use the native compiler).
338338
 #
339339
 PREFIX =
340
+# PREFIX = mingw32-
340341
 # PREFIX = i686-pc-mingw32-
341342
 # PREFIX = i686-w64-mingw32-
342343
 # PREFIX = x86_64-w64-mingw32-
343344
344345
 #### The toplevel directory of the source tree. Fossil can be built
@@ -531,48 +532,64 @@
531532
 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
532533
 }
533534
 writeln "\n"
534535
 writeln "APPNAME = ${name}.exe"
535536
 writeln {
536
-#### If the SHELL environment variable exists, it is assumed that we are
537
-# building inside of a Unix-style shell; otherwise, it is assumed that
538
-# we are building inside of a Windows-style shell.
537
+#### If the USE_WINDOWS variable exists, it is assumed that we are building
538
+# inside of a Windows-style shell; otherwise, it is assumed that we are
539
+# building inside of a Unix-style shell.
539540
 #
540
-ifdef SHELL
541
+ifdef USE_WINDOWS
542
+TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
543
+MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
544
+MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
545
+VERSION = $(subst /,\,$(OBJDIR)/version)
546
+CP = copy
547
+MV = move
548
+RM = del /Q
549
+MKDIR = mkdir
550
+RMDIR = rmdir /S /Q
551
+else
541552
 TRANSLATE = $(OBJDIR)/translate
542553
 MAKEHEADERS = $(OBJDIR)/makeheaders
543554
 MKINDEX = $(OBJDIR)/mkindex
544555
 VERSION = $(OBJDIR)/version
545556
 CP = cp
546557
 MV = mv
547
-RM = rm -rf
558
+RM = rm -f
548559
 MKDIR = mkdir -p
549
-else
550
-TRANSLATE = $(subst /,\\,$(OBJDIR)/translate)
551
-MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders)
552
-MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex)
553
-VERSION = $(subst /,\\,$(OBJDIR)/version)
554
-CP = copy
555
-MV = move
556
-RM = del /S /Q
557
-MKDIR = mkdir
560
+RMDIR = rm -rf
558561
 endif}
559562
560563
 writeln {
561564
 all: $(OBJDIR) $(APPNAME)
562565
563566
 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
567
+ifdef USE_WINDOWS
568
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
569
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
570
+else
564571
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
565572
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
573
+endif
566574
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
567575
568576
 install: $(APPNAME)
577
+ifdef USE_WINDOWS
578
+ $(MKDIR) $(subst /,\,$(INSTALLDIR))
579
+ $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
580
+else
569581
 $(MKDIR) $(INSTALLDIR)
570582
 $(MV) $(APPNAME) $(INSTALLDIR)
583
+endif
571584
572585
 $(OBJDIR):
586
+ifdef USE_WINDOWS
587
+ $(MKDIR) $(subst /,\,$(OBJDIR))
588
+else
573589
 $(MKDIR) $(OBJDIR)
590
+endif
574591
575592
 $(OBJDIR)/translate: $(SRCDIR)/translate.c
576593
 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
577594
578595
 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -616,15 +633,20 @@
616633
 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
617634
 # command. "del" will not work here because it is not a separate command
618635
 # but a MSDOS-shell builtin.
619636
 #
620637
 clean:
621
- $(RM) $(OBJDIR) $(APPNAME)
638
+ifdef USE_WINDOWS
639
+ $(RM) $(subst /,\,$(APPNAME))
640
+ $(RMDIR) $(subst /,\,$(OBJDIR))
641
+else
642
+ $(RM) $(APPNAME)
643
+ $(RMDIR) $(OBJDIR)
644
+endif
622645
623646
 setup: $(OBJDIR) $(APPNAME)
624647
 $(MAKENSIS) ./fossil.nsi
625
-
626648
 }
627649
628650
 set mhargs {}
629651
 foreach s [lsort $src] {
630652
 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
631653
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -335,10 +335,11 @@
335
336 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337 # By default, this is an empty string (i.e. use the native compiler).
338 #
339 PREFIX =
 
340 # PREFIX = i686-pc-mingw32-
341 # PREFIX = i686-w64-mingw32-
342 # PREFIX = x86_64-w64-mingw32-
343
344 #### The toplevel directory of the source tree. Fossil can be built
@@ -531,48 +532,64 @@
531 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
532 }
533 writeln "\n"
534 writeln "APPNAME = ${name}.exe"
535 writeln {
536 #### If the SHELL environment variable exists, it is assumed that we are
537 # building inside of a Unix-style shell; otherwise, it is assumed that
538 # we are building inside of a Windows-style shell.
539 #
540 ifdef SHELL
 
 
 
 
 
 
 
 
 
 
541 TRANSLATE = $(OBJDIR)/translate
542 MAKEHEADERS = $(OBJDIR)/makeheaders
543 MKINDEX = $(OBJDIR)/mkindex
544 VERSION = $(OBJDIR)/version
545 CP = cp
546 MV = mv
547 RM = rm -rf
548 MKDIR = mkdir -p
549 else
550 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate)
551 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders)
552 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex)
553 VERSION = $(subst /,\\,$(OBJDIR)/version)
554 CP = copy
555 MV = move
556 RM = del /S /Q
557 MKDIR = mkdir
558 endif}
559
560 writeln {
561 all: $(OBJDIR) $(APPNAME)
562
563 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
 
 
 
 
564 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
565 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
 
566 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
567
568 install: $(APPNAME)
 
 
 
 
569 $(MKDIR) $(INSTALLDIR)
570 $(MV) $(APPNAME) $(INSTALLDIR)
 
571
572 $(OBJDIR):
 
 
 
573 $(MKDIR) $(OBJDIR)
 
574
575 $(OBJDIR)/translate: $(SRCDIR)/translate.c
576 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
577
578 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -616,15 +633,20 @@
616 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
617 # command. "del" will not work here because it is not a separate command
618 # but a MSDOS-shell builtin.
619 #
620 clean:
621 $(RM) $(OBJDIR) $(APPNAME)
 
 
 
 
 
 
622
623 setup: $(OBJDIR) $(APPNAME)
624 $(MAKENSIS) ./fossil.nsi
625
626 }
627
628 set mhargs {}
629 foreach s [lsort $src] {
630 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
631
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -335,10 +335,11 @@
335
336 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
337 # By default, this is an empty string (i.e. use the native compiler).
338 #
339 PREFIX =
340 # PREFIX = mingw32-
341 # PREFIX = i686-pc-mingw32-
342 # PREFIX = i686-w64-mingw32-
343 # PREFIX = x86_64-w64-mingw32-
344
345 #### The toplevel directory of the source tree. Fossil can be built
@@ -531,48 +532,64 @@
532 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
533 }
534 writeln "\n"
535 writeln "APPNAME = ${name}.exe"
536 writeln {
537 #### If the USE_WINDOWS variable exists, it is assumed that we are building
538 # inside of a Windows-style shell; otherwise, it is assumed that we are
539 # building inside of a Unix-style shell.
540 #
541 ifdef USE_WINDOWS
542 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
543 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
544 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
545 VERSION = $(subst /,\,$(OBJDIR)/version)
546 CP = copy
547 MV = move
548 RM = del /Q
549 MKDIR = mkdir
550 RMDIR = rmdir /S /Q
551 else
552 TRANSLATE = $(OBJDIR)/translate
553 MAKEHEADERS = $(OBJDIR)/makeheaders
554 MKINDEX = $(OBJDIR)/mkindex
555 VERSION = $(OBJDIR)/version
556 CP = cp
557 MV = mv
558 RM = rm -f
559 MKDIR = mkdir -p
560 RMDIR = rm -rf
 
 
 
 
 
 
 
 
561 endif}
562
563 writeln {
564 all: $(OBJDIR) $(APPNAME)
565
566 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
567 ifdef USE_WINDOWS
568 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
569 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
570 else
571 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
572 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
573 endif
574 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
575
576 install: $(APPNAME)
577 ifdef USE_WINDOWS
578 $(MKDIR) $(subst /,\,$(INSTALLDIR))
579 $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
580 else
581 $(MKDIR) $(INSTALLDIR)
582 $(MV) $(APPNAME) $(INSTALLDIR)
583 endif
584
585 $(OBJDIR):
586 ifdef USE_WINDOWS
587 $(MKDIR) $(subst /,\,$(OBJDIR))
588 else
589 $(MKDIR) $(OBJDIR)
590 endif
591
592 $(OBJDIR)/translate: $(SRCDIR)/translate.c
593 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
594
595 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -616,15 +633,20 @@
633 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
634 # command. "del" will not work here because it is not a separate command
635 # but a MSDOS-shell builtin.
636 #
637 clean:
638 ifdef USE_WINDOWS
639 $(RM) $(subst /,\,$(APPNAME))
640 $(RMDIR) $(subst /,\,$(OBJDIR))
641 else
642 $(RM) $(APPNAME)
643 $(RMDIR) $(OBJDIR)
644 endif
645
646 setup: $(OBJDIR) $(APPNAME)
647 $(MAKENSIS) ./fossil.nsi
 
648 }
649
650 set mhargs {}
651 foreach s [lsort $src] {
652 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
653
M win/Makefile.mingw
+38 -16
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -14,10 +14,11 @@
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
1818
 PREFIX =
19
+# PREFIX = mingw32-
1920
 # PREFIX = i686-pc-mingw32-
2021
 # PREFIX = i686-w64-mingw32-
2122
 # PREFIX = x86_64-w64-mingw32-
2223
2324
 #### The toplevel directory of the source tree. Fossil can be built
@@ -495,47 +496,63 @@
495496
 $(OBJDIR)/xfersetup.o \
496497
 $(OBJDIR)/zip.o
497498
498499
 APPNAME = fossil.exe
499500
500
-#### If the SHELL environment variable exists, it is assumed that we are
501
-# building inside of a Unix-style shell; otherwise, it is assumed that
502
-# we are building inside of a Windows-style shell.
501
+#### If the USE_WINDOWS variable exists, it is assumed that we are building
502
+# inside of a Windows-style shell; otherwise, it is assumed that we are
503
+# building inside of a Unix-style shell.
503504
 #
504
-ifdef SHELL
505
+ifdef USE_WINDOWS
506
+TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507
+MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508
+MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509
+VERSION = $(subst /,\,$(OBJDIR)/version)
510
+CP = copy
511
+MV = move
512
+RM = del /Q
513
+MKDIR = mkdir
514
+RMDIR = rmdir /S /Q
515
+else
505516
 TRANSLATE = $(OBJDIR)/translate
506517
 MAKEHEADERS = $(OBJDIR)/makeheaders
507518
 MKINDEX = $(OBJDIR)/mkindex
508519
 VERSION = $(OBJDIR)/version
509520
 CP = cp
510521
 MV = mv
511
-RM = rm -rf
522
+RM = rm -f
512523
 MKDIR = mkdir -p
513
-else
514
-TRANSLATE = $(subst /,\\,$(OBJDIR)/translate)
515
-MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders)
516
-MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex)
517
-VERSION = $(subst /,\\,$(OBJDIR)/version)
518
-CP = copy
519
-MV = move
520
-RM = del /S /Q
521
-MKDIR = mkdir
524
+RMDIR = rm -rf
522525
 endif
523526
524527
 all: $(OBJDIR) $(APPNAME)
525528
526529
 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
530
+ifdef USE_WINDOWS
531
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
532
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
533
+else
527534
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
528535
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536
+endif
529537
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
530538
531539
 install: $(APPNAME)
540
+ifdef USE_WINDOWS
541
+ $(MKDIR) $(subst /,\,$(INSTALLDIR))
542
+ $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
543
+else
532544
 $(MKDIR) $(INSTALLDIR)
533545
 $(MV) $(APPNAME) $(INSTALLDIR)
546
+endif
534547
535548
 $(OBJDIR):
549
+ifdef USE_WINDOWS
550
+ $(MKDIR) $(subst /,\,$(OBJDIR))
551
+else
536552
 $(MKDIR) $(OBJDIR)
553
+endif
537554
538555
 $(OBJDIR)/translate: $(SRCDIR)/translate.c
539556
 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
540557
541558
 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -574,15 +591,20 @@
574591
 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
575592
 # command. "del" will not work here because it is not a separate command
576593
 # but a MSDOS-shell builtin.
577594
 #
578595
 clean:
579
- $(RM) $(OBJDIR) $(APPNAME)
596
+ifdef USE_WINDOWS
597
+ $(RM) $(subst /,\,$(APPNAME))
598
+ $(RMDIR) $(subst /,\,$(OBJDIR))
599
+else
600
+ $(RM) $(APPNAME)
601
+ $(RMDIR) $(OBJDIR)
602
+endif
580603
581604
 setup: $(OBJDIR) $(APPNAME)
582605
 $(MAKENSIS) ./fossil.nsi
583
-
584606
585607
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
586608
 $(MKINDEX) $(TRANS_SRC) >$@
587609
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
588610
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
589611
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -14,10 +14,11 @@
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
 
19 # PREFIX = i686-pc-mingw32-
20 # PREFIX = i686-w64-mingw32-
21 # PREFIX = x86_64-w64-mingw32-
22
23 #### The toplevel directory of the source tree. Fossil can be built
@@ -495,47 +496,63 @@
495 $(OBJDIR)/xfersetup.o \
496 $(OBJDIR)/zip.o
497
498 APPNAME = fossil.exe
499
500 #### If the SHELL environment variable exists, it is assumed that we are
501 # building inside of a Unix-style shell; otherwise, it is assumed that
502 # we are building inside of a Windows-style shell.
503 #
504 ifdef SHELL
 
 
 
 
 
 
 
 
 
 
505 TRANSLATE = $(OBJDIR)/translate
506 MAKEHEADERS = $(OBJDIR)/makeheaders
507 MKINDEX = $(OBJDIR)/mkindex
508 VERSION = $(OBJDIR)/version
509 CP = cp
510 MV = mv
511 RM = rm -rf
512 MKDIR = mkdir -p
513 else
514 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate)
515 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders)
516 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex)
517 VERSION = $(subst /,\\,$(OBJDIR)/version)
518 CP = copy
519 MV = move
520 RM = del /S /Q
521 MKDIR = mkdir
522 endif
523
524 all: $(OBJDIR) $(APPNAME)
525
526 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
 
 
 
 
527 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
528 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
 
529 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
530
531 install: $(APPNAME)
 
 
 
 
532 $(MKDIR) $(INSTALLDIR)
533 $(MV) $(APPNAME) $(INSTALLDIR)
 
534
535 $(OBJDIR):
 
 
 
536 $(MKDIR) $(OBJDIR)
 
537
538 $(OBJDIR)/translate: $(SRCDIR)/translate.c
539 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
540
541 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -574,15 +591,20 @@
574 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
575 # command. "del" will not work here because it is not a separate command
576 # but a MSDOS-shell builtin.
577 #
578 clean:
579 $(RM) $(OBJDIR) $(APPNAME)
 
 
 
 
 
 
580
581 setup: $(OBJDIR) $(APPNAME)
582 $(MAKENSIS) ./fossil.nsi
583
584
585 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
586 $(MKINDEX) $(TRANS_SRC) >$@
587 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
588 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
589
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -14,10 +14,11 @@
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
@@ -495,47 +496,63 @@
496 $(OBJDIR)/xfersetup.o \
497 $(OBJDIR)/zip.o
498
499 APPNAME = fossil.exe
500
501 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502 # inside of a Windows-style shell; otherwise, it is assumed that we are
503 # building inside of a Unix-style shell.
504 #
505 ifdef USE_WINDOWS
506 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509 VERSION = $(subst /,\,$(OBJDIR)/version)
510 CP = copy
511 MV = move
512 RM = del /Q
513 MKDIR = mkdir
514 RMDIR = rmdir /S /Q
515 else
516 TRANSLATE = $(OBJDIR)/translate
517 MAKEHEADERS = $(OBJDIR)/makeheaders
518 MKINDEX = $(OBJDIR)/mkindex
519 VERSION = $(OBJDIR)/version
520 CP = cp
521 MV = mv
522 RM = rm -f
523 MKDIR = mkdir -p
524 RMDIR = rm -rf
 
 
 
 
 
 
 
 
525 endif
526
527 all: $(OBJDIR) $(APPNAME)
528
529 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
530 ifdef USE_WINDOWS
531 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
532 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
533 else
534 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
535 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536 endif
537 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
538
539 install: $(APPNAME)
540 ifdef USE_WINDOWS
541 $(MKDIR) $(subst /,\,$(INSTALLDIR))
542 $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
543 else
544 $(MKDIR) $(INSTALLDIR)
545 $(MV) $(APPNAME) $(INSTALLDIR)
546 endif
547
548 $(OBJDIR):
549 ifdef USE_WINDOWS
550 $(MKDIR) $(subst /,\,$(OBJDIR))
551 else
552 $(MKDIR) $(OBJDIR)
553 endif
554
555 $(OBJDIR)/translate: $(SRCDIR)/translate.c
556 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
557
558 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -574,15 +591,20 @@
591 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
592 # command. "del" will not work here because it is not a separate command
593 # but a MSDOS-shell builtin.
594 #
595 clean:
596 ifdef USE_WINDOWS
597 $(RM) $(subst /,\,$(APPNAME))
598 $(RMDIR) $(subst /,\,$(OBJDIR))
599 else
600 $(RM) $(APPNAME)
601 $(RMDIR) $(OBJDIR)
602 endif
603
604 setup: $(OBJDIR) $(APPNAME)
605 $(MAKENSIS) ./fossil.nsi
 
606
607 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
608 $(MKINDEX) $(TRANS_SRC) >$@
609 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
610 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
611
M win/Makefile.mingw.mistachkin
+38 -16
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -14,10 +14,11 @@
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
1818
 PREFIX =
19
+# PREFIX = mingw32-
1920
 # PREFIX = i686-pc-mingw32-
2021
 # PREFIX = i686-w64-mingw32-
2122
 # PREFIX = x86_64-w64-mingw32-
2223
2324
 #### The toplevel directory of the source tree. Fossil can be built
@@ -495,47 +496,63 @@
495496
 $(OBJDIR)/xfersetup.o \
496497
 $(OBJDIR)/zip.o
497498
498499
 APPNAME = fossil.exe
499500
500
-#### If the SHELL environment variable exists, it is assumed that we are
501
-# building inside of a Unix-style shell; otherwise, it is assumed that
502
-# we are building inside of a Windows-style shell.
501
+#### If the USE_WINDOWS variable exists, it is assumed that we are building
502
+# inside of a Windows-style shell; otherwise, it is assumed that we are
503
+# building inside of a Unix-style shell.
503504
 #
504
-ifdef SHELL
505
+ifdef USE_WINDOWS
506
+TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507
+MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508
+MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509
+VERSION = $(subst /,\,$(OBJDIR)/version)
510
+CP = copy
511
+MV = move
512
+RM = del /Q
513
+MKDIR = mkdir
514
+RMDIR = rmdir /S /Q
515
+else
505516
 TRANSLATE = $(OBJDIR)/translate
506517
 MAKEHEADERS = $(OBJDIR)/makeheaders
507518
 MKINDEX = $(OBJDIR)/mkindex
508519
 VERSION = $(OBJDIR)/version
509520
 CP = cp
510521
 MV = mv
511
-RM = rm -rf
522
+RM = rm -f
512523
 MKDIR = mkdir -p
513
-else
514
-TRANSLATE = $(subst /,\\,$(OBJDIR)/translate)
515
-MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders)
516
-MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex)
517
-VERSION = $(subst /,\\,$(OBJDIR)/version)
518
-CP = copy
519
-MV = move
520
-RM = del /S /Q
521
-MKDIR = mkdir
524
+RMDIR = rm -rf
522525
 endif
523526
524527
 all: $(OBJDIR) $(APPNAME)
525528
526529
 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
530
+ifdef USE_WINDOWS
531
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
532
+ $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
533
+else
527534
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
528535
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536
+endif
529537
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
530538
531539
 install: $(APPNAME)
540
+ifdef USE_WINDOWS
541
+ $(MKDIR) $(subst /,\,$(INSTALLDIR))
542
+ $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
543
+else
532544
 $(MKDIR) $(INSTALLDIR)
533545
 $(MV) $(APPNAME) $(INSTALLDIR)
546
+endif
534547
535548
 $(OBJDIR):
549
+ifdef USE_WINDOWS
550
+ $(MKDIR) $(subst /,\,$(OBJDIR))
551
+else
536552
 $(MKDIR) $(OBJDIR)
553
+endif
537554
538555
 $(OBJDIR)/translate: $(SRCDIR)/translate.c
539556
 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
540557
541558
 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -574,15 +591,20 @@
574591
 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
575592
 # command. "del" will not work here because it is not a separate command
576593
 # but a MSDOS-shell builtin.
577594
 #
578595
 clean:
579
- $(RM) $(OBJDIR) $(APPNAME)
596
+ifdef USE_WINDOWS
597
+ $(RM) $(subst /,\,$(APPNAME))
598
+ $(RMDIR) $(subst /,\,$(OBJDIR))
599
+else
600
+ $(RM) $(APPNAME)
601
+ $(RMDIR) $(OBJDIR)
602
+endif
580603
581604
 setup: $(OBJDIR) $(APPNAME)
582605
 $(MAKENSIS) ./fossil.nsi
583
-
584606
585607
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
586608
 $(MKINDEX) $(TRANS_SRC) >$@
587609
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
588610
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
589611
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -14,10 +14,11 @@
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
 
19 # PREFIX = i686-pc-mingw32-
20 # PREFIX = i686-w64-mingw32-
21 # PREFIX = x86_64-w64-mingw32-
22
23 #### The toplevel directory of the source tree. Fossil can be built
@@ -495,47 +496,63 @@
495 $(OBJDIR)/xfersetup.o \
496 $(OBJDIR)/zip.o
497
498 APPNAME = fossil.exe
499
500 #### If the SHELL environment variable exists, it is assumed that we are
501 # building inside of a Unix-style shell; otherwise, it is assumed that
502 # we are building inside of a Windows-style shell.
503 #
504 ifdef SHELL
 
 
 
 
 
 
 
 
 
 
505 TRANSLATE = $(OBJDIR)/translate
506 MAKEHEADERS = $(OBJDIR)/makeheaders
507 MKINDEX = $(OBJDIR)/mkindex
508 VERSION = $(OBJDIR)/version
509 CP = cp
510 MV = mv
511 RM = rm -rf
512 MKDIR = mkdir -p
513 else
514 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate)
515 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders)
516 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex)
517 VERSION = $(subst /,\\,$(OBJDIR)/version)
518 CP = copy
519 MV = move
520 RM = del /S /Q
521 MKDIR = mkdir
522 endif
523
524 all: $(OBJDIR) $(APPNAME)
525
526 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
 
 
 
 
527 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
528 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
 
529 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
530
531 install: $(APPNAME)
 
 
 
 
532 $(MKDIR) $(INSTALLDIR)
533 $(MV) $(APPNAME) $(INSTALLDIR)
 
534
535 $(OBJDIR):
 
 
 
536 $(MKDIR) $(OBJDIR)
 
537
538 $(OBJDIR)/translate: $(SRCDIR)/translate.c
539 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
540
541 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -574,15 +591,20 @@
574 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
575 # command. "del" will not work here because it is not a separate command
576 # but a MSDOS-shell builtin.
577 #
578 clean:
579 $(RM) $(OBJDIR) $(APPNAME)
 
 
 
 
 
 
580
581 setup: $(OBJDIR) $(APPNAME)
582 $(MAKENSIS) ./fossil.nsi
583
584
585 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
586 $(MKINDEX) $(TRANS_SRC) >$@
587 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
588 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
589
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -14,10 +14,11 @@
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
@@ -495,47 +496,63 @@
496 $(OBJDIR)/xfersetup.o \
497 $(OBJDIR)/zip.o
498
499 APPNAME = fossil.exe
500
501 #### If the USE_WINDOWS variable exists, it is assumed that we are building
502 # inside of a Windows-style shell; otherwise, it is assumed that we are
503 # building inside of a Unix-style shell.
504 #
505 ifdef USE_WINDOWS
506 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
507 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
508 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
509 VERSION = $(subst /,\,$(OBJDIR)/version)
510 CP = copy
511 MV = move
512 RM = del /Q
513 MKDIR = mkdir
514 RMDIR = rmdir /S /Q
515 else
516 TRANSLATE = $(OBJDIR)/translate
517 MAKEHEADERS = $(OBJDIR)/makeheaders
518 MKINDEX = $(OBJDIR)/mkindex
519 VERSION = $(OBJDIR)/version
520 CP = cp
521 MV = mv
522 RM = rm -f
523 MKDIR = mkdir -p
524 RMDIR = rm -rf
 
 
 
 
 
 
 
 
525 endif
526
527 all: $(OBJDIR) $(APPNAME)
528
529 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
530 ifdef USE_WINDOWS
531 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
532 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
533 else
534 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
535 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
536 endif
537 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
538
539 install: $(APPNAME)
540 ifdef USE_WINDOWS
541 $(MKDIR) $(subst /,\,$(INSTALLDIR))
542 $(MV) $(APPNAME) $(subst /,\,$(INSTALLDIR))
543 else
544 $(MKDIR) $(INSTALLDIR)
545 $(MV) $(APPNAME) $(INSTALLDIR)
546 endif
547
548 $(OBJDIR):
549 ifdef USE_WINDOWS
550 $(MKDIR) $(subst /,\,$(OBJDIR))
551 else
552 $(MKDIR) $(OBJDIR)
553 endif
554
555 $(OBJDIR)/translate: $(SRCDIR)/translate.c
556 $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c
557
558 $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c
@@ -574,15 +591,20 @@
591 # Requires MSYS to be installed in addition to the MinGW, for the "rm"
592 # command. "del" will not work here because it is not a separate command
593 # but a MSDOS-shell builtin.
594 #
595 clean:
596 ifdef USE_WINDOWS
597 $(RM) $(subst /,\,$(APPNAME))
598 $(RMDIR) $(subst /,\,$(OBJDIR))
599 else
600 $(RM) $(APPNAME)
601 $(RMDIR) $(OBJDIR)
602 endif
603
604 setup: $(OBJDIR) $(APPNAME)
605 $(MAKENSIS) ./fossil.nsi
 
606
607 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
608 $(MKINDEX) $(TRANS_SRC) >$@
609 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
610 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
611

Keyboard Shortcuts

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