Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Update configuration and make files for mingw/msys on Windows (CVS 1141) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
1e9689672c94e5ab89f07099c1402e15 |
User & Date: | dougcurrie 2003-12-19 20:09:52.000 |
Context
2003-12-20
| ||
04:00 | Fix some minor problems with the new test4.c module used for doing thread testing. (CVS 1142) (check-in: 952924084a user: drh tags: trunk) | |
2003-12-19
| ||
20:09 | Update configuration and make files for mingw/msys on Windows (CVS 1141) (check-in: 1e9689672c user: dougcurrie tags: trunk) | |
12:32 | Remove a comma at the end of an enum definition. Some compilers could not deal with it. (CVS 1140) (check-in: b1890a5b9c user: drh tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
163 164 165 166 167 168 169 | VDBEHDR = \ $(HDR) \ $(TOP)/src/vdbeInt.h # This is the default Makefile target. The objects listed here # are what get build when you type just "make" with no arguments. # | | | | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | VDBEHDR = \ $(HDR) \ $(TOP)/src/vdbeInt.h # 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@TARGET_EXEEXT@ # Generate the file "last_change" which contains the date of change # of the most recently modified source code file # last_change: $(SRC) cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ | awk '{print $$5,$$6}' >last_change libsqlite.la: $(LIBOBJ) $(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath $(exec_prefix)/lib \ -version-info "8:6:8" libtclsqlite.la: tclsqlite.lo libsqlite.la $(LIBTOOL) $(TCC) -o libtclsqlite.la tclsqlite.lo \ libsqlite.la $(LIBTCL) -rpath $(exec_prefix)/lib \ -version-info "8:6:8" 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 # This target creates a directory named "tsrc" and fills it with # copies of all of the C source code and header files needed to # build on the target system. Some of the C source code and header # files are automatically generated. This target takes care of # all that automatic generation. # target_source: $(SRC) $(VDBEHDR) rm -rf tsrc mkdir tsrc cp $(SRC) $(VDBEHDR) tsrc rm tsrc/sqlite.h.in tsrc/parse.y cp parse.c opcodes.c tsrc # Rules to build the LEMON compiler generator # lemon@BUILD_EXEEXT@: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c $(BCC) -o lemon $(TOP)/tool/lemon.c cp $(TOP)/tool/lempar.c . btree.lo: $(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h $(LIBTOOL) $(TCC) -c $(TOP)/src/btree.c btree_rb.lo: $(TOP)/src/btree_rb.c $(HDR) |
︙ | ︙ | |||
243 244 245 246 247 248 249 | $(LIBTOOL) $(TCC) -c $(TOP)/src/os.c parse.lo: parse.c $(HDR) $(LIBTOOL) $(TCC) -c parse.c parse.h: parse.c | | | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 | $(LIBTOOL) $(TCC) -c $(TOP)/src/os.c parse.lo: parse.c $(HDR) $(LIBTOOL) $(TCC) -c parse.c parse.h: parse.c parse.c: $(TOP)/src/parse.y lemon@BUILD_EXEEXT@ cp $(TOP)/src/parse.y . ./lemon parse.y # The config.h file will contain a single #define that tells us how # many bytes are in a pointer. This only works if a pointer is the # same size on the host as it is on the target. If you are cross-compiling # to a target with a different pointer size, you'll need to manually |
︙ | ︙ | |||
341 342 343 344 345 346 347 | auth.lo: $(TOP)/src/auth.c $(HDR) $(LIBTOOL) $(TCC) $(TCL_FLAGS) -c $(TOP)/src/auth.c tclsqlite: $(TOP)/src/tclsqlite.c libsqlite.la $(LIBTOOL) $(TCC) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \ $(TOP)/src/tclsqlite.c libsqlite.la $(LIBTCL) | | | | | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | auth.lo: $(TOP)/src/auth.c $(HDR) $(LIBTOOL) $(TCC) $(TCL_FLAGS) -c $(TOP)/src/auth.c tclsqlite: $(TOP)/src/tclsqlite.c libsqlite.la $(LIBTOOL) $(TCC) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \ $(TOP)/src/tclsqlite.c libsqlite.la $(LIBTCL) 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@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@ ./testfixture $(TOP)/test/all.test test: testfixture@TARGET_EXEEXT@ sqlite@TARGET_EXEEXT@ ./testfixture $(TOP)/test/quick.test index.html: $(TOP)/www/index.tcl last_change tclsh $(TOP)/www/index.tcl `cat $(TOP)/VERSION` >index.html sqlite.html: $(TOP)/www/sqlite.tcl tclsh $(TOP)/www/sqlite.tcl >sqlite.html |
︙ | ︙ | |||
445 446 447 448 449 450 451 | fileformat.html \ nulls.html doc: $(DOC) mkdir -p doc mv $(DOC) doc | | | | | | > > > > > > > > > > > > > > > > | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 | fileformat.html \ nulls.html doc: $(DOC) mkdir -p doc mv $(DOC) doc 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@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@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* rm -rf .libs .deps rm -f lemon@BUILD_EXEEXT@ lempar.c parse.* sqlite*.tar.gz rm -f $(PUBLISH) rm -f *.da *.bb *.bbg gmon.out 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 |
Changes to configure.
︙ | ︙ | |||
1431 1432 1433 1434 1435 1436 1437 | # The following RCS revision string applies to configure.in | | | 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 | # The following RCS revision string applies to configure.in # $Revision: 1.19 $ ######### # Programs needed # # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" |
︙ | ︙ | |||
8352 8353 8354 8355 8356 8357 8358 | * ) CYGWIN=no;; esac fi if test "$CYGWIN" = "yes"; then BUILD_EXEEXT=.exe else | | | 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 | * ) CYGWIN=no;; esac fi if test "$CYGWIN" = "yes"; then BUILD_EXEEXT=.exe else BUILD_EXEEXT=$EXEEXT fi if test "$cross" = "0"; then TARGET_EXEEXT=$BUILD_EXEEXT else TARGET_EXEEXT=$config_TARGET_EXEEXT fi if test "$TARGET_EXEEXT" = ".exe"; then |
︙ | ︙ | |||
8592 8593 8594 8595 8596 8597 8598 | else echo "$as_me: failed program was:" >&5 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 | | | 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 | else echo "$as_me: failed program was:" >&5 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 tcl84 tcl83 tcl; do LIBS="-l$ac_lib $otherlibs $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF |
︙ | ︙ | |||
9182 9183 9184 9185 9186 9187 9188 | if test $ac_cv_header_readline_h = yes; then found=yes fi fi if test "$found" = "no"; then | | | 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 | if test $ac_cv_header_readline_h = yes; then found=yes fi fi if test "$found" = "no"; then 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 if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && |
︙ | ︙ |
Changes to configure.ac.
︙ | ︙ | |||
134 135 136 137 138 139 140 | # the corresponding code. # 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 | | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | # the corresponding code. # 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.7 $ ######### # Programs needed # AC_PROG_LIBTOOL AC_PROG_INSTALL |
︙ | ︙ | |||
380 381 382 383 384 385 386 | fi if test "$CYGWIN" != "yes"; then AC_CYGWIN fi if test "$CYGWIN" = "yes"; then BUILD_EXEEXT=.exe else | | | 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | fi if test "$CYGWIN" != "yes"; then AC_CYGWIN fi if test "$CYGWIN" = "yes"; then BUILD_EXEEXT=.exe else BUILD_EXEEXT=$EXEEXT fi if test "$cross" = "0"; then TARGET_EXEEXT=$BUILD_EXEEXT else TARGET_EXEEXT=$config_TARGET_EXEEXT fi if test "$TARGET_EXEEXT" = ".exe"; then |
︙ | ︙ | |||
431 432 433 434 435 436 437 | AC_CHECK_LIB(dl, dlopen) otherlibs=$LIBS if test "$extra" != ""; then LIBS=$extra else LIBS="" AC_SEARCH_LIBS(Tcl_Init, dnl | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | AC_CHECK_LIB(dl, dlopen) otherlibs=$LIBS if test "$extra" != ""; then LIBS=$extra else LIBS="" AC_SEARCH_LIBS(Tcl_Init, dnl tcl8.4 tcl8.3 tcl84 tcl83 tcl,,,$otherlibs) fi TARGET_TCL_LIBS="$LIBS $otherlibs" fi AC_SUBST(TARGET_TCL_LIBS) ########## # Figure out where to get the TCL header files. |
︙ | ︙ | |||
505 506 507 508 509 510 511 | if test "$found" = "yes"; then AC_MSG_RESULT($TARGET_READLINE_INC) else AC_MSG_RESULT(not specified: still searching...) AC_CHECK_HEADER(readline.h, [found=yes]) fi if test "$found" = "no"; then | | | 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 | if test "$found" = "yes"; then AC_MSG_RESULT($TARGET_READLINE_INC) else AC_MSG_RESULT(not specified: still searching...) AC_CHECK_HEADER(readline.h, [found=yes]) fi if test "$found" = "no"; then 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" break fi AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) if test "$found" = "yes"; then |
︙ | ︙ |