summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/aspell/Makefile.in5
-rw-r--r--ext/aspell/config.m42
-rw-r--r--ext/cpdf/Makefile.in5
-rw-r--r--ext/cpdf/config.m44
-rw-r--r--ext/cybercash/Makefile.in5
-rw-r--r--ext/cybercash/config.m42
-rw-r--r--ext/db/Makefile.in5
-rw-r--r--ext/db/config.m42
-rw-r--r--ext/hyperwave/Makefile.in5
-rw-r--r--ext/hyperwave/config.m42
-rw-r--r--ext/ncurses/Makefile.in8
-rw-r--r--ext/ncurses/config.m42
-rw-r--r--ext/odbc/Makefile.in7
-rw-r--r--ext/odbc/config.m42
-rw-r--r--ext/pcntl/Makefile.in8
-rw-r--r--ext/pcntl/config.m42
-rw-r--r--ext/readline/Makefile.in7
-rw-r--r--ext/readline/config.m44
18 files changed, 11 insertions, 66 deletions
diff --git a/ext/aspell/Makefile.in b/ext/aspell/Makefile.in
deleted file mode 100644
index c80a02c617..0000000000
--- a/ext/aspell/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME = libaspell.la
-LTLIBRARY_SOURCES = aspell.c
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/aspell/config.m4 b/ext/aspell/config.m4
index ee3bc15457..a82ad6ca02 100644
--- a/ext/aspell/config.m4
+++ b/ext/aspell/config.m4
@@ -21,7 +21,7 @@ AC_ARG_WITH(aspell,
fi
AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell])
AC_MSG_RESULT(yes)
- PHP_EXTENSION(aspell)
+ PHP_NEW_EXTENSION(aspell, aspell.c)
else
AC_MSG_RESULT(no)
fi
diff --git a/ext/cpdf/Makefile.in b/ext/cpdf/Makefile.in
deleted file mode 100644
index 7a74ccdba5..0000000000
--- a/ext/cpdf/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME = libcpdf.la
-LTLIBRARY_SOURCES = cpdf.c
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index 4a0bec453d..fb6dc71931 100644
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -9,7 +9,7 @@ AC_ARG_WITH(cpdflib,
AC_MSG_RESULT(no) ;;
yes)
AC_MSG_RESULT(yes)
- PHP_EXTENSION(cpdf)
+ PHP_NEW_EXTENSION(cpdf, cpdf.c)
AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
[AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
PHP_ADD_LIBRARY(cpdf)
@@ -20,7 +20,7 @@ AC_ARG_WITH(cpdflib,
test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
if test -n "$CPDFLIB_INCLUDE" ; then
AC_MSG_RESULT(yes)
- PHP_EXTENSION(cpdf)
+ PHP_EXTENSION(cpdf, cpdf.c)
old_LIBS=$LIBS
old_withval=$withval
diff --git a/ext/cybercash/Makefile.in b/ext/cybercash/Makefile.in
deleted file mode 100644
index 99ab73a904..0000000000
--- a/ext/cybercash/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME = libcybercash.la
-LTLIBRARY_SOURCES = cybercash.c
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/cybercash/config.m4 b/ext/cybercash/config.m4
index 439b7026a0..99c79897cd 100644
--- a/ext/cybercash/config.m4
+++ b/ext/cybercash/config.m4
@@ -12,7 +12,7 @@ AC_ARG_WITH(cybercash,
test -f $withval/c-api/mckcrypt.h && MCK_DIR=$withval/c-api
if test -n "$MCK_DIR"; then
AC_MSG_RESULT(yes)
- PHP_EXTENSION(cybercash)
+ PHP_EXTENSION(cybercash, cybercash.c)
old_LIBS=$LIBS
LIBS="$LIBS -L$MCK_DIR/lib"
AC_CHECK_LIB(mckcrypto,base64_encode,[AC_DEFINE(HAVE_MCK,1,[ ])],
diff --git a/ext/db/Makefile.in b/ext/db/Makefile.in
deleted file mode 100644
index f4531bed58..0000000000
--- a/ext/db/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME = libdb.la
-LTLIBRARY_SOURCES = db.c
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/db/config.m4 b/ext/db/config.m4
index 5a3de1b567..e939694376 100644
--- a/ext/db/config.m4
+++ b/ext/db/config.m4
@@ -54,5 +54,5 @@ if test "$PHP_DB" != "no"; then
EXTRA_LIBS="$EXTRA_LIBS $DBM_LIB"
fi
- PHP_EXTENSION(db)
+ PHP_EXTENSION(db, db.c)
fi
diff --git a/ext/hyperwave/Makefile.in b/ext/hyperwave/Makefile.in
deleted file mode 100644
index b66d82cfda..0000000000
--- a/ext/hyperwave/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LTLIBRARY_NAME = libhyperwave.la
-LTLIBRARY_SOURCES = hw.c hg_comm.c
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/hyperwave/config.m4 b/ext/hyperwave/config.m4
index 45391481bc..9e5a31cc6d 100644
--- a/ext/hyperwave/config.m4
+++ b/ext/hyperwave/config.m4
@@ -9,7 +9,7 @@ AC_ARG_WITH(hyperwave,
if test "$withval" != "no"; then
AC_DEFINE(HYPERWAVE,1,[ ])
AC_MSG_RESULT(yes)
- PHP_EXTENSION(hyperwave)
+ PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c)
else
AC_DEFINE(HYPERWAVE,0,[ ])
AC_MSG_RESULT(no)
diff --git a/ext/ncurses/Makefile.in b/ext/ncurses/Makefile.in
deleted file mode 100644
index 359ed0f423..0000000000
--- a/ext/ncurses/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-LTLIBRARY_NAME = libncurses.la
-LTLIBRARY_SOURCES = ncurses.c ncurses_fe.c ncurses_functions.c
-LTLIBRARY_SHARED_NAME = ncurses.la
-LTLIBRARY_SHARED_LIBADD = $(NCURSES_SHARED_LIBADD)
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/ncurses/config.m4 b/ext/ncurses/config.m4
index 120d3bb449..14cb896981 100644
--- a/ext/ncurses/config.m4
+++ b/ext/ncurses/config.m4
@@ -49,7 +49,7 @@ if test "$PHP_NCURSES" != "no"; then
AC_CHECK_LIB(ncurses, asume_default_colors, [AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS, 1, [ ])])
AC_CHECK_LIB(ncurses, use_extended_names, [AC_DEFINE(HAVE_NCURSES_USE_EXTENDED_NAMES, 1, [ ])])
- PHP_EXTENSION(ncurses, $ext_shared, cli)
+ PHP_NEW_EXTENSION(ncurses, ncurses.c ncurses_fe.c ncurses_functions.c, $ext_shared, cli)
PHP_SUBST(NCURSES_SHARED_LIBADD)
fi
diff --git a/ext/odbc/Makefile.in b/ext/odbc/Makefile.in
deleted file mode 100644
index c50b30b099..0000000000
--- a/ext/odbc/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LTLIBRARY_NAME = libodbc.la
-LTLIBRARY_SOURCES = php_odbc.c
-LTLIBRARY_SHARED_NAME = odbc.la
-LTLIBRARY_SHARED_LIBADD = $(ODBC_LFLAGS) $(ODBC_LIBS)
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 6d237c3883..05e27a020b 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -548,5 +548,5 @@ if test -n "$ODBC_TYPE"; then
PHP_SUBST_OLD(ODBC_LIBS)
PHP_SUBST_OLD(ODBC_LFLAGS)
PHP_SUBST_OLD(ODBC_TYPE)
- PHP_EXTENSION(odbc, $shared)
+ PHP_NEW_EXTENSION(odbc, php_odbc.c, $shared)
fi
diff --git a/ext/pcntl/Makefile.in b/ext/pcntl/Makefile.in
deleted file mode 100644
index d778a61943..0000000000
--- a/ext/pcntl/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-LTLIBRARY_NAME = libpcntl.la
-LTLIBRARY_SOURCES = pcntl.c php_signal.c
-LTLIBRARY_SHARED_NAME = pcntl.la
-LTLIBRARY_SHARED_LIBADD = $(PCNTL_SHARED_LIBADD)
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/pcntl/config.m4 b/ext/pcntl/config.m4
index 648c107263..f24f038cb9 100644
--- a/ext/pcntl/config.m4
+++ b/ext/pcntl/config.m4
@@ -14,5 +14,5 @@ if test "$PHP_PCNTL" != "no"; then
AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ])
AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ])
- PHP_EXTENSION(pcntl, $ext_shared, cli)
+ PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli)
fi
diff --git a/ext/readline/Makefile.in b/ext/readline/Makefile.in
deleted file mode 100644
index 6af732d792..0000000000
--- a/ext/readline/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LTLIBRARY_NAME = libreadline.la
-LTLIBRARY_SOURCES = readline.c
-LTLIBRARY_SHARED_NAME = readline.la
-LTLIBRARY_SHARED_LIBADD = $(READLINE_SHARED_LIBADD)
-
-include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index d179f82ffd..463304bcaa 100644
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -51,7 +51,7 @@ if test "$PHP_READLINE" != "no"; then
PHP_SUBST(READLINE_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
- PHP_EXTENSION(readline, $ext_shared, cli)
+ PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
fi
if test "$PHP_LIBEDIT" != "no"; then
@@ -88,5 +88,5 @@ if test "$PHP_LIBEDIT" != "no"; then
PHP_SUBST(READLINE_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
- PHP_EXTENSION(readline, $ext_shared, cli)
+ PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli)
fi
View Lorry Controller Status