Skip to content

Commit 58acc82

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into prerelease-int
2 parents fc04d69 + 801e036 commit 58acc82

113 files changed

Lines changed: 7206 additions & 8049 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
184184
icu.lo insert.lo journal.lo legacy.lo loadext.lo \
185185
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
186186
memjournal.lo \
187-
mutex.lo mutex_noop.lo mutex_os2.lo mutex_unix.lo mutex_w32.lo \
188-
notify.lo opcodes.lo os.lo os_os2.lo os_unix.lo os_win.lo \
187+
mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
188+
notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
189189
pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
190190
random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
191191
table.lo tokenize.lo trigger.lo \
@@ -245,14 +245,12 @@ SRC = \
245245
$(TOP)/src/mutex.c \
246246
$(TOP)/src/mutex.h \
247247
$(TOP)/src/mutex_noop.c \
248-
$(TOP)/src/mutex_os2.c \
249248
$(TOP)/src/mutex_unix.c \
250249
$(TOP)/src/mutex_w32.c \
251250
$(TOP)/src/notify.c \
252251
$(TOP)/src/os.c \
253252
$(TOP)/src/os.h \
254253
$(TOP)/src/os_common.h \
255-
$(TOP)/src/os_os2.c \
256254
$(TOP)/src/os_unix.c \
257255
$(TOP)/src/os_win.c \
258256
$(TOP)/src/pager.c \
@@ -415,7 +413,6 @@ TESTSRC2 = \
415413
$(TOP)/src/wal.c \
416414
$(TOP)/src/mem5.c \
417415
$(TOP)/src/os.c \
418-
$(TOP)/src/os_os2.c \
419416
$(TOP)/src/os_unix.c \
420417
$(TOP)/src/os_win.c \
421418
$(TOP)/src/pager.c \
@@ -677,9 +674,6 @@ mutex.lo: $(TOP)/src/mutex.c $(HDR)
677674
mutex_noop.lo: $(TOP)/src/mutex_noop.c $(HDR)
678675
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mutex_noop.c
679676

680-
mutex_os2.lo: $(TOP)/src/mutex_os2.c $(HDR)
681-
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mutex_os2.c
682-
683677
mutex_unix.lo: $(TOP)/src/mutex_unix.c $(HDR)
684678
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mutex_unix.c
685679

@@ -707,9 +701,6 @@ os_unix.lo: $(TOP)/src/os_unix.c $(HDR)
707701
os_win.lo: $(TOP)/src/os_win.c $(HDR)
708702
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/os_win.c
709703

710-
os_os2.lo: $(TOP)/src/os_os2.c $(HDR)
711-
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/os_os2.c
712-
713704
pragma.lo: $(TOP)/src/pragma.c $(HDR)
714705
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/pragma.c
715706

@@ -970,6 +961,7 @@ clean:
970961
rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
971962
rm -f sqlite3.c
972963
rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
964+
rm -f sqlite-output.vsix
973965

974966
distclean: clean
975967
rm -f config.log config.status libtool Makefile sqlite3.pc

0 commit comments

Comments
 (0)