Patch to Makefile.in so that it works with OS X. Ticket #1292. (CVS 2544)

FossilOrigin-Name: 0dfabca641371690027634213632c914ad6f2b8b

diff --git a/Makefile.in b/Makefile.in
index ae8da76dd63d265b08d48a9b161956f419ae0d4a..afc2e9827fa98540f51f933dedeca5a3508490e1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,6 +193,10 @@ TESTSRC = \
   $(TOP)/src/vdbe.c \
   $(TOP)/src/md5.c
 
+# In LIBOBJ but not TESTSRC
+COMMONOBJ = $(foreach obj,$(LIBOBJ),\
+       $(if $(findstring $(patsubst %.lo,%.c,$(obj)),$(TESTSRC)),,$(obj)))
+
 # Header files used by all library source files.
 #
 HDR = \
@@ -413,16 +417,15 @@ tclsqlite3:       tclsqlite-shell.lo libsqlite3.la
        $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
                 libsqlite3.la $(LIBTCL)
 
-testfixture$(TEXE):    $(TOP)/src/tclsqlite.c libtclsqlite3.la libsqlite3.la $(TESTSRC)
-       $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 $(TEMP_STORE)\
-                -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
-               libtclsqlite3.la $(LIBTCL)
+testfixture$(TEXE):    $(TOP)/src/tclsqlite.c $(TESTSRC) $(COMMONOBJ)
+       $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 $(THREADSAFE) $(TEMP_STORE)\
+       -o testfixture \
+       $(TESTSRC) $(TOP)/src/tclsqlite.c $(COMMONOBJ) $(LIBTCL)
 
-crashtest$(TEXE):      $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) $(TOP)/src/os_test.c
+crashtest$(TEXE): $(TOP)/src/tclsqlite.c $(TOP)/src/os_test.c $(TESTSRC) $(COMMONOBJ)
        $(LTLINK) -DOS_TEST=1 -DTCLSH=1 -DSQLITE_TEST=1 \
-               -o crashtest \
-               $(TESTSRC) $(TOP)/src/os_test.c $(TOP)/src/tclsqlite.c \
-               libsqlite3.la $(LIBTCL) $(THREADLIB)
+       -o crashtest $(TOP)/src/os_test.c \
+       $(TESTSRC) $(TOP)/src/tclsqlite.c $(COMMONOBJ) $(LIBTCL)
 
 
 

diff --git a/manifest b/manifest
index 52b211fa72299eb54b7f16b35129e26dee640e72..f818db923cb8b98f4fc7cfc7fa53bddd64452868 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Make\ssure\sthere\sis\sonly\sone\sbusy\scounter.\s\sTicket\s#1315.\s(CVS\s2543)
-D 2005-07-09T02:16:03
-F Makefile.in 3c10cd7bc3ecbd60fe4d5a5c0f59bfa7fb217a66
+C Patch\sto\sMakefile.in\sso\sthat\sit\sworks\swith\sOS\sX.\s\sTicket\s#1292.\s(CVS\s2544)
+D 2005-07-09T02:23:24
+F Makefile.in 22ea9c0fe748f591712d8fe3c6d972c6c173a165
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION 44fad0bf0996660a11bf8187361de03941d9b7b0
@@ -286,7 +286,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P ba56478dd8bc2135749966ff55831fd497883781
-R aec210f9b01657445bd9205f6677dd15
+P af2a0ba4a38abf208db1ff6f018cf756de2afd5b
+R e83a4a25b62e237fe0dca9d5c355a2d7
 U drh
-Z 3974f28046fc5173c599027244194a4a
+Z 85f7f8bce388cdee7c6f4c9ecdc109bf

diff --git a/manifest.uuid b/manifest.uuid
index 3f7e2b30c8f0cece2348c959e3915d6b38378fe7..a40518b044b96b346f877a32bb049ab36700b588 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-af2a0ba4a38abf208db1ff6f018cf756de2afd5b
\ No newline at end of file
+0dfabca641371690027634213632c914ad6f2b8b
\ No newline at end of file