/ Check-in [a117005f]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a few more issues with the nmake makefile.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a117005f502482c4529661616cbb26eee1fe75d1
User & Date: shaneh 2011-06-17 15:57:07
Context
2011-06-17
16:04
Add a missing declaration to fts3Int.h. check-in: 3bfd4466 user: dan tags: trunk
15:57
Fix a few more issues with the nmake makefile. check-in: a117005f user: shaneh tags: trunk
15:55
Update walro.test script for Windows. check-in: d6443f8e user: shaneh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

     2      2   # nmake Makefile for SQLITE
     3      3   #
     4      4   
     5      5   # The toplevel directory of the source tree.  This is the directory
     6      6   # that contains this "Makefile.msc".
     7      7   #
     8      8   TOP = .
            9  +
           10  +# Set this non-0 to create and use the SQLite amalgamation file.
           11  +#
           12  +USE_AMALGAMATION = 1
     9     13   
    10     14   # C Compiler and options for use in building executables that
    11     15   # will run on the platform that is doing the build.
    12     16   #
    13     17   BCC = cl.exe -O2
    14     18   
    15         -# C Compile and options for use in building executables that 
           19  +# C Compile and options for use in building executables that
    16     20   # will run on the target platform.  (BCC and TCC are usually the
    17     21   # same unless your are cross-compiling.)
    18     22   #
    19         -TCC = cl.exe -W3 -O2 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src -I$(TOP)\ext\rtree
           23  +TCC = cl.exe -W3 -O2 -DSQLITE_OS_WIN=1 -I. -I$(TOP)\src
           24  +
           25  +# The mksqlite3c.tcl and mksqlite3h.tcl scripts will pull in 
           26  +# any extension header files by default.  For non-amalgamation
           27  +# builds, we need to make sure the compiler can find these.
           28  +#
           29  +!IF $(USE_AMALGAMATION)==0
           30  +TCC = $(TCC) -I$(TOP)\ext\fts3
           31  +TCC = $(TCC) -I$(TOP)\ext\rtree
           32  +!ENDIF
    20     33   
    21     34   # Define -DNDEBUG to compile without debugging (i.e., for production usage)
    22     35   # Omitting the define will cause extra debugging code to be inserted and
    23     36   # includes extra comments when "EXPLAIN stmt" is used.
    24     37   #
    25     38   TCC = $(TCC) -DNDEBUG
    26     39   
................................................................................
    33     46   # This is the command to use for tclsh - normally just "tclsh", but we may
    34     47   # know the specific version we want to use
    35     48   #
    36     49   TCLSH_CMD = tclsh85
    37     50   
    38     51   # Compiler options needed for programs that use the readline() library.
    39     52   #
    40         -READLINE_FLAGS = -DHAVE_READLINE=0 
           53  +READLINE_FLAGS = -DHAVE_READLINE=0
    41     54   
    42     55   # The library that programs using readline() must link against.
    43     56   #
    44         -LIBREADLINE = 
           57  +LIBREADLINE =
    45     58   
    46     59   # Should the database engine be compiled threadsafe
    47     60   #
    48     61   TCC = $(TCC) -DSQLITE_THREADSAFE=1
    49     62   
    50     63   # Do threads override each others locks by default (1), or do we test (-1)
    51     64   #
    52     65   TCC = $(TCC) -DSQLITE_THREAD_OVERRIDE_LOCK=-1
    53     66   
    54     67   # Any target libraries which libsqlite must be linked against
    55         -# 
    56         -TLIBS = 
           68  +#
           69  +TLIBS =
    57     70   
    58     71   # Flags controlling use of the in memory btree implementation
    59     72   #
    60     73   # SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 to
    61     74   # default to file, 2 to default to memory, and 3 to force temporary
    62     75   # tables to always be in memory.
    63     76   #
    64         -TEMP_STORE = -DSQLITE_TEMP_STORE=1
           77  +TCC = $(TCC) -DSQLITE_TEMP_STORE=1
    65     78   
    66     79   # Enable/disable loadable extensions, and other optional features
    67         -# based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*).  
    68         -# The same set of OMIT and ENABLE flags should be passed to the 
           80  +# based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*).
           81  +# The same set of OMIT and ENABLE flags should be passed to the
    69     82   # LEMON parser generator and the mkkeywordhash tool as well.
    70     83   
    71     84   # BEGIN standard options
    72     85   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
    73     86   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
    74     87   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
    75     88   # END standard options
