cvs: /php4/ext/db Makefile.in /php4/ext/dba Makefile.in /php4/ext/dbase Makefile.in /php4/ext/domxml Makefile.in /php4/ext/fdf Makefile.in
/php4/ext/filepro Makefile.in /php4/ext/ftp Makefile.in /php4/ext/gd Makefile.in /php4/ext/gettext Makefile.in /php4/ext/hyperwave Makefile.in
/php4/ext/icap Makefile.in /php4/ext/imap Makefile.in /php4/ext/informix Makefile.in /php4/ext/interbase Makefile.in /php4/ext/java Makefile.in
/php4/ext/ldap Makefile.in /php4/ext/mcal Makefile.in /php4/ext/mcrypt Makefile.in /php4/ext/mhash Makefile.in /php4/ext/msql Makefile.in
/php4/ext/mysql Makefile.in /php4/ext/mysql/libmysql Makefile.in /php4/ext/oci8 Makefile.in /php4/ext/odbc Makefile.in /php4/ext/oracle Makefile.in
/php4/ext/pcre Makefile.in /php4/ext/pcre/pcrelib Makefile.in /php4/ext/pdf Makefile.in /php4/ext/pgsql Makefile.in /php4/ext/posix Makefile.in
/php4/ext/readline Makefile.in /php4/ext/recode Makefile.in /php4/ext/session Makefile.in /php4/ext/snmp Makefile.in /php4/ext/standard Makefile.in
/php4/ext/sybase Makefile.in /php4/ext/sybase_ct Makefile.in /php4/ext/sysvsem Makefile.in /php4/ext/sysvshm Makefile.in /php4/ext/wddx Makefile.in
/php4/ext/xml Makefile.in /php4/ext/xml/expat Makefile.in /php4/ext/xml/expat/xmlparse Makefile.in /php4/ext/xml/expat/xmltok Makefile.in /php4/ext/yp
Makefile.in /php4/ext/zlib Makefile.in /php4/pear Makefile.in /php4/regex Makefile.in /php4/sapi Makefile.in /php4/sapi/aolserver Makefile.in
/php4/sapi/apache Makefile.in /php4/sapi/cgi Makefile.in /php4/sapi/isapi Makefile.in /php4/sapi/phttpd Makefile.in /php4/sapi/roxen Makefile.in
/php4/sapi/servlet Makefile.in /php4/sapi/thttpd Makefile.in

