$OpenBSD: patch-Makefile_in,v 1.16 2011/01/09 19:11:34 landry Exp $
--- Makefile.in.orig	Wed Dec  8 18:00:47 2010
+++ Makefile.in	Wed Dec  8 18:12:47 2010
@@ -61,7 +61,6 @@ TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@
 
 # Do threads override each others locks by default (1), or do we test (-1)
 #
-TCC += -DSQLITE_THREAD_OVERRIDE_LOCK=@THREADSOVERRIDELOCKS@
 
 # Any target libraries which libsqlite must be linked against
 # 
@@ -190,7 +189,7 @@ LIBOBJS1 = sqlite3.lo
 
 # Determine the real value of LIBOBJ based on the 'configure' script
 #
-LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
+LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION)) pthread_stub.lo
 
 
 # All of the source code files.
@@ -286,6 +285,8 @@ SRC = \
   $(TOP)/src/walker.c \
   $(TOP)/src/where.c
 
+SRC += $(TOP)/src/pthread_stub.c
+
 # Source code for extensions
 #
 SRC += \
@@ -761,6 +762,9 @@ tclsqlite3$(TEXE):	tclsqlite-shell.lo libsqlite3.la
 	$(LTLINK) -o $@ tclsqlite-shell.lo \
 		 libsqlite3.la $(LIBTCL)
 
+pthread_stub.lo:	$(TOP)/src/pthread_stub.c
+	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/pthread_stub.c
+
 # Rules to build opcodes.c and opcodes.h
 #
 opcodes.c:	opcodes.h $(TOP)/mkopcodec.awk
@@ -781,7 +785,11 @@ parse.c:	$(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
 	$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
 
 sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
-	tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
+	sed -e '/^#include <sqlite3\.h>$$/d' \
+	    -e 's/--VERS--/$(RELEASE)/' \
+	    -e 's/--VERSION-NUMBER--/$(VERSION_NUMBER)/' \
+	    $(TOP)/src/sqlite.h.in $(TOP)/ext/rtree/sqlite3rtree.h \
+	> sqlite3.h
 
 keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
 	$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
@@ -854,7 +862,7 @@ TESTFIXTURE_FLAGS  = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLIT
 TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE 
 
 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
-TESTFIXTURE_SRC1 = sqlite3.c
+TESTFIXTURE_SRC1 = sqlite3.c $(TOP)/src/pthread_stub.c
 TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
 
 testfixture$(TEXE):	$(TESTFIXTURE_SRC)
@@ -922,6 +930,8 @@ clean:	
 
 distclean:	clean
 	rm -f config.log config.status libtool Makefile sqlite3.pc
+
+.PHONY: test
 
 #
 # Windows section