................................................................................
    97    110   
    98    111   # nawk compatible awk.
    99    112   NAWK = .\gawk.exe
   100    113   
   101    114   # You should not have to change anything below this line
   102    115   ###############################################################################
   103    116   
   104         -USE_AMALGAMATION = 1
   105         -
   106    117   # Object files for the SQLite library (non-amalgamation).
   107    118   #
   108    119   LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
   109    120            backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
   110    121            callback.lo complete.lo ctime.lo date.lo delete.lo \
   111    122            expr.lo fault.lo fkey.lo \
   112    123            fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo fts3_porter.lo \
................................................................................
   322    333     $(TOP)\src\test_stat.c \
   323    334     $(TOP)\src\test_tclvar.c \
   324    335     $(TOP)\src\test_thread.c \
   325    336     $(TOP)\src\test_vfs.c \
   326    337     $(TOP)\src\test_wholenumber.c \
   327    338     $(TOP)\src\test_wsd.c \
   328    339     $(TOP)\ext\fts3\fts3_term.c \
   329         -  $(TOP)\ext\fts3\fts3_test.c 
          340  +  $(TOP)\ext\fts3\fts3_test.c
   330    341   
   331    342   # Source code to the library files needed by the test fixture
   332    343   #
   333    344   TESTSRC2 = \
   334    345     $(TOP)\src\attach.c \
   335    346     $(TOP)\src\backup.c \
   336    347     $(TOP)\src\bitvec.c \
................................................................................
   383    394      keywordhash.h \
   384    395      $(TOP)\src\mutex.h \
   385    396      opcodes.h \
   386    397      $(TOP)\src\os.h \
   387    398      $(TOP)\src\os_common.h \
   388    399      $(TOP)\src\pager.h \
   389    400      $(TOP)\src\pcache.h \
   390         -   parse.h  \
   391         -   sqlite3.h  \
          401  +   parse.h \
          402  +   sqlite3.h \
   392    403      $(TOP)\src\sqlite3ext.h \
   393         -   $(TOP)\src\sqliteInt.h  \
          404  +   $(TOP)\src\sqliteInt.h \
   394    405      $(TOP)\src\sqliteLimit.h \
   395    406      $(TOP)\src\vdbe.h \
   396    407      $(TOP)\src\vdbeInt.h
   397    408   
   398    409   # Header files used by extensions
   399    410   #
   400    411   EXTHDR = $(EXTHDR) \
................................................................................
   422    433   #
   423    434   all:	sqlite3.h libsqlite3.lib sqlite3.exe libtclsqlite3.lib
   424    435   
   425    436   libsqlite3.lib:	$(LIBOBJ)
   426    437   	$(LTLIB) -OUT:$@ $(LIBOBJ) $(TLIBS)
   427    438   
   428    439   libtclsqlite3.lib:	tclsqlite.lo libsqlite3.lib
   429         -	$(LTLIB) /LIBPATH:$(TCLLIBDIR) -OUT:$@ $** $(LIBTCL:tcl=tclstub) $(TLIBS)
          440  +	$(LTLIB) /LIBPATH:$(TCLLIBDIR) -OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS)
   430    441   
   431    442   sqlite3.exe:	$(TOP)\src\shell.c libsqlite3.lib sqlite3.h
   432    443   	$(LTLINK) $(READLINE_FLAGS) \
   433    444   		$(TOP)\src\shell.c libsqlite3.lib \
   434    445   		$(LIBREADLINE) $(TLIBS)
   435    446   
   436    447   # This target creates a directory named "tsrc" and fills it with
