Update configuration and make files for mingw/msys on Windows (CVS 1141)

FossilOrigin-Name: 1e9689672c94e5ab89f07099c1402e157c8b02c1
This commit is contained in:
dougcurrie 2003-12-19 20:09:51 +00:00
parent f93e41442e
commit 6194a5fb75
5 changed files with 46 additions and 30 deletions

View File

@ -167,7 +167,7 @@ VDBEHDR = \
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
#
all: sqlite.h libsqlite.la sqlite
all: sqlite.h libsqlite.la sqlite@TARGET_EXEEXT@
# Generate the file "last_change" which contains the date of change
# of the most recently modified source code file
@ -185,7 +185,7 @@ libtclsqlite.la: tclsqlite.lo libsqlite.la
libsqlite.la $(LIBTCL) -rpath $(exec_prefix)/lib \
-version-info "8:6:8"
sqlite: $(TOP)/src/shell.c libsqlite.la sqlite.h
sqlite@TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h
$(LIBTOOL) $(TCC) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
libsqlite.la $(LIBREADLINE) -rpath $(exec_prefix)/lib
@ -204,7 +204,7 @@ target_source: $(SRC) $(VDBEHDR)
# Rules to build the LEMON compiler generator
#
lemon: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
lemon@BUILD_EXEEXT@: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
$(BCC) -o lemon $(TOP)/tool/lemon.c
cp $(TOP)/tool/lempar.c .
@ -247,7 +247,7 @@ parse.lo: parse.c $(HDR)
parse.h: parse.c
parse.c: $(TOP)/src/parse.y lemon
parse.c: $(TOP)/src/parse.y lemon@BUILD_EXEEXT@
cp $(TOP)/src/parse.y .
./lemon parse.y
@ -345,15 +345,15 @@ tclsqlite: $(TOP)/src/tclsqlite.c libsqlite.la
$(LIBTOOL) $(TCC) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \
$(TOP)/src/tclsqlite.c libsqlite.la $(LIBTCL)
testfixture: $(TOP)/src/tclsqlite.c libtclsqlite.la libsqlite.la $(TESTSRC)
testfixture@TARGET_EXEEXT@: $(TOP)/src/tclsqlite.c libtclsqlite.la libsqlite.la $(TESTSRC)
$(LIBTOOL) $(TCC) $(TCL_FLAGS) -DTCLSH=1 -DSQLITE_TEST=1\
-o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
libtclsqlite.la libsqlite.la $(LIBTCL)
fulltest: testfixture sqlite
fulltest: testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
./testfixture $(TOP)/test/all.test
test: testfixture sqlite
test: testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@
./testfixture $(TOP)/test/quick.test
index.html: $(TOP)/www/index.tcl last_change
@ -449,24 +449,40 @@ doc: $(DOC)
mkdir -p doc
mv $(DOC) doc
install: sqlite libsqlite.la sqlite.h
install: sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h
$(INSTALL) -d $(exec_prefix)/lib
$(LIBTOOL) $(INSTALL) libsqlite.la $(exec_prefix)/lib
$(INSTALL) -d $(exec_prefix)/bin
$(LIBTOOL) $(INSTALL) sqlite $(exec_prefix)/bin
$(LIBTOOL) $(INSTALL) sqlite@TARGET_EXEEXT@ $(exec_prefix)/bin
$(INSTALL) -d $(prefix)/include
$(INSTALL) -m 0644 sqlite.h $(prefix)/include
$(INSTALL) -d $(exec_prefix)/lib/pkgconfig;
$(INSTALL) -m 0644 sqlite.pc $(exec_prefix)/lib/pkgconfig;
clean:
rm -f *.lo *.la *.o sqlite libsqlite.la sqlite.h opcodes.*
rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
rm -rf .libs .deps
rm -f lemon lempar.c parse.* sqlite*.tar.gz
rm -f lemon@BUILD_EXEEXT@ lempar.c parse.* sqlite*.tar.gz
rm -f $(PUBLISH)
rm -f *.da *.bb *.bbg gmon.out
rm -f testfixture test.db
rm -f testfixture@TARGET_EXEEXT@ test.db
rm -rf doc
rm -f sqlite.dll sqlite.lib
#make windows dll
dll: sqlite.dll
sqlite.dll: $(LIBOBJ) sqlite.def
dllwrap --dllname sqlite.dll --def sqlite.def $(LIBOBJ)
strip sqlite.dll
#target for dll import libraries
implib: sqlite.lib
#make Borland C++ import library for the dll
sqlite.lib: sqlite.dll
-implib -a sqlite.lib sqlite.dll sqlite.def
-lib /machine:i386 /def:sqlite.def
distclean: clean
rm -f config.log config.status libtool Makefile config.h

