[PHP-CVS] cvs: php-src /ext/sqlite Makefile.frag config.m4
hholzgraMon May 30 10:15:40 2005 EDT Modified files: /php-src/ext/sqlite Makefile.frag config.m4 Log: gracefully handle changes of the parse.y lemon file, process it with lemon if available, else just keep the .c file from CVS not doing so leads to make using its implicit .y-.c rule here and bison doesn't really understand lemon syntax http://cvs.php.net/diff.php/php-src/ext/sqlite/Makefile.frag?r1=1.10r2=1.11ty=u Index: php-src/ext/sqlite/Makefile.frag diff -u /dev/null php-src/ext/sqlite/Makefile.frag:1.11 --- /dev/null Mon May 30 10:15:40 2005 +++ php-src/ext/sqlite/Makefile.fragMon May 30 10:15:40 2005 @@ -0,0 +1,2 @@ +$(srcdir)/libsqlite/src/parse.c: $(srcdir)/libsqlite/src/parse.y + $(LEMON) $(srcdir)/libsqlite/src/parse.y http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.36r2=1.37ty=u Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.36 php-src/ext/sqlite/config.m4:1.37 --- php-src/ext/sqlite/config.m4:1.36 Sun May 29 19:16:44 2005 +++ php-src/ext/sqlite/config.m4Mon May 30 10:15:40 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.36 2005/05/29 23:16:44 sniper Exp $ +dnl $Id: config.m4,v 1.37 2005/05/30 14:15:40 hholzgra Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 @@ -11,7 +11,42 @@ PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: ISO-8859-1), [ --enable-sqlite-utf8 SQLite: Enable UTF-8 support for SQLite], no, no) + + +dnl +dnl PHP_PROG_LEMON +dnl +dnl Search for lemon binary and check it's version +dnl +AC_DEFUN([PHP_PROG_LEMON],[ + # we only support certain lemon versions + lemon_version_list=1.0 + + AC_CHECK_PROG(LEMON, lemon, lemon) + if test $LEMON; then +AC_CACHE_CHECK([for lemon version], php_cv_lemon_version, [ + lemon_version=`$LEMON -x 2/dev/null | $SED -e 's/^.* //'` + php_cv_lemon_version=invalid + for lemon_check_version in $lemon_version_list; do +if test $lemon_version = $lemon_check_version; then + php_cv_lemon_version=$lemon_check_version (ok) +fi + done +]) + fi + case $php_cv_lemon_version in +|invalid[)] + lemon_msg=lemon versions supported for regeneration of the Zend/PHP parsers: $lemon_version_list (found $lemon_version). + AC_MSG_WARN([$lemon_msg]) + LEMON=exit 0; + ;; + esac + PHP_SUBST(LEMON) +]) + + if test $PHP_SQLITE != no; then + PHP_PROG_LEMON if test $PHP_PDO != no; then AC_MSG_CHECKING([for PDO includes]) if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then @@ -78,7 +113,7 @@ libsqlite/src/vacuum.c libsqlite/src/copy.c \ libsqlite/src/vdbeaux.c libsqlite/src/date.c \ libsqlite/src/where.c libsqlite/src/trigger.c - + PHP_ADD_EXTENSION_DEP(sqlite, spl) PHP_ADD_EXTENSION_DEP(sqlite, pdo) fi @@ -88,6 +123,7 @@ dnl sqlite_sources=sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS) + PHP_ADD_MAKEFILE_FRAGMENT PHP_SUBST(SQLITE_SHARED_LIBADD) PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite Makefile.frag
jon Wed Jan 21 03:51:29 2004 EDT Modified files: /php-src/ext/sqlite Makefile.frag Log: Adding dependencies on sqlite.h for the rest of the source files in the libsqlite distribution. http://cvs.php.net/diff.php/php-src/ext/sqlite/Makefile.frag?r1=1.8r2=1.9ty=u Index: php-src/ext/sqlite/Makefile.frag diff -u php-src/ext/sqlite/Makefile.frag:1.8 php-src/ext/sqlite/Makefile.frag:1.9 --- php-src/ext/sqlite/Makefile.frag:1.8Sat Jan 17 16:03:26 2004 +++ php-src/ext/sqlite/Makefile.fragWed Jan 21 03:51:28 2004 @@ -40,8 +40,12 @@ $(srcdir)/libsqlite/src/copy.c: $(srcdir)/libsqlite/src/sqlite.h +$(srcdir)/libsqlite/src/date.c: $(srcdir)/libsqlite/src/sqlite.h + $(srcdir)/libsqlite/src/delete.c: $(srcdir)/libsqlite/src/sqlite.h +$(srcdir)/libsqlite/src/encode.c: $(srcdir)/libsqlite/src/sqlite.h + $(srcdir)/libsqlite/src/expr.c: $(srcdir)/libsqlite/src/sqlite.h $(srcdir)/libsqlite/src/func.c: $(srcdir)/libsqlite/src/sqlite.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite Makefile.frag
jon Sat Jan 17 16:03:26 2004 EDT Modified files: /php-src/ext/sqlite Makefile.frag Log: Make the compilation of vdbeaux.c dependent on the generation of sqlite.h. An incremental 'make -j' build will now complete successfully. Index: php-src/ext/sqlite/Makefile.frag diff -u php-src/ext/sqlite/Makefile.frag:1.7 php-src/ext/sqlite/Makefile.frag:1.8 --- php-src/ext/sqlite/Makefile.frag:1.7Wed Aug 20 03:41:42 2003 +++ php-src/ext/sqlite/Makefile.fragSat Jan 17 16:03:26 2004 @@ -78,5 +78,7 @@ $(srcdir)/libsqlite/src/vdbe.c: $(srcdir)/libsqlite/src/sqlite.h +$(srcdir)/libsqlite/src/vdbeaux.c: $(srcdir)/libsqlite/src/sqlite.h + $(srcdir)/libsqlite/src/where.c: $(srcdir)/libsqlite/src/sqlite.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sqlite Makefile.frag
On Wed, Aug 20, 2003 at 07:41:42AM -, Jon Parise wrote: jon Wed Aug 20 03:41:42 2003 EDT Modified files: /php-src/ext/sqlite Makefile.frag Log: Explicitly declare the dependencies on the generated sqlite.h file. This allows the libsqlite source tree (and php-src, as a whole) to be built using 'make -j' once again. Someone with more make-fu than me probably knows a cleaner way to lay out these dependencies. If that someone is you, please do so. Index: php-src/ext/sqlite/Makefile.frag diff -u php-src/ext/sqlite/Makefile.frag:1.6 php-src/ext/sqlite/Makefile.frag:1.7 --- php-src/ext/sqlite/Makefile.frag:1.6 Sat Jun 7 11:15:27 2003 +++ php-src/ext/sqlite/Makefile.frag Wed Aug 20 03:41:42 2003 @@ -23,7 +23,60 @@ $(srcdir)/sqlite.c: $(srcdir)/libsqlite/src/sqlite.h +$(srcdir)/sess_sqlite.c: $(srcdir)/libsqlite/src/sqlite.h + $(srcdir)/libsqlite/src/parse.c: $(srcdir)/libsqlite/src/parse.y $(LEMON) $(srcdir)/libsqlite/src/parse.y +$(srcdir)/libsqlite/src/attach.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/auth.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/btree.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/btree_rb.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/build.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/copy.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/delete.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/expr.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/func.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/hash.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/insert.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/main.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/os.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/pager.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/pragma.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/printf.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/random.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/select.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/table.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/tokenize.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/trigger.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/update.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/util.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/vacuum.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/vdbe.c: $(srcdir)/libsqlite/src/sqlite.h + +$(srcdir)/libsqlite/src/where.c: $(srcdir)/libsqlite/src/sqlite.h -- Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