................................................................................
   450    461   
   451    462   sqlite3.c:	.target_source $(TOP)\tool\mksqlite3c.tcl
   452    463   	$(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl
   453    464   
   454    465   # Rule to build the amalgamation
   455    466   #
   456    467   sqlite3.lo:	sqlite3.c
   457         -	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
          468  +	$(LTCOMPILE) -c sqlite3.c
   458    469   
   459    470   # Rules to build the LEMON compiler generator
   460    471   #
   461    472   lempar.c:	$(TOP)\src\lempar.c
   462    473   	copy $(TOP)\src\lempar.c .
   463    474   
   464    475   lemon.exe:	$(TOP)\tool\lemon.c lempar.c
................................................................................
   467    478   # Rules to build individual *.lo files from generated *.c files. This
   468    479   # applies to:
   469    480   #
   470    481   #     parse.lo
   471    482   #     opcodes.lo
   472    483   #
   473    484   parse.lo:	parse.c $(HDR)
   474         -	$(LTCOMPILE) $(TEMP_STORE) -c parse.c
          485  +	$(LTCOMPILE) -c parse.c
   475    486   
   476    487   opcodes.lo:	opcodes.c
   477         -	$(LTCOMPILE) $(TEMP_STORE) -c opcodes.c
          488  +	$(LTCOMPILE) -c opcodes.c
   478    489   
   479    490   # Rules to build individual *.lo files from files in the src directory.
   480    491   #
   481    492   alter.lo:	$(TOP)\src\alter.c $(HDR)
   482         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\alter.c
          493  +	$(LTCOMPILE) -c $(TOP)\src\alter.c
   483    494   
   484    495   analyze.lo:	$(TOP)\src\analyze.c $(HDR)
   485         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\analyze.c
          496  +	$(LTCOMPILE) -c $(TOP)\src\analyze.c
   486    497   
   487    498   attach.lo:	$(TOP)\src\attach.c $(HDR)
   488         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\attach.c
          499  +	$(LTCOMPILE) -c $(TOP)\src\attach.c
   489    500   
   490    501   auth.lo:	$(TOP)\src\auth.c $(HDR)
   491         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\auth.c
          502  +	$(LTCOMPILE) -c $(TOP)\src\auth.c
   492    503   
   493    504   backup.lo:	$(TOP)\src\backup.c $(HDR)
   494         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\backup.c
          505  +	$(LTCOMPILE) -c $(TOP)\src\backup.c
   495    506   
   496    507   bitvec.lo:	$(TOP)\src\bitvec.c $(HDR)
   497         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\bitvec.c
          508  +	$(LTCOMPILE) -c $(TOP)\src\bitvec.c
   498    509   
   499    510   btmutex.lo:	$(TOP)\src\btmutex.c $(HDR)
   500         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\btmutex.c
          511  +	$(LTCOMPILE) -c $(TOP)\src\btmutex.c
   501    512   
   502    513   btree.lo:	$(TOP)\src\btree.c $(HDR) $(TOP)\src\pager.h
   503         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\btree.c
          514  +	$(LTCOMPILE) -c $(TOP)\src\btree.c
   504    515   
   505    516   build.lo:	$(TOP)\src\build.c $(HDR)
   506         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\build.c
          517  +	$(LTCOMPILE) -c $(TOP)\src\build.c
   507    518   
   508    519   callback.lo:	$(TOP)\src\callback.c $(HDR)
   509         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\callback.c
          520  +	$(LTCOMPILE) -c $(TOP)\src\callback.c
   510    521   
   511    522   complete.lo:	$(TOP)\src\complete.c $(HDR)
   512         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\complete.c
          523  +	$(LTCOMPILE) -c $(TOP)\src\complete.c
   513    524   
   514    525   ctime.lo:	$(TOP)\src\ctime.c $(HDR)
   515         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\ctime.c
          526  +	$(LTCOMPILE) -c $(TOP)\src\ctime.c
   516    527   
   517    528   date.lo:	$(TOP)\src\date.c $(HDR)
   518         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\date.c
          529  +	$(LTCOMPILE) -c $(TOP)\src\date.c
   519    530   
   520    531   delete.lo:	$(TOP)\src\delete.c $(HDR)
   521         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\delete.c
          532  +	$(LTCOMPILE) -c $(TOP)\src\delete.c
   522    533   
   523    534   expr.lo:	$(TOP)\src\expr.c $(HDR)
   524         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\expr.c
          535  +	$(LTCOMPILE) -c $(TOP)\src\expr.c
   525    536   
   526    537   fault.lo:	$(TOP)\src\fault.c $(HDR)
   527         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\fault.c
          538  +	$(LTCOMPILE) -c $(TOP)\src\fault.c
   528    539   
   529    540   fkey.lo:	$(TOP)\src\fkey.c $(HDR)
   530         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\fkey.c
          541  +	$(LTCOMPILE) -c $(TOP)\src\fkey.c
   531    542   
   532    543   func.lo:	$(TOP)\src\func.c $(HDR)
   533         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\func.c
          544  +	$(LTCOMPILE) -c $(TOP)\src\func.c
   534    545   
   535    546   global.lo:	$(TOP)\src\global.c $(HDR)
   536         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\global.c
          547  +	$(LTCOMPILE) -c $(TOP)\src\global.c
   537    548   
   538    549   hash.lo:	$(TOP)\src\hash.c $(HDR)
   539         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\hash.c
          550  +	$(LTCOMPILE) -c $(TOP)\src\hash.c
   540    551   
   541    552   insert.lo:	$(TOP)\src\insert.c $(HDR)
   542         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\insert.c
          553  +	$(LTCOMPILE) -c $(TOP)\src\insert.c
   543    554   
   544    555   journal.lo:	$(TOP)\src\journal.c $(HDR)
   545         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\journal.c
          556  +	$(LTCOMPILE) -c $(TOP)\src\journal.c
   546    557   
   547    558   legacy.lo:	$(TOP)\src\legacy.c $(HDR)
   548         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\legacy.c
          559  +	$(LTCOMPILE) -c $(TOP)\src\legacy.c
   549    560   
   550    561   loadext.lo:	$(TOP)\src\loadext.c $(HDR)
   551         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\loadext.c
          562  +	$(LTCOMPILE) -c $(TOP)\src\loadext.c
   552    563   
   553    564   main.lo:	$(TOP)\src\main.c $(HDR)
   554         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\main.c
          565  +	$(LTCOMPILE) -c $(TOP)\src\main.c
   555    566   
   556    567   malloc.lo:	$(TOP)\src\malloc.c $(HDR)
   557         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\malloc.c
          568  +	$(LTCOMPILE) -c $(TOP)\src\malloc.c
   558    569   
   559    570   mem0.lo:	$(TOP)\src\mem0.c $(HDR)
   560         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mem0.c
          571  +	$(LTCOMPILE) -c $(TOP)\src\mem0.c
   561    572   
   562    573   mem1.lo:	$(TOP)\src\mem1.c $(HDR)
   563         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mem1.c
          574  +	$(LTCOMPILE) -c $(TOP)\src\mem1.c
   564    575   
   565    576   mem2.lo:	$(TOP)\src\mem2.c $(HDR)
   566         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mem2.c
          577  +	$(LTCOMPILE) -c $(TOP)\src\mem2.c
   567    578   
   568    579   mem3.lo:	$(TOP)\src\mem3.c $(HDR)
   569         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mem3.c
          580  +	$(LTCOMPILE) -c $(TOP)\src\mem3.c
   570    581   
   571    582   mem5.lo:	$(TOP)\src\mem5.c $(HDR)
   572         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mem5.c
          583  +	$(LTCOMPILE) -c $(TOP)\src\mem5.c
   573    584   
   574    585   memjournal.lo:	$(TOP)\src\memjournal.c $(HDR)
   575         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\memjournal.c
          586  +	$(LTCOMPILE) -c $(TOP)\src\memjournal.c
   576    587   
   577    588   mutex.lo:	$(TOP)\src\mutex.c $(HDR)
   578         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mutex.c
          589  +	$(LTCOMPILE) -c $(TOP)\src\mutex.c
   579    590   
   580    591   mutex_noop.lo:	$(TOP)\src\mutex_noop.c $(HDR)
   581         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mutex_noop.c
          592  +	$(LTCOMPILE) -c $(TOP)\src\mutex_noop.c
   582    593   
   583    594   mutex_os2.lo:	$(TOP)\src\mutex_os2.c $(HDR)
   584         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mutex_os2.c
          595  +	$(LTCOMPILE) -c $(TOP)\src\mutex_os2.c
   585    596   
   586    597   mutex_unix.lo:	$(TOP)\src\mutex_unix.c $(HDR)
   587         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mutex_unix.c
          598  +	$(LTCOMPILE) -c $(TOP)\src\mutex_unix.c
   588    599   
   589    600   mutex_w32.lo:	$(TOP)\src\mutex_w32.c $(HDR)
   590         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\mutex_w32.c
          601  +	$(LTCOMPILE) -c $(TOP)\src\mutex_w32.c
   591    602   
   592    603   notify.lo:	$(TOP)\src\notify.c $(HDR)
   593         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\notify.c
          604  +	$(LTCOMPILE) -c $(TOP)\src\notify.c
   594    605   
   595    606   pager.lo:	$(TOP)\src\pager.c $(HDR) $(TOP)\src\pager.h
   596         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\pager.c
          607  +	$(LTCOMPILE) -c $(TOP)\src\pager.c
   597    608   
   598    609   pcache.lo:	$(TOP)\src\pcache.c $(HDR) $(TOP)\src\pcache.h
   599         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\pcache.c
          610  +	$(LTCOMPILE) -c $(TOP)\src\pcache.c
   600    611   
   601    612   pcache1.lo:	$(TOP)\src\pcache1.c $(HDR) $(TOP)\src\pcache.h
   602         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\pcache1.c
          613  +	$(LTCOMPILE) -c $(TOP)\src\pcache1.c
   603    614   
   604    615   os.lo:	$(TOP)\src\os.c $(HDR)
   605         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\os.c
          616  +	$(LTCOMPILE) -c $(TOP)\src\os.c
   606    617   
   607    618   os_unix.lo:	$(TOP)\src\os_unix.c $(HDR)
   608         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\os_unix.c
          619  +	$(LTCOMPILE) -c $(TOP)\src\os_unix.c
   609    620   
   610    621   os_win.lo:	$(TOP)\src\os_win.c $(HDR)
   611         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\os_win.c
          622  +	$(LTCOMPILE) -c $(TOP)\src\os_win.c
   612    623   
   613    624   os_os2.lo:	$(TOP)\src\os_os2.c $(HDR)
   614         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\os_os2.c
          625  +	$(LTCOMPILE) -c $(TOP)\src\os_os2.c
   615    626   
   616    627   pragma.lo:	$(TOP)\src\pragma.c $(HDR)
   617         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\pragma.c
          628  +	$(LTCOMPILE) -c $(TOP)\src\pragma.c
   618    629   
   619    630   prepare.lo:	$(TOP)\src\prepare.c $(HDR)
   620         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\prepare.c
          631  +	$(LTCOMPILE) -c $(TOP)\src\prepare.c
   621    632   
   622    633   printf.lo:	$(TOP)\src\printf.c $(HDR)
   623         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\printf.c
          634  +	$(LTCOMPILE) -c $(TOP)\src\printf.c
   624    635   
   625    636   random.lo:	$(TOP)\src\random.c $(HDR)
   626         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\random.c
          637  +	$(LTCOMPILE) -c $(TOP)\src\random.c
   627    638   
   628    639   resolve.lo:	$(TOP)\src\resolve.c $(HDR)
   629         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\resolve.c
          640  +	$(LTCOMPILE) -c $(TOP)\src\resolve.c
   630    641   
   631    642   rowset.lo:	$(TOP)\src\rowset.c $(HDR)
   632         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\rowset.c
          643  +	$(LTCOMPILE) -c $(TOP)\src\rowset.c
   633    644   
   634    645   select.lo:	$(TOP)\src\select.c $(HDR)
   635         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\select.c
          646  +	$(LTCOMPILE) -c $(TOP)\src\select.c
   636    647   
   637    648   status.lo:	$(TOP)\src\status.c $(HDR)
   638         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\status.c
          649  +	$(LTCOMPILE) -c $(TOP)\src\status.c
   639    650   
   640    651   table.lo:	$(TOP)\src\table.c $(HDR)
   641         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\table.c
          652  +	$(LTCOMPILE) -c $(TOP)\src\table.c
   642    653   
   643    654   tokenize.lo:	$(TOP)\src\tokenize.c keywordhash.h $(HDR)
   644         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\tokenize.c
          655  +	$(LTCOMPILE) -c $(TOP)\src\tokenize.c
   645    656   
   646    657   trigger.lo:	$(TOP)\src\trigger.c $(HDR)
   647         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\trigger.c
          658  +	$(LTCOMPILE) -c $(TOP)\src\trigger.c
   648    659   
   649    660   update.lo:	$(TOP)\src\update.c $(HDR)
   650         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\update.c
          661  +	$(LTCOMPILE) -c $(TOP)\src\update.c
   651    662   
   652    663   utf.lo:	$(TOP)\src\utf.c $(HDR)
   653         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\utf.c
          664  +	$(LTCOMPILE) -c $(TOP)\src\utf.c
   654    665   
   655    666   util.lo:	$(TOP)\src\util.c $(HDR)
   656         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\util.c
          667  +	$(LTCOMPILE) -c $(TOP)\src\util.c
   657    668   
   658    669   vacuum.lo:	$(TOP)\src\vacuum.c $(HDR)
   659         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vacuum.c
          670  +	$(LTCOMPILE) -c $(TOP)\src\vacuum.c
   660    671   
   661    672   vdbe.lo:	$(TOP)\src\vdbe.c $(HDR)
   662         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vdbe.c
          673  +	$(LTCOMPILE) -c $(TOP)\src\vdbe.c
   663    674   
   664    675   vdbeapi.lo:	$(TOP)\src\vdbeapi.c $(HDR)
   665         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vdbeapi.c
          676  +	$(LTCOMPILE) -c $(TOP)\src\vdbeapi.c
   666    677   
   667    678   vdbeaux.lo:	$(TOP)\src\vdbeaux.c $(HDR)
   668         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vdbeaux.c
          679  +	$(LTCOMPILE) -c $(TOP)\src\vdbeaux.c
   669    680   
   670    681   vdbeblob.lo:	$(TOP)\src\vdbeblob.c $(HDR)
   671         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vdbeblob.c
          682  +	$(LTCOMPILE) -c $(TOP)\src\vdbeblob.c
   672    683   
   673    684   vdbemem.lo:	$(TOP)\src\vdbemem.c $(HDR)
   674         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vdbemem.c
          685  +	$(LTCOMPILE) -c $(TOP)\src\vdbemem.c
   675    686   
   676    687   vdbetrace.lo:	$(TOP)\src\vdbetrace.c $(HDR)
   677         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vdbetrace.c
          688  +	$(LTCOMPILE) -c $(TOP)\src\vdbetrace.c
   678    689   
   679    690   vtab.lo:	$(TOP)\src\vtab.c $(HDR)
   680         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\vtab.c
          691  +	$(LTCOMPILE) -c $(TOP)\src\vtab.c
   681    692   
   682    693   wal.lo:	$(TOP)\src\wal.c $(HDR)
   683         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\wal.c
          694  +	$(LTCOMPILE) -c $(TOP)\src\wal.c
   684    695   
   685    696   walker.lo:	$(TOP)\src\walker.c $(HDR)
   686         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\walker.c
          697  +	$(LTCOMPILE) -c $(TOP)\src\walker.c
   687    698   
   688    699   where.lo:	$(TOP)\src\where.c $(HDR)
   689         -	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)\src\where.c
          700  +	$(LTCOMPILE) -c $(TOP)\src\where.c
   690    701   
   691    702   tclsqlite.lo:	$(TOP)\src\tclsqlite.c $(HDR)
   692    703   	$(LTCOMPILE) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
   693    704   
   694    705   tclsqlite-shell.lo:	$(TOP)\src\tclsqlite.c $(HDR)
   695    706   	$(LTCOMPILE) -DTCLSH=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
   696    707   
................................................................................
   710    721   	type parse.h $(TOP)\src\vdbe.c | $(NAWK) -f $(TOP)\mkopcodeh.awk >opcodes.h
   711    722   
   712    723   # Rules to build parse.c and parse.h - the outputs of lemon.
   713    724   #
   714    725   parse.h:	parse.c
   715    726   
   716    727   parse.c:	$(TOP)\src\parse.y lemon.exe $(TOP)\addopcodes.awk
          728  +	del /Q parse.y parse.h parse.h.temp
   717    729   	copy $(TOP)\src\parse.y .
   718         -	del /Q parse.h
   719    730   	.\lemon.exe $(OPT_FEATURE_FLAGS) $(OPTS) parse.y
   720    731   	move parse.h parse.h.temp
   721    732   	$(NAWK) -f $(TOP)\addopcodes.awk parse.h.temp >parse.h
   722    733   
   723    734   sqlite3.h:	$(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
   724    735   	$(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP) >sqlite3.h
   725    736   
................................................................................
   792    803   #
   793    804   # If using the amalgamation, use sqlite3.c directly to build the test
   794    805   # fixture.  Otherwise link against libsqlite3.lib.  (This distinction is
   795    806   # necessary because the test fixture requires non-API symbols which are
   796    807   # hidden when the library is built via the amalgamation).
   797    808   #
   798    809   TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
   799         -TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE 
          810  +TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
   800    811   
   801    812   TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.lib
   802    813   TESTFIXTURE_SRC1 = sqlite3.c
   803    814   !IF $(USE_AMALGAMATION)==0
   804    815   TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
   805    816   !ELSE
   806    817   TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC1)
   807    818   !ENDIF
   808    819   
   809    820   testfixture.exe:	$(TESTFIXTURE_SRC)
   810         -	$(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
          821  +	$(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
   811    822   		-DBUILD_sqlite -I$(TCLINCDIR) \
   812    823   		$(TESTFIXTURE_SRC) /link /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS)
   813    824   
   814    825   fulltest:	testfixture.exe sqlite3.exe
   815    826   	.\testfixture.exe $(TOP)\test\all.test
   816    827   
   817    828   soaktest:	testfixture.exe sqlite3.exe
................................................................................
   822    833   
   823    834   spaceanal_tcl.h:	$(TOP)\tool\spaceanal.tcl
   824    835   	$(NAWK) "/^[^#]/ { gsub(/\\/,\"\\\\\\\\\");gsub(/\\\"/,\"\\\\\\\"\");gsub(/^/,\"\\\"\");gsub(/$$/,\"\\n\\\"\");print }" \
   825    836   		$(TOP)\tool\spaceanal.tcl >spaceanal_tcl.h
   826    837   
   827    838   sqlite3_analyzer.exe:	$(TESTFIXTURE_SRC) spaceanal_tcl.h
   828    839   	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
   829         -		-DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE $(TEMP_STORE) \
          840  +		-DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \
   830    841   		-DBUILD_sqlite -I$(TCLINCDIR) \
   831    842   		$(TESTFIXTURE_SRC) /link /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS)
   832    843   
   833         -clean:	
          844  +clean:
   834    845   	del /Q *.lo *.lib *.obj sqlite3.exe libsqlite3.lib
   835    846   	del /Q sqlite3.h opcodes.c opcodes.h
   836    847   	del /Q lemon.exe lempar.c parse.*
   837    848   	del /Q mkkeywordhash.exe keywordhash.h
   838    849   	-rmdir /Q/S tsrc
   839    850   	del /Q .target_source
   840    851   	del /Q testfixture.exe test.db
   841         -	del /Q sqlite3.dll sqlite3.lib sqlite3.def
          852  +	del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
   842    853   	del /Q sqlite3.c
   843    854   	del /Q sqlite3_analyzer.exe spaceanal_tcl.h
   844    855   
   845    856   #
   846    857   # Windows section
   847    858   #
   848    859   dll: sqlite3.dll
   849    860   
   850         -sqlite3.def: $(LIBOBJ)
   851         -	echo 'EXPORTS' >sqlite3.def
   852         -	dumpbin /symbols $(LIBOBJ) \
   853         -		| $(NAWK) "/SECT.*_sqlite3_/ { sub(/^.* _/,\"\");print }" \
          861  +sqlite3.def: libsqlite3.lib
          862  +	echo EXPORTS >sqlite3.def
          863  +	dumpbin /all libsqlite3.lib \
          864  +		| $(NAWK) "/ 1 _sqlite3_/ { sub(/^.* _/,\"\");print }" \
   854    865   		| sort >>sqlite3.def
   855    866   
   856    867   sqlite3.dll: $(LIBOBJ) sqlite3.def
   857         -	$(TCC) -LD -Fo$@ /DEF:sqlite3.def $(LIBOBJ)
          868  +	link /DLL /OUT:$@ /DEF:sqlite3.def $(LIBOBJ)