8
configure vendored
View File

@ -1435,7 +1435,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# The following RCS revision string applies to configure.in
# $Revision: 1.18 $
# $Revision: 1.19 $
#########
# Programs needed
@ -8356,7 +8356,7 @@ fi
if test "$CYGWIN" = "yes"; then
BUILD_EXEEXT=.exe
else
BUILD_EXEEXT=""
BUILD_EXEEXT=$EXEEXT
fi
if test "$cross" = "0"; then
TARGET_EXEEXT=$BUILD_EXEEXT
@ -8596,7 +8596,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_Tcl_Init" = no; then
for ac_lib in tcl8.4 tcl8.3 tcl8.2 tcl8.1 tcl8.0 tcl80 tcl; do
for ac_lib in tcl8.4 tcl8.3 tcl84 tcl83 tcl; do
LIBS="-l$ac_lib $otherlibs $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
@ -9186,7 +9186,7 @@ fi
fi
if test "$found" = "no"; then
for dir in /usr /usr/local /usr/local/readline /usr/contrib; do
for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
as_ac_File=`echo "ac_cv_file_$dir/include/readline.h" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $dir/include/readline.h" >&5
echo $ECHO_N "checking for $dir/include/readline.h... $ECHO_C" >&6

View File

@ -138,7 +138,7 @@ AC_INIT(src/sqlite.h.in)
dnl Put the RCS revision string after AC_INIT so that it will also
dnl show in in configure.
# The following RCS revision string applies to configure.in
# $Revision: 1.6 $
# $Revision: 1.7 $
#########
# Programs needed
@ -384,7 +384,7 @@ fi
if test "$CYGWIN" = "yes"; then
BUILD_EXEEXT=.exe
else
BUILD_EXEEXT=""
BUILD_EXEEXT=$EXEEXT
fi
if test "$cross" = "0"; then
TARGET_EXEEXT=$BUILD_EXEEXT
@ -435,7 +435,7 @@ else
else
LIBS=""
AC_SEARCH_LIBS(Tcl_Init, dnl
tcl8.4 tcl8.3 tcl8.2 tcl8.1 tcl8.0 tcl80 tcl,,,$otherlibs)
tcl8.4 tcl8.3 tcl84 tcl83 tcl,,,$otherlibs)
fi
TARGET_TCL_LIBS="$LIBS $otherlibs"
fi
@ -509,7 +509,7 @@ else
AC_CHECK_HEADER(readline.h, [found=yes])
fi
if test "$found" = "no"; then
for dir in /usr /usr/local /usr/local/readline /usr/contrib; do
for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
AC_CHECK_FILE($dir/include/readline.h, found=yes)
if test "$found" = "yes"; then
TARGET_READLINE_INC="-I$dir/include"

View File

@ -1,6 +1,6 @@
C Remove\sa\scomma\sat\sthe\send\sof\san\senum\sdefinition.\s\sSome\scompilers\scould\snot\ndeal\swith\sit.\s(CVS\s1140)
D 2003-12-19T12:32:46
F Makefile.in 3c04579d45d26fc0432dcf0e5414ad065722c3a1
C Update\sconfiguration\sand\smake\sfiles\sfor\smingw/msys\son\sWindows\s(CVS\s1141)
D 2003-12-19T20:09:52
F Makefile.in 0515ff9218ad8d5a8f6220f0494b8ef94c67013b
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
F VERSION 37237c64d9e5b103d462e341e4ac3b4f2a6e43dd
@ -9,8 +9,8 @@ F art/SQLite.eps 9b43cc99cfd2be687d386faea6862ea68d6a72b2
F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
F config.guess 831db445a8ae31d1f773fce85e14c16c8677417d
F config.sub 975368989965310238930ecf8e7f06a23061dbb1
F configure a79b01eab6acd5e45f08a84b187c435d7d76e256 x
F configure.ac 85202fbe47e3d308406090d0016af2a4f6c5b9e6
F configure 45658d6d47a1f231bd9f8a4b5c50b6400a292cfb x
F configure.ac 684143ce9ee7bafc4291d0e17f2dfdc70514d1d6
F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
@ -179,7 +179,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
P 55e2488912871381959326ab7fa89123ab30d659
R 94fd29229d6e048836e2ae3bf9bf36fd
U drh
Z c3d8ae6bfeac7ec0d73f8e5c33a77b76
P b1890a5b9c1222086b3aae92e49eb090a17a6492
R a1aa8a82da10cb4689366953e43d5c93
U dougcurrie
Z a47af7e2d89d970bd8a8e5822bcce85c

View File

@ -1 +1 @@
b1890a5b9c1222086b3aae92e49eb090a17a6492
1e9689672c94e5ab89f07099c1402e157c8b02c1