sas Sat Apr 29 20:20:09 2000 EDT Modified files: /php4/ext/db Makefile.in /php4/ext/dba Makefile.in /php4/ext/dbase Makefile.in /php4/ext/domxml Makefile.in /php4/ext/fdf Makefile.in /php4/ext/filepro Makefile.in /php4/ext/ftp Makefile.in /php4/ext/gd Makefile.in /php4/ext/gettext Makefile.in /php4/ext/hyperwave Makefile.in /php4/ext/icap Makefile.in /php4/ext/imap Makefile.in /php4/ext/informix Makefile.in /php4/ext/interbase Makefile.in /php4/ext/java Makefile.in /php4/ext/ldap Makefile.in /php4/ext/mcal Makefile.in /php4/ext/mcrypt Makefile.in /php4/ext/mhash Makefile.in /php4/ext/msql Makefile.in /php4/ext/mysql Makefile.in /php4/ext/mysql/libmysql Makefile.in /php4/ext/oci8 Makefile.in /php4/ext/odbc Makefile.in /php4/ext/oracle Makefile.in /php4/ext/pcre Makefile.in /php4/ext/pcre/pcrelib Makefile.in /php4/ext/pdf Makefile.in /php4/ext/pgsql Makefile.in /php4/ext/posix Makefile.in /php4/ext/readline Makefile.in /php4/ext/recode Makefile.in /php4/ext/session Makefile.in /php4/ext/snmp Makefile.in /php4/ext/standard Makefile.in /php4/ext/sybase Makefile.in /php4/ext/sybase_ct Makefile.in /php4/ext/sysvsem Makefile.in /php4/ext/sysvshm Makefile.in /php4/ext/wddx Makefile.in /php4/ext/xml Makefile.in /php4/ext/xml/expat Makefile.in /php4/ext/xml/expat/xmlparse Makefile.in /php4/ext/xml/expat/xmltok Makefile.in /php4/ext/yp Makefile.in /php4/ext/zlib Makefile.in /php4/pear Makefile.in /php4/regex Makefile.in /php4/sapi Makefile.in /php4/sapi/aolserver Makefile.in /php4/sapi/apache Makefile.in /php4/sapi/cgi Makefile.in /php4/sapi/isapi Makefile.in /php4/sapi/phttpd Makefile.in /php4/sapi/roxen Makefile.in /php4/sapi/servlet Makefile.in /php4/sapi/thttpd Makefile.in Log: Overall UNIX build system improvements: * Makefile header is now completely dynamic * Absolute paths in (top_)?(src|build)dir and VPATH (fixes Tru64 support) * VPATH does not contain variables anymore (fixes UnixWare support) Index: php4/ext/db/Makefile.in diff -u php4/ext/db/Makefile.in:1.1 php4/ext/db/Makefile.in:1.2 --- php4/ext/db/Makefile.in:1.1 Wed Dec 29 18:58:44 1999 +++ php4/ext/db/Makefile.in Sat Apr 29 20:19:49 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libdb.la LTLIBRARY_SOURCES = db.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/dba/Makefile.in diff -u php4/ext/dba/Makefile.in:1.1 php4/ext/dba/Makefile.in:1.2 --- php4/ext/dba/Makefile.in:1.1 Wed Dec 29 18:58:45 1999 +++ php4/ext/dba/Makefile.in Sat Apr 29 20:19:49 2000 @@ -1,11 +1,6 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libdba.la LTLIBRARY_SOURCES = dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \ dba_ndbm.c dba_db3.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/dbase/Makefile.in diff -u php4/ext/dbase/Makefile.in:1.1 php4/ext/dbase/Makefile.in:1.2 --- php4/ext/dbase/Makefile.in:1.1 Wed Dec 29 18:58:46 1999 +++ php4/ext/dbase/Makefile.in Sat Apr 29 20:19:49 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libdbase.la LTLIBRARY_SOURCES = dbf_head.c dbf_rec.c dbf_misc.c dbf_ndx.c dbase.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/domxml/Makefile.in diff -u php4/ext/domxml/Makefile.in:1.1 php4/ext/domxml/Makefile.in:1.2 --- php4/ext/domxml/Makefile.in:1.1 Wed Dec 29 18:58:48 1999 +++ php4/ext/domxml/Makefile.in Sat Apr 29 20:19:49 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libdomxml.la LTLIBRARY_SOURCES = domxml.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/fdf/Makefile.in diff -u php4/ext/fdf/Makefile.in:1.1 php4/ext/fdf/Makefile.in:1.2 --- php4/ext/fdf/Makefile.in:1.1 Wed Dec 29 18:58:49 1999 +++ php4/ext/fdf/Makefile.in Sat Apr 29 20:19:50 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libfdf.la LTLIBRARY_SOURCES = fdf.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/filepro/Makefile.in diff -u php4/ext/filepro/Makefile.in:1.1 php4/ext/filepro/Makefile.in:1.2 --- php4/ext/filepro/Makefile.in:1.1 Wed Dec 29 18:58:50 1999 +++ php4/ext/filepro/Makefile.in Sat Apr 29 20:19:50 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libfilepro.la LTLIBRARY_SOURCES = filepro.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/ftp/Makefile.in diff -u php4/ext/ftp/Makefile.in:1.1 php4/ext/ftp/Makefile.in:1.2 --- php4/ext/ftp/Makefile.in:1.1 Wed Dec 29 18:58:51 1999 +++ php4/ext/ftp/Makefile.in Sat Apr 29 20:19:51 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libftp.la LTLIBRARY_SOURCES = php_ftp.c ftp.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/gd/Makefile.in diff -u php4/ext/gd/Makefile.in:1.2 php4/ext/gd/Makefile.in:1.3 --- php4/ext/gd/Makefile.in:1.2 Thu Feb 24 22:43:51 2000 +++ php4/ext/gd/Makefile.in Sat Apr 29 20:19:51 2000 @@ -1,13 +1,8 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libgd.la LTLIBRARY_SOURCES = gd.c gdcache.c gdttf.c gdt1.c LTLIBRARY_SHARED_NAME = gd.la LTLIBRARY_SHARED_LIBADD = $(GD_LFLAGS) $(GD_LIBS) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/gettext/Makefile.in diff -u php4/ext/gettext/Makefile.in:1.1 php4/ext/gettext/Makefile.in:1.2 --- php4/ext/gettext/Makefile.in:1.1 Wed Dec 29 18:58:54 1999 +++ php4/ext/gettext/Makefile.in Sat Apr 29 20:19:52 2000 @@ -1,11 +1,5 @@ - -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libgettext.la LTLIBRARY_SOURCES = gettext.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/hyperwave/Makefile.in diff -u php4/ext/hyperwave/Makefile.in:1.1 php4/ext/hyperwave/Makefile.in:1.2 --- php4/ext/hyperwave/Makefile.in:1.1 Wed Dec 29 18:58:55 1999 +++ php4/ext/hyperwave/Makefile.in Sat Apr 29 20:19:52 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libhyperwave.la LTLIBRARY_SOURCES = hw.c hg_comm.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/icap/Makefile.in diff -u php4/ext/icap/Makefile.in:1.4 php4/ext/icap/Makefile.in:1.5 --- php4/ext/icap/Makefile.in:1.4 Wed Dec 29 18:58:56 1999 +++ php4/ext/icap/Makefile.in Sat Apr 29 20:19:53 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libicap.la LTLIBRARY_SOURCES = php_icap.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/imap/Makefile.in diff -u php4/ext/imap/Makefile.in:1.6 php4/ext/imap/Makefile.in:1.7 --- php4/ext/imap/Makefile.in:1.6 Sat Apr 1 08:49:39 2000 +++ php4/ext/imap/Makefile.in Sat Apr 29 20:19:53 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libimap.la LTLIBRARY_SOURCES = php_imap.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/informix/Makefile.in diff -u php4/ext/informix/Makefile.in:1.1 php4/ext/informix/Makefile.in:1.2 --- php4/ext/informix/Makefile.in:1.1 Wed Dec 29 18:58:58 1999 +++ php4/ext/informix/Makefile.in Sat Apr 29 20:19:54 2000 @@ -1,16 +1,10 @@ -# $Id: Makefile.in,v 1.1 1999/12/30 02:58:58 sas Exp $ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libinformix.la LTLIBRARY_SOURCES = ifx.c LTLIBRARY_LIBADD = $(IFX_LIBS) CLEANFILES = ifx.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk ifx.c: $(srcdir)/ifx.ec (if test -d $(INFORMIXDIR); then \ Index: php4/ext/interbase/Makefile.in diff -u php4/ext/interbase/Makefile.in:1.1 php4/ext/interbase/Makefile.in:1.2 --- php4/ext/interbase/Makefile.in:1.1 Wed Dec 29 18:58:59 1999 +++ php4/ext/interbase/Makefile.in Sat Apr 29 20:19:54 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libinterbase.la LTLIBRARY_SOURCES = interbase.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/java/Makefile.in diff -u php4/ext/java/Makefile.in:1.7 php4/ext/java/Makefile.in:1.8 --- php4/ext/java/Makefile.in:1.7 Mon Apr 3 08:29:38 2000 +++ php4/ext/java/Makefile.in Sat Apr 29 20:19:54 2000 @@ -1,9 +1,4 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_SHARED_NAME = libphp_java.la LTLIBRARY_SOURCES = java.c LTLIBRARY_DEPENDENCIES = php_java.jar @@ -16,7 +11,7 @@ make_shared = yes -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk php_java.jar : reflect.java @test -d net || mkdir net Index: php4/ext/ldap/Makefile.in diff -u php4/ext/ldap/Makefile.in:1.1 php4/ext/ldap/Makefile.in:1.2 --- php4/ext/ldap/Makefile.in:1.1 Wed Dec 29 18:59:01 1999 +++ php4/ext/ldap/Makefile.in Sat Apr 29 20:19:55 2000 @@ -1,11 +1,5 @@ - -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libldap.la LTLIBRARY_SOURCES = ldap.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/mcal/Makefile.in diff -u php4/ext/mcal/Makefile.in:1.3 php4/ext/mcal/Makefile.in:1.4 --- php4/ext/mcal/Makefile.in:1.3 Wed Dec 29 18:59:02 1999 +++ php4/ext/mcal/Makefile.in Sat Apr 29 20:19:55 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libmcal.la LTLIBRARY_SOURCES = php_mcal.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/mcrypt/Makefile.in diff -u php4/ext/mcrypt/Makefile.in:1.1 php4/ext/mcrypt/Makefile.in:1.2 --- php4/ext/mcrypt/Makefile.in:1.1 Wed Dec 29 18:59:04 1999 +++ php4/ext/mcrypt/Makefile.in Sat Apr 29 20:19:55 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libmcrypt.la LTLIBRARY_SOURCES = mcrypt.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/mhash/Makefile.in diff -u php4/ext/mhash/Makefile.in:1.1 php4/ext/mhash/Makefile.in:1.2 --- php4/ext/mhash/Makefile.in:1.1 Wed Dec 29 18:59:05 1999 +++ php4/ext/mhash/Makefile.in Sat Apr 29 20:19:55 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libmhash.la LTLIBRARY_SOURCES = mhash.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/msql/Makefile.in diff -u php4/ext/msql/Makefile.in:1.1 php4/ext/msql/Makefile.in:1.2 --- php4/ext/msql/Makefile.in:1.1 Wed Dec 29 18:59:06 1999 +++ php4/ext/msql/Makefile.in Sat Apr 29 20:19:56 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libmsql.la LTLIBRARY_SOURCES = php_msql.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/mysql/Makefile.in diff -u php4/ext/mysql/Makefile.in:1.3 php4/ext/mysql/Makefile.in:1.4 --- php4/ext/mysql/Makefile.in:1.3 Sun Mar 26 11:46:11 2000 +++ php4/ext/mysql/Makefile.in Sat Apr 29 20:19:56 2000 @@ -1,9 +1,4 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libmysql.la LTLIBRARY_SOURCES = php_mysql.c LTLIBRARY_LIBADD = $(MYSQL_LIBADD) @@ -12,4 +7,4 @@ SUBDIRS = $(MYSQL_SUBDIRS) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/mysql/libmysql/Makefile.in diff -u php4/ext/mysql/libmysql/Makefile.in:1.2 php4/ext/mysql/libmysql/Makefile.in:1.3 --- php4/ext/mysql/libmysql/Makefile.in:1.2 Mon Mar 6 14:38:49 2000 +++ php4/ext/mysql/libmysql/Makefile.in Sat Apr 29 20:19:57 2000 @@ -1,7 +1,3 @@ -DEPTH = ../../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ LTLIBRARY_NAME = libmysql_client.la LTLIBRARY_SOURCES = libmysql.c errmsg.c net.c violite.c password.c \ @@ -17,4 +13,4 @@ strcont.c strcend.c bchange.c bmove.c bmove_upp.c \ longlong2str.c strtoull.c strtoll.c ctype-latin1.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/oci8/Makefile.in diff -u php4/ext/oci8/Makefile.in:1.2 php4/ext/oci8/Makefile.in:1.3 --- php4/ext/oci8/Makefile.in:1.2 Thu Apr 27 07:29:11 2000 +++ php4/ext/oci8/Makefile.in Sat Apr 29 20:19:58 2000 @@ -1,12 +1,7 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = liboci8.la LTLIBRARY_SOURCES = oci8.c LTLIBRARY_SHARED_NAME = oci8.la LTLIBRARY_SHARED_LIBADD = $(OCI8_LFLAGS) $(OCI8_LIBS) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/odbc/Makefile.in diff -u php4/ext/odbc/Makefile.in:1.1 php4/ext/odbc/Makefile.in:1.2 --- php4/ext/odbc/Makefile.in:1.1 Wed Dec 29 18:59:10 1999 +++ php4/ext/odbc/Makefile.in Sat Apr 29 20:19:58 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libodbc.la LTLIBRARY_SOURCES = php_odbc.c velocis.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/oracle/Makefile.in diff -u php4/ext/oracle/Makefile.in:1.1 php4/ext/oracle/Makefile.in:1.2 --- php4/ext/oracle/Makefile.in:1.1 Wed Dec 29 18:59:11 1999 +++ php4/ext/oracle/Makefile.in Sat Apr 29 20:19:58 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = liboracle.la LTLIBRARY_SOURCES = oracle.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/pcre/Makefile.in diff -u php4/ext/pcre/Makefile.in:1.1 php4/ext/pcre/Makefile.in:1.2 --- php4/ext/pcre/Makefile.in:1.1 Wed Dec 29 18:59:11 1999 +++ php4/ext/pcre/Makefile.in Sat Apr 29 20:19:58 2000 @@ -1,13 +1,8 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libpcre.la LTLIBRARY_SOURCES = php_pcre.c LTLIBRARY_LIBADD = $(PCRE_LIBADD) SUBDIRS = $(PCRE_SUBDIRS) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/pcre/pcrelib/Makefile.in diff -u php4/ext/pcre/pcrelib/Makefile.in:1.3 php4/ext/pcre/pcrelib/Makefile.in:1.4 --- php4/ext/pcre/pcrelib/Makefile.in:1.3 Tue Apr 11 11:40:47 2000 +++ php4/ext/pcre/pcrelib/Makefile.in Sat Apr 29 20:19:59 2000 @@ -1,11 +1,6 @@ -DEPTH = ../../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libpcre.la LTLIBRARY_SOURCES = maketables.c get.c study.c pcre.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/pdf/Makefile.in diff -u php4/ext/pdf/Makefile.in:1.1 php4/ext/pdf/Makefile.in:1.2 --- php4/ext/pdf/Makefile.in:1.1 Wed Dec 29 18:59:14 1999 +++ php4/ext/pdf/Makefile.in Sat Apr 29 20:19:59 2000 @@ -1,11 +1,5 @@ -# $Id: Makefile.in,v 1.1 1999/12/30 02:59:14 sas Exp $ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libpdf.la LTLIBRARY_SOURCES = pdf.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/pgsql/Makefile.in diff -u php4/ext/pgsql/Makefile.in:1.1 php4/ext/pgsql/Makefile.in:1.2 --- php4/ext/pgsql/Makefile.in:1.1 Wed Dec 29 18:59:16 1999 +++ php4/ext/pgsql/Makefile.in Sat Apr 29 20:19:59 2000 @@ -1,9 +1,4 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libpgsql.la LTLIBRARY_SOURCES = pgsql.c LTLIBRARY_SHARED_NAME = pgsql.la @@ -11,4 +6,4 @@ EXTRA_INCLUDES = $(PGSQL_INCLUDE) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/posix/Makefile.in diff -u php4/ext/posix/Makefile.in:1.1 php4/ext/posix/Makefile.in:1.2 --- php4/ext/posix/Makefile.in:1.1 Wed Dec 29 18:59:17 1999 +++ php4/ext/posix/Makefile.in Sat Apr 29 20:19:59 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libposix.la LTLIBRARY_SOURCES = posix.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/readline/Makefile.in diff -u php4/ext/readline/Makefile.in:1.1 php4/ext/readline/Makefile.in:1.2 --- php4/ext/readline/Makefile.in:1.1 Wed Dec 29 18:59:18 1999 +++ php4/ext/readline/Makefile.in Sat Apr 29 20:19:59 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libreadline.la LTLIBRARY_SOURCES = readline.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/recode/Makefile.in diff -u php4/ext/recode/Makefile.in:1.1 php4/ext/recode/Makefile.in:1.2 --- php4/ext/recode/Makefile.in:1.1 Sat Mar 11 14:05:40 2000 +++ php4/ext/recode/Makefile.in Sat Apr 29 20:20:00 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = librecode.la LTLIBRARY_SOURCES = recode.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/session/Makefile.in diff -u php4/ext/session/Makefile.in:1.1 php4/ext/session/Makefile.in:1.2 --- php4/ext/session/Makefile.in:1.1 Wed Dec 29 18:59:20 1999 +++ php4/ext/session/Makefile.in Sat Apr 29 20:20:00 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsession.la LTLIBRARY_SOURCES = session.c mod_files.c mod_mm.c mod_user.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/snmp/Makefile.in diff -u php4/ext/snmp/Makefile.in:1.5 php4/ext/snmp/Makefile.in:1.6 --- php4/ext/snmp/Makefile.in:1.5 Mon Jan 3 18:58:43 2000 +++ php4/ext/snmp/Makefile.in Sat Apr 29 20:20:00 2000 @@ -1,13 +1,8 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsnmp.la LTLIBRARY_SOURCES = snmp.c LTLIBRARY_SHARED_LIBADD = $(SNMP_LIBDIR) -lsnmp $(KSTAT_LIBS) EXTRA_INCLUDES = $(SNMP_INCLUDE) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/standard/Makefile.in diff -u php4/ext/standard/Makefile.in:1.4 php4/ext/standard/Makefile.in:1.5 --- php4/ext/standard/Makefile.in:1.4 Wed Apr 12 12:39:02 2000 +++ php4/ext/standard/Makefile.in Sat Apr 29 20:20:01 2000 @@ -1,9 +1,4 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libstandard.la LTLIBRARY_SOURCES=\ array.c base64.c basic_functions.c browscap.c crypt.c cyr_convert.c datetime.c \ @@ -14,7 +9,7 @@ syslog.c type.c uniqid.c url.c url_scanner.c var.c output.c assert.c \ strnatcmp.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk parsedate.c: $(srcdir)/parsedate.y Index: php4/ext/sybase/Makefile.in diff -u php4/ext/sybase/Makefile.in:1.4 php4/ext/sybase/Makefile.in:1.5 --- php4/ext/sybase/Makefile.in:1.4 Wed Dec 29 18:59:23 1999 +++ php4/ext/sybase/Makefile.in Sat Apr 29 20:20:01 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsybase.la LTLIBRARY_SOURCES = sybase.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/sybase_ct/Makefile.in diff -u php4/ext/sybase_ct/Makefile.in:1.1 php4/ext/sybase_ct/Makefile.in:1.2 --- php4/ext/sybase_ct/Makefile.in:1.1 Wed Dec 29 18:59:25 1999 +++ php4/ext/sybase_ct/Makefile.in Sat Apr 29 20:20:01 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsybase_ct.la LTLIBRARY_SOURCES = php_sybase_ct.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/sysvsem/Makefile.in diff -u php4/ext/sysvsem/Makefile.in:1.4 php4/ext/sysvsem/Makefile.in:1.5 --- php4/ext/sysvsem/Makefile.in:1.4 Wed Dec 29 18:59:26 1999 +++ php4/ext/sysvsem/Makefile.in Sat Apr 29 20:20:02 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsysvsem.la LTLIBRARY_SOURCES = sysvsem.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/sysvshm/Makefile.in diff -u php4/ext/sysvshm/Makefile.in:1.4 php4/ext/sysvshm/Makefile.in:1.5 --- php4/ext/sysvshm/Makefile.in:1.4 Wed Dec 29 18:59:27 1999 +++ php4/ext/sysvshm/Makefile.in Sat Apr 29 20:20:02 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsysvshm.la LTLIBRARY_SOURCES = sysvshm.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/wddx/Makefile.in diff -u php4/ext/wddx/Makefile.in:1.1 php4/ext/wddx/Makefile.in:1.2 --- php4/ext/wddx/Makefile.in:1.1 Wed Dec 29 18:59:28 1999 +++ php4/ext/wddx/Makefile.in Sat Apr 29 20:20:03 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libwddx.la LTLIBRARY_SOURCES = wddx.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/xml/Makefile.in diff -u php4/ext/xml/Makefile.in:1.5 php4/ext/xml/Makefile.in:1.6 --- php4/ext/xml/Makefile.in:1.5 Sat Feb 12 06:28:49 2000 +++ php4/ext/xml/Makefile.in Sat Apr 29 20:20:03 2000 @@ -1,9 +1,4 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libxml.la LTLIBRARY_SOURCES = xml.c LTLIBRARY_LIBADD = expat/libexpat.la @@ -12,4 +7,4 @@ SUBDIRS = expat -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/xml/expat/Makefile.in diff -u php4/ext/xml/expat/Makefile.in:1.1 php4/ext/xml/expat/Makefile.in:1.2 --- php4/ext/xml/expat/Makefile.in:1.1 Sat Feb 12 06:28:49 2000 +++ php4/ext/xml/expat/Makefile.in Sat Apr 29 20:20:03 2000 @@ -1,13 +1,8 @@ -DEPTH = ../../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libexpat.la LTLIBRARY_DEPENDENCIES = xmltok/libexpat_tok.la xmlparse/libexpat_parse.la LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) SUBDIRS = xmltok xmlparse -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/xml/expat/xmlparse/Makefile.in diff -u php4/ext/xml/expat/xmlparse/Makefile.in:1.1 php4/ext/xml/expat/xmlparse/Makefile.in:1.2 --- php4/ext/xml/expat/xmlparse/Makefile.in:1.1 Sat Feb 12 06:28:49 2000 +++ php4/ext/xml/expat/xmlparse/Makefile.in Sat Apr 29 20:20:04 2000 @@ -1,12 +1,7 @@ -DEPTH = ../../../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libexpat_parse.la LTLIBRARY_SOURCES = xmlparse.c hashtable.c EXTRA_INCLUDES = -I$(srcdir)/../xmltok -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/xml/expat/xmltok/Makefile.in diff -u php4/ext/xml/expat/xmltok/Makefile.in:1.1 php4/ext/xml/expat/xmltok/Makefile.in:1.2 --- php4/ext/xml/expat/xmltok/Makefile.in:1.1 Sat Feb 12 06:28:49 2000 +++ php4/ext/xml/expat/xmltok/Makefile.in Sat Apr 29 20:20:04 2000 @@ -1,10 +1,5 @@ -DEPTH = ../../../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libexpat_tok.la LTLIBRARY_SOURCES = xmltok.c xmlrole.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/yp/Makefile.in diff -u php4/ext/yp/Makefile.in:1.1 php4/ext/yp/Makefile.in:1.2 --- php4/ext/yp/Makefile.in:1.1 Wed Dec 29 18:59:31 1999 +++ php4/ext/yp/Makefile.in Sat Apr 29 20:20:04 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libyp.la LTLIBRARY_SOURCES = yp.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/ext/zlib/Makefile.in diff -u php4/ext/zlib/Makefile.in:1.4 php4/ext/zlib/Makefile.in:1.5 --- php4/ext/zlib/Makefile.in:1.4 Wed Dec 29 18:59:32 1999 +++ php4/ext/zlib/Makefile.in Sat Apr 29 20:20:04 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libzlib.la LTLIBRARY_SOURCES = zlib.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/pear/Makefile.in diff -u php4/pear/Makefile.in:1.12 php4/pear/Makefile.in:1.13 --- php4/pear/Makefile.in:1.12 Sun Apr 23 12:19:56 2000 +++ php4/pear/Makefile.in Sat Apr 29 20:20:05 2000 @@ -1,12 +1,7 @@ -DEPTH = .. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - install_targets = install-data-local install-headers install-build -include $(topsrcdir)/build/rules.mk +include $(top_srcdir)/build/rules.mk peardir=$(prefix)/lib/php pear_DBdir=$(prefix)/lib/php/DB @@ -40,7 +35,7 @@ install-build: -@$(mkinstalldirs) $(builddir) $(bindir) && \ - (cd $(topsrcdir) && cp $(BUILD_FILES) $(builddir)) && \ + (cd $(top_srcdir) && cp $(BUILD_FILES) $(builddir)) && \ echo "creating phpize" && \ sed \ -e 's#@PREFIX@#$(prefix)#' \ @@ -88,9 +83,9 @@ done; \ $(mkinstalldirs) $$paths && \ echo "creating header file hierarchy" && \ - (cd $(topsrcdir) && cp $(SRC_HEADERS) $(phpincludedir)) && \ - (cd $(topsrcdir)/ext/standard && cp *.h $(phpincludedir)/ext/standard) && \ - (cd $(topsrcdir) && cp regex/regex.h regex/regex_extra.h $(phpincludedir)/regex) && \ - (cd $(topsrcdir) && cp TSRM/TSRM.h $(phpincludedir)/TSRM) && \ - (cd $(topsrcdir)/Zend && cp *.h $(phpincludedir)/Zend) && \ - (cd $(DEPTH) && cp $(BUILD_HEADERS) $(phpincludedir)) + (cd $(top_srcdir) && cp $(SRC_HEADERS) $(phpincludedir)) && \ + (cd $(top_srcdir)/ext/standard && cp *.h $(phpincludedir)/ext/standard) && \ + (cd $(top_srcdir) && cp regex/regex.h regex/regex_extra.h $(phpincludedir)/regex) && \ + (cd $(top_srcdir) && cp TSRM/TSRM.h $(phpincludedir)/TSRM) && \ + (cd $(top_srcdir)/Zend && cp *.h $(phpincludedir)/Zend) && \ + (cd $(top_builddir) && cp $(BUILD_HEADERS) $(phpincludedir)) Index: php4/regex/Makefile.in diff -u php4/regex/Makefile.in:1.6 php4/regex/Makefile.in:1.7 --- php4/regex/Makefile.in:1.6 Wed Dec 29 18:59:34 1999 +++ php4/regex/Makefile.in Sat Apr 29 20:20:05 2000 @@ -1,10 +1,5 @@ -DEPTH = .. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libregex.la LTLIBRARY_SOURCES = regcomp.c regexec.c regerror.c regfree.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/sapi/Makefile.in diff -u php4/sapi/Makefile.in:1.1 php4/sapi/Makefile.in:1.2 --- php4/sapi/Makefile.in:1.1 Wed Dec 29 18:59:35 1999 +++ php4/sapi/Makefile.in Sat Apr 29 20:20:05 2000 @@ -1,9 +1,4 @@ -DEPTH = .. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - SUBDIRS = $(PHP_SAPI) -include $(topsrcdir)/build/rules.mk +include $(top_srcdir)/build/rules.mk Index: php4/sapi/aolserver/Makefile.in diff -u php4/sapi/aolserver/Makefile.in:1.1 php4/sapi/aolserver/Makefile.in:1.2 --- php4/sapi/aolserver/Makefile.in:1.1 Wed Dec 29 18:59:36 1999 +++ php4/sapi/aolserver/Makefile.in Sat Apr 29 20:20:06 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = aolserver.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/sapi/apache/Makefile.in diff -u php4/sapi/apache/Makefile.in:1.3 php4/sapi/apache/Makefile.in:1.4 --- php4/sapi/apache/Makefile.in:1.3 Tue Feb 1 22:09:00 2000 +++ php4/sapi/apache/Makefile.in Sat Apr 29 20:20:06 2000 @@ -1,12 +1,7 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = sapi_apache.c mod_php4.c php_apache.c EXTRA_INCLUDES = $(APACHE_INCLUDE) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/sapi/cgi/Makefile.in diff -u php4/sapi/cgi/Makefile.in:1.2 php4/sapi/cgi/Makefile.in:1.3 --- php4/sapi/cgi/Makefile.in:1.2 Thu Feb 10 08:27:28 2000 +++ php4/sapi/cgi/Makefile.in Sat Apr 29 20:20:06 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = cgi_main.c getopt.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/sapi/isapi/Makefile.in diff -u php4/sapi/isapi/Makefile.in:1.1 php4/sapi/isapi/Makefile.in:1.2 --- php4/sapi/isapi/Makefile.in:1.1 Wed Dec 29 18:59:41 1999 +++ php4/sapi/isapi/Makefile.in Sat Apr 29 20:20:07 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = php4isapi.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/sapi/phttpd/Makefile.in diff -u php4/sapi/phttpd/Makefile.in:1.1 php4/sapi/phttpd/Makefile.in:1.2 --- php4/sapi/phttpd/Makefile.in:1.1 Wed Dec 29 18:59:45 1999 +++ php4/sapi/phttpd/Makefile.in Sat Apr 29 20:20:07 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = phttpd.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/sapi/roxen/Makefile.in diff -u php4/sapi/roxen/Makefile.in:1.1 php4/sapi/roxen/Makefile.in:1.2 --- php4/sapi/roxen/Makefile.in:1.1 Wed Dec 29 18:59:48 1999 +++ php4/sapi/roxen/Makefile.in Sat Apr 29 20:20:08 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = roxen.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk Index: php4/sapi/servlet/Makefile.in diff -u php4/sapi/servlet/Makefile.in:1.11 php4/sapi/servlet/Makefile.in:1.12 --- php4/sapi/servlet/Makefile.in:1.11 Mon Apr 3 08:29:39 2000 +++ php4/sapi/servlet/Makefile.in Sat Apr 29 20:20:09 2000 @@ -1,9 +1,4 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = servlet.c java.c LTLIBRARY_DEPENDENCIES = phpsrvlt.jar @@ -11,7 +6,7 @@ EXTRA_CFLAGS = $(JAVA_CFLAGS) EXTRA_INCLUDES = $(JAVA_INCLUDE) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk java.c : ../../ext/java/java.c @cp ../../ext/java/java.c . Index: php4/sapi/thttpd/Makefile.in diff -u php4/sapi/thttpd/Makefile.in:1.1 php4/sapi/thttpd/Makefile.in:1.2 --- php4/sapi/thttpd/Makefile.in:1.1 Wed Dec 29 18:59:52 1999 +++ php4/sapi/thttpd/Makefile.in Sat Apr 29 20:20:09 2000 @@ -1,10 +1,5 @@ -DEPTH = ../.. -topsrcdir = @topsrcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - LTLIBRARY_NAME = libsapi.la LTLIBRARY_SOURCES = thttpd.c -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk