diff options
| author | Sascha Schumann <sas@php.net> | 1999-12-30 02:59:53 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-12-30 02:59:53 +0000 |
| commit | f2f8d38efa3ccbaa05affaf8fcab24786ef452de (patch) | |
| tree | c546807d61a77a191f89056212a4c40c63f0e83b /ext/xml | |
| parent | 6bf3529919cf60389797a107cab16c826df3e68f (diff) | |
| download | php-git-f2f8d38efa3ccbaa05affaf8fcab24786ef452de.tar.gz | |
Integration of -ng changes. Changes:
- added support for externally built modules,
- improved support for in-tree shared modules,
- fixed diversion bugs,
- configure displays some informative messages,
- faster static build
(libtool isn't used anymore for compiling non-PIC objects),
- dependencies comparable to automake's without requiring GNU make or GCC,
- working make clean for non-GNU makes.
Diffstat (limited to 'ext/xml')
| -rw-r--r-- | ext/xml/Makefile.am | 12 | ||||
| -rw-r--r-- | ext/xml/Makefile.in | 14 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am deleted file mode 100644 index 504e4c6d9b..0000000000 --- a/ext/xml/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# $Id$ - -SRC=xml.c -INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=@XML_STATIC@ -EXTRA_LTLIBRARIES=libphpext_xml.la xml.la -libphpext_xml_la_SOURCES=$(SRC) -phplib_LTLIBRARIES=@XML_SHARED@ -xml_la_SOURCES=$(SRC) -xml_la_LIBADD=@XML_LIBS@ -xml_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= diff --git a/ext/xml/Makefile.in b/ext/xml/Makefile.in new file mode 100644 index 0000000000..634eede7aa --- /dev/null +++ b/ext/xml/Makefile.in @@ -0,0 +1,14 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libxml.la +LTLIBRARY_SOURCES = xml.c +LTLIBRARY_SHARED_NAME = xml.la +LTLIBRARY_SHARED_LIBADD = $(XML_LIBS) + +EXTRA_INCLUDES = $(XML_INCLUDE) + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 8c55e8eac3..64e7f70732 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -52,7 +52,5 @@ AC_ARG_WITH(xml, ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(XML_LIBS) -AC_SUBST(XML_INCLUDE) -AC_SUBST(XML_STATIC) -AC_SUBST(XML_SHARED) +PHP_SUBST(XML_LIBS) +PHP_SUBST(XML_INCLUDE) |