diff options
| author | Sascha Schumann <sas@php.net> | 2000-04-30 03:20:09 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-04-30 03:20:09 +0000 |
| commit | 953fe189dacec1f3079f1c2c043b6644725b643e (patch) | |
| tree | 3fe55c2cf9084cb6d06a9fe01b096c5e8656d57d | |
| parent | 952f58b66d579cd6a171c4b25269f151e73cd3fa (diff) | |
| download | php-git-953fe189dacec1f3079f1c2c043b6644725b643e.tar.gz | |
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)
60 files changed, 67 insertions, 370 deletions
diff --git a/ext/db/Makefile.in b/ext/db/Makefile.in index a2856cdfc3..1e877d5c88 100644 --- a/ext/db/Makefile.in +++ b/ext/db/Makefile.in @@ -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 diff --git a/ext/dba/Makefile.in b/ext/dba/Makefile.in index 1e45ed519f..3fb80ee802 100644 --- a/ext/dba/Makefile.in +++ b/ext/dba/Makefile.in @@ -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 diff --git a/ext/dbase/Makefile.in b/ext/dbase/Makefile.in index b3b93f3ee8..fd67bf065c 100644 --- a/ext/dbase/Makefile.in +++ b/ext/dbase/Makefile.in @@ -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 diff --git a/ext/domxml/Makefile.in b/ext/domxml/Makefile.in index 76745b9644..5bb4f6ff41 100644 --- a/ext/domxml/Makefile.in +++ b/ext/domxml/Makefile.in @@ -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 diff --git a/ext/ereg/regex/Makefile.in b/ext/ereg/regex/Makefile.in index f3215ab42f..27b0331b9b 100644 --- a/ext/ereg/regex/Makefile.in +++ b/ext/ereg/regex/Makefile.in @@ -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 diff --git a/ext/fdf/Makefile.in b/ext/fdf/Makefile.in index 1f75e3b34e..db4edddee5 100644 --- a/ext/fdf/Makefile.in +++ b/ext/fdf/Makefile.in @@ -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 diff --git a/ext/filepro/Makefile.in b/ext/filepro/Makefile.in index 584c77f2d4..491dcccffd 100644 --- a/ext/filepro/Makefile.in +++ b/ext/filepro/Makefile.in @@ -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 diff --git a/ext/ftp/Makefile.in b/ext/ftp/Makefile.in index 84f6da8b63..44bedc78f9 100644 --- a/ext/ftp/Makefile.in +++ b/ext/ftp/Makefile.in @@ -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 diff --git a/ext/gd/Makefile.in b/ext/gd/Makefile.in index 3727f68b28..6cb0424b45 100644 --- a/ext/gd/Makefile.in +++ b/ext/gd/Makefile.in @@ -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 diff --git a/ext/gettext/Makefile.in b/ext/gettext/Makefile.in index 40597fa92d..bac3cf4090 100644 --- a/ext/gettext/Makefile.in +++ b/ext/gettext/Makefile.in @@ -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 diff --git a/ext/hyperwave/Makefile.in b/ext/hyperwave/Makefile.in index 84ac693ac7..119da1d4fc 100644 --- a/ext/hyperwave/Makefile.in +++ b/ext/hyperwave/Makefile.in @@ -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 diff --git a/ext/icap/Makefile.in b/ext/icap/Makefile.in index 2cdd776f3d..9bb6e34005 100644 --- a/ext/icap/Makefile.in +++ b/ext/icap/Makefile.in @@ -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 diff --git a/ext/imap/Makefile.in b/ext/imap/Makefile.in index fc4ef8551f..f5f7ed21a4 100644 --- a/ext/imap/Makefile.in +++ b/ext/imap/Makefile.in @@ -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 diff --git a/ext/informix/Makefile.in b/ext/informix/Makefile.in index 468a0d5b8f..799f83d284 100644 --- a/ext/informix/Makefile.in +++ b/ext/informix/Makefile.in @@ -1,16 +1,10 @@ -# $Id$ - -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 \ diff --git a/ext/interbase/Makefile.in b/ext/interbase/Makefile.in index fe6ec789b2..414012d95b 100644 --- a/ext/interbase/Makefile.in +++ b/ext/interbase/Makefile.in @@ -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 diff --git a/ext/java/Makefile.in b/ext/java/Makefile.in index 495c7efb37..26fab50d02 100644 --- a/ext/java/Makefile.in +++ b/ext/java/Makefile.in @@ -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 @@ EXTRA_INCLUDES = $(JAVA_INCLUDE) make_shared = yes -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk php_java.jar : reflect.java @test -d net || mkdir net diff --git a/ext/ldap/Makefile.in b/ext/ldap/Makefile.in index 9f3f231417..e01996fc07 100644 --- a/ext/ldap/Makefile.in +++ b/ext/ldap/Makefile.in @@ -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 diff --git a/ext/mcal/Makefile.in b/ext/mcal/Makefile.in index 13b9c5669b..4abaaa3683 100644 --- a/ext/mcal/Makefile.in +++ b/ext/mcal/Makefile.in @@ -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 diff --git a/ext/mcrypt/Makefile.in b/ext/mcrypt/Makefile.in index 9236b7bf22..ae5ba57ca7 100644 --- a/ext/mcrypt/Makefile.in +++ b/ext/mcrypt/Makefile.in @@ -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 diff --git a/ext/mhash/Makefile.in b/ext/mhash/Makefile.in index 175e1699cc..65962b0b34 100644 --- a/ext/mhash/Makefile.in +++ b/ext/mhash/Makefile.in @@ -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 diff --git a/ext/msql/Makefile.in b/ext/msql/Makefile.in index e6e4989e22..a65b6d9858 100644 --- a/ext/msql/Makefile.in +++ b/ext/msql/Makefile.in @@ -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 diff --git a/ext/mysql/Makefile.in b/ext/mysql/Makefile.in index 57595a8d35..0ae2db88c4 100644 --- a/ext/mysql/Makefile.in +++ b/ext/mysql/Makefile.in @@ -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 @@ LTLIBRARY_SHARED_LIBADD = $(MYSQL_LFLAGS) -lmysqlclient SUBDIRS = $(MYSQL_SUBDIRS) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk diff --git a/ext/mysql/libmysql/Makefile.in b/ext/mysql/libmysql/Makefile.in index 245698466f..43f25bd976 100644 --- a/ext/mysql/libmysql/Makefile.in +++ b/ext/mysql/libmysql/Makefile.in @@ -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 @@ LTLIBRARY_SOURCES = libmysql.c errmsg.c net.c violite.c password.c \ 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 diff --git a/ext/oci8/Makefile.in b/ext/oci8/Makefile.in index 7fd7cf3802..1f4628c47f 100644 --- a/ext/oci8/Makefile.in +++ b/ext/oci8/Makefile.in @@ -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 diff --git a/ext/odbc/Makefile.in b/ext/odbc/Makefile.in index a9e219c15f..cc99346b09 100644 --- a/ext/odbc/Makefile.in +++ b/ext/odbc/Makefile.in @@ -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 diff --git a/ext/oracle/Makefile.in b/ext/oracle/Makefile.in index c73f1fb06e..e1be724441 100644 --- a/ext/oracle/Makefile.in +++ b/ext/oracle/Makefile.in @@ -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 diff --git a/ext/pcre/Makefile.in b/ext/pcre/Makefile.in index 92aaa699a5..aefe85016f 100644 --- a/ext/pcre/Makefile.in +++ b/ext/pcre/Makefile.in @@ -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 diff --git a/ext/pcre/pcrelib/Makefile.in b/ext/pcre/pcrelib/Makefile.in index 3d435c758b..9f99bb5ba8 100644 --- a/ext/pcre/pcrelib/Makefile.in +++ b/ext/pcre/pcrelib/Makefile.in @@ -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 diff --git a/ext/pdf/Makefile.in b/ext/pdf/Makefile.in index 704fa3c4c7..e8fa3fd9fd 100644 --- a/ext/pdf/Makefile.in +++ b/ext/pdf/Makefile.in @@ -1,11 +1,5 @@ -# $Id$ - -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 diff --git a/ext/pgsql/Makefile.in b/ext/pgsql/Makefile.in index 48527b2cda..cf484da241 100644 --- a/ext/pgsql/Makefile.in +++ b/ext/pgsql/Makefile.in @@ -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 @@ LTLIBRARY_SHARED_LIBADD = $(PGSQL_LFLAGS) $(PGSQL_LIBS) EXTRA_INCLUDES = $(PGSQL_INCLUDE) -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk diff --git a/ext/posix/Makefile.in b/ext/posix/Makefile.in index 34ca248281..61fdd01d20 100644 --- a/ext/posix/Makefile.in +++ b/ext/posix/Makefile.in @@ -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 diff --git a/ext/readline/Makefile.in b/ext/readline/Makefile.in index 5124a8c67a..84006b0784 100644 --- a/ext/readline/Makefile.in +++ b/ext/readline/Makefile.in @@ -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 diff --git a/ext/recode/Makefile.in b/ext/recode/Makefile.in index c754c548bf..715ae0319c 100644 --- a/ext/recode/Makefile.in +++ b/ext/recode/Makefile.in @@ -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 diff --git a/ext/rpc/Makefile.in b/ext/rpc/Makefile.in index 495c7efb37..26fab50d02 100644 --- a/ext/rpc/Makefile.in +++ b/ext/rpc/Makefile.in @@ -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 @@ EXTRA_INCLUDES = $(JAVA_INCLUDE) make_shared = yes -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk php_java.jar : reflect.java @test -d net || mkdir net diff --git a/ext/rpc/java/Makefile.in b/ext/rpc/java/Makefile.in index 495c7efb37..26fab50d02 100644 --- a/ext/rpc/java/Makefile.in +++ b/ext/rpc/java/Makefile.in @@ -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 @@ EXTRA_INCLUDES = $(JAVA_INCLUDE) make_shared = yes -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk php_java.jar : reflect.java @test -d net || mkdir net diff --git a/ext/session/Makefile.in b/ext/session/Makefile.in index eab4a692c4..cda14be6da 100644 --- a/ext/session/Makefile.in +++ b/ext/session/Makefile.in @@ -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 diff --git a/ext/snmp/Makefile.in b/ext/snmp/Makefile.in index e51acef889..a732d25b8b 100644 --- a/ext/snmp/Makefile.in +++ b/ext/snmp/Makefile.in @@ -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 diff --git a/ext/standard/Makefile.in b/ext/standard/Makefile.in index 254129a758..e18866c0b4 100644 --- a/ext/standard/Makefile.in +++ b/ext/standard/Makefile.in @@ -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 @@ LTLIBRARY_SOURCES=\ 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 diff --git a/ext/sybase/Makefile.in b/ext/sybase/Makefile.in index 864711f164..3b7437ab55 100644 --- a/ext/sybase/Makefile.in +++ b/ext/sybase/Makefile.in @@ -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 diff --git a/ext/sybase_ct/Makefile.in b/ext/sybase_ct/Makefile.in index af189f2be9..965741c79d 100644 --- a/ext/sybase_ct/Makefile.in +++ b/ext/sybase_ct/Makefile.in @@ -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 diff --git a/ext/sysvsem/Makefile.in b/ext/sysvsem/Makefile.in index 6988e43b3a..33a9bd5419 100644 --- a/ext/sysvsem/Makefile.in +++ b/ext/sysvsem/Makefile.in @@ -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 diff --git a/ext/sysvshm/Makefile.in b/ext/sysvshm/Makefile.in index 263ec993e7..599a11b143 100644 --- a/ext/sysvshm/Makefile.in +++ b/ext/sysvshm/Makefile.in @@ -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 diff --git a/ext/wddx/Makefile.in b/ext/wddx/Makefile.in index f437cb248f..06865e6afa 100644 --- a/ext/wddx/Makefile.in +++ b/ext/wddx/Makefile.in @@ -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 diff --git a/ext/xml/Makefile.in b/ext/xml/Makefile.in index dc13b5451c..e6a97e7b24 100644 --- a/ext/xml/Makefile.in +++ b/ext/xml/Makefile.in @@ -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 @@ LTLIBRARY_SHARED_LIBADD = $(XML_LIBS) SUBDIRS = expat -include $(topsrcdir)/build/ltlib.mk +include $(top_srcdir)/build/ltlib.mk diff --git a/ext/xml/expat/Makefile.in b/ext/xml/expat/Makefile.in index f983b1d8f0..ea7b112417 100644 --- a/ext/xml/expat/Makefile.in +++ b/ext/xml/expat/Makefile.in @@ -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 diff --git a/ext/xml/expat/xmlparse/Makefile.in b/ext/xml/expat/xmlparse/Makefile.in index 9e405bbe03..5275652913 100644 --- a/ext/xml/expat/xmlparse/Makefile.in +++ b/ext/xml/expat/xmlparse/Makefile.in @@ -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 diff --git a/ext/xml/expat/xmltok/Makefile.in b/ext/xml/expat/xmltok/Makefile.in index 5e88c5d2b6..f9f02c863f 100644 --- a/ext/xml/expat/xmltok/Makefile.in +++ b/ext/xml/expat/xmltok/Makefile.in @@ -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 diff --git a/ext/yp/Makefile.in b/ext/yp/Makefile.in index bb3b8f46f1..4fd1f482d3 100644 --- a/ext/yp/Makefile.in +++ b/ext/yp/Makefile.in @@ -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 diff --git a/ext/zlib/Makefile.in b/ext/zlib/Makefile.in index b860cbce8a..62e7370a1f 100644 --- a/ext/zlib/Makefile.in +++ b/ext/zlib/Makefile.in @@ -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 diff --git a/pear/Makefile.in b/pear/Makefile.in index 9e2a699be2..3b8c8d5392 100644 --- a/pear/Makefile.in +++ b/pear/Makefile.in @@ -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 @@ BUILD_FILES = \ 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 @@ install-headers: 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)) diff --git a/regex/Makefile.in b/regex/Makefile.in index f3215ab42f..27b0331b9b 100644 --- a/regex/Makefile.in +++ b/regex/Makefile.in @@ -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 diff --git a/sapi/Makefile.in b/sapi/Makefile.in index de717b6e58..089a1e4a65 100644 --- a/sapi/Makefile.in +++ b/sapi/Makefile.in @@ -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 diff --git a/sapi/aolserver/Makefile.in b/sapi/aolserver/Makefile.in index 599ea22135..96a33af6bd 100644 --- a/sapi/aolserver/Makefile.in +++ b/sapi/aolserver/Makefile.in @@ -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 diff --git a/sapi/apache/Makefile.in b/sapi/apache/Makefile.in index 3151826121..477b3a4762 100644 --- a/sapi/apache/Makefile.in +++ b/sapi/apache/Makefile.in @@ -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 diff --git a/sapi/cgi/Makefile.in b/sapi/cgi/Makefile.in index b25c005d81..3b66c7d418 100644 --- a/sapi/cgi/Makefile.in +++ b/sapi/cgi/Makefile.in @@ -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 diff --git a/sapi/isapi/Makefile.in b/sapi/isapi/Makefile.in index f1425b1645..34d4bdc15c 100644 --- a/sapi/isapi/Makefile.in +++ b/sapi/isapi/Makefile.in @@ -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 diff --git a/sapi/phttpd/Makefile.in b/sapi/phttpd/Makefile.in index ab0413fad0..3fa62790f1 100644 --- a/sapi/phttpd/Makefile.in +++ b/sapi/phttpd/Makefile.in @@ -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 diff --git a/sapi/roxen/Makefile.in b/sapi/roxen/Makefile.in index 02afc96179..c49bf97ead 100644 --- a/sapi/roxen/Makefile.in +++ b/sapi/roxen/Makefile.in @@ -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 diff --git a/sapi/servlet/Makefile.in b/sapi/servlet/Makefile.in index 19f4b38880..47d0b5d2e2 100644 --- a/sapi/servlet/Makefile.in +++ b/sapi/servlet/Makefile.in @@ -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 @@ LTLIBRARY_DEPENDENCIES = phpsrvlt.jar 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 . diff --git a/sapi/thttpd/Makefile.in b/sapi/thttpd/Makefile.in index 4ebb9d6a1a..9edad0d7aa 100644 --- a/sapi/thttpd/Makefile.in +++ b/sapi/thttpd/Makefile.in @@ -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 |