Skip to content

Commit 219d5ff

Browse files
committed
build: retire zendfake
1 parent 69ca757 commit 219d5ff

File tree

2 files changed

+4
-91
lines changed

2 files changed

+4
-91
lines changed

Makefile.am

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --with-dcprefix='$${prefix}'
99
AM_TESTS_ENVIRONMENT = export TEST_PATH=${top_srcdir}/data;
1010

1111
lib_LTLIBRARIES = libgromox_common.la libgromox_dbop.la libgromox_epoll.la libgromox_mapi.la libgromox_exrpc.la libgromox_rpc.la ${program_plugins}
12-
noinst_LTLIBRARIES = libgromox_abtree.la libphp_mapi.la
12+
noinst_LTLIBRARIES = libgromox_abtree.la
1313
pkglibexec_PROGRAMS = cgkrepair delivery delivery-queue event gromox-snapshot http imap midb pop3 timer zcore tools/authtry tools/eidprint tools/textmapquery
14-
pkglib_LTLIBRARIES = libmapi4zf.la
1514
if WITH_GNU_LD
1615
version_sc_SYFLAGS = -Wl,--version-script=${srcdir}/default.sym
1716
endif
@@ -239,20 +238,13 @@ gromox_snapshot_LDADD = ${libHX_LIBS} libgromox_common.la
239238
timer_SOURCES = tools/timer.cpp
240239
timer_LDADD = -lpthread ${libHX_LIBS} ${libssl_LIBS} libgromox_common.la
241240

242-
libphp_mapi_la_CPPFLAGS = ${AM_CPPFLAGS} ${PHP_INCLUDES}
243-
libphp_mapi_la_SOURCES = php_mapi/ext.hpp php_mapi/ext_pack.cpp php_mapi/mapi.cpp php_mapi/mapi_arginfo.hpp php_mapi/rpc_ext.cpp php_mapi/type_conversion.cpp php_mapi/type_conversion.hpp php_mapi/zclient.cpp php_mapi/zrpc.cpp
244-
libphp_mapi_la_LIBADD = ${fmt_LIBS} ${libHX_LIBS} libgromox_common.la libgromox_mapi.la
245-
# allow-shlib-undefined makes no sense for libphp_mapi_la, since it
246-
# is a convenience archive (static archive in practice)
247-
libmapi4zf_la_SOURCES = tests/zendfake.c
248-
libmapi4zf_la_LDFLAGS = ${PHP_LDFLAGS}
249-
libmapi4zf_la_LIBADD = libphp_mapi.la
250-
mapi_la_SOURCES =
241+
mapi_la_CPPFLAGS = ${AM_CPPFLAGS} ${PHP_INCLUDES}
242+
mapi_la_SOURCES = php_mapi/ext.hpp php_mapi/ext_pack.cpp php_mapi/mapi.cpp php_mapi/mapi_arginfo.hpp php_mapi/rpc_ext.cpp php_mapi/type_conversion.cpp php_mapi/type_conversion.hpp php_mapi/zclient.cpp php_mapi/zrpc.cpp
243+
mapi_la_LIBADD = ${fmt_LIBS} ${libHX_LIBS} libgromox_common.la libgromox_mapi.la
251244
mapi_la_LDFLAGS = ${plugin_LDFLAGS} ${default_SYFLAGS} ${PHP_LDFLAGS}
252245
if WITH_GNU_LD
253246
mapi_la_LDFLAGS += -Wl,--allow-shlib-undefined
254247
endif
255-
mapi_la_LIBADD = libphp_mapi.la
256248
EXTRA_mapi_la_DEPENDENCIES = default.sym
257249

258250
noinst_PROGRAMS = dldcheck tests/bdump tests/bodyconv tests/compress tests/dnsbl_check tests/exrpctest tests/gxl-383 tests/jsontest tests/lzxpress tests/oxcmail_ie tests/ucvttest tests/udb tests/utiltest tests/vcard tools/tzdump
@@ -410,7 +402,6 @@ exch/exmdb/rpc.cpp: include/gromox/exmdb_idef.hpp tools/exmidl.sh tools/exmidl.p
410402

411403
install-exec-hook:
412404
${MKDIR_P} ${DESTDIR}${sbindir}
413-
rm -fv ${DESTDIR}${pkglibdir}/libmapi4zf.*
414405

415406
install-data-local:
416407
${MKDIR_P} ${DESTDIR}${mandir}/man8 ${DESTDIR}${pkgdatadir}/http/php

tests/zendfake.c

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)