You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2006/01/06 04:11:23 UTC
svn commit: r366400 - in /httpd/mod_mbox/branches/surgery: Makefile.am
configure.ac include/ src/libmbox/Makefile.am src/libmbox/mbox_search.c
src/libmime/Makefile.am src/mod-mbox-util/Makefile.am src/module/Makefile.am
Author: maxime
Date: Thu Jan 5 19:11:14 2006
New Revision: 366400
URL: http://svn.apache.org/viewcvs?rev=366400&view=rev
Log:
Continue work on refactoring.
Added:
httpd/mod_mbox/branches/surgery/include/
Modified:
httpd/mod_mbox/branches/surgery/Makefile.am
httpd/mod_mbox/branches/surgery/configure.ac
httpd/mod_mbox/branches/surgery/src/libmbox/Makefile.am
httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c
httpd/mod_mbox/branches/surgery/src/libmime/Makefile.am
httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am
httpd/mod_mbox/branches/surgery/src/module/Makefile.am
Modified: httpd/mod_mbox/branches/surgery/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/Makefile.am?rev=366400&r1=366399&r2=366400&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/Makefile.am Thu Jan 5 19:11:14 2006
@@ -1,10 +1,11 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = m4/apache.m4 \
- m4/apache_test.m4 \
- m4/config_nice.m4 \
- NOTICE \
- LICENSE \
- README
+ m4/apache_test.m4 \
+ m4/config_nice.m4 \
+ NOTICE \
+ LICENSE \
+ README \
+ STATUS
-SUBDIRS = src/module
+SUBDIRS = src/module src/libmbox
Modified: httpd/mod_mbox/branches/surgery/configure.ac
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/configure.ac?rev=366400&r1=366399&r2=366400&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/configure.ac (original)
+++ httpd/mod_mbox/branches/surgery/configure.ac Thu Jan 5 19:11:14 2006
@@ -8,8 +8,8 @@
AM_MAINTAINER_MODE
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER([src/module/mod_mbox_config.h:config.in])
-dnl src/module/mod_mbox_config.h:config.in])
+AM_CONFIG_HEADER([include/mod_mbox_config.h:config.in])
+dnl include/mod_mbox_config.h:config.in])
AC_PROG_CC
AC_PROG_CXX
@@ -39,7 +39,7 @@
BIN_LDFLAGS="${LUCENE4C_LIBS} `${APR_CONFIG} --link-libtool` `${APU_CONFIG} --link-libtool` `${APU_CONFIG} --ldflags --libs` `${APR_CONFIG} --ldflags --libs`"
AC_SUBST(BIN_LDFLAGS)
-AC_CONFIG_FILES([Makefile src/module/Makefile])
+AC_CONFIG_FILES([Makefile src/module/Makefile src/libmbox/Makefile src/libmime/Makefile src/mod-mbox-util/Makefile])
AC_OUTPUT
echo "---"
Modified: httpd/mod_mbox/branches/surgery/src/libmbox/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/libmbox/Makefile.am?rev=366400&r1=366399&r2=366400&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/libmbox/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/src/libmbox/Makefile.am Thu Jan 5 19:11:14 2006
@@ -1,24 +1,15 @@
-libmboxutil_la_SOURCES = mbox_search.c mbox_cache.c mbox_parse.c \
- mbox_sort.c mbox_thread.c mbox_externals.c
-libmboxutil_la_CFLAGS = -Wall ${MODULE_CFLAGS}
-libmboxutil_la_LDFLAGS = -avoid-version ${MODULE_LDFLAGS}
+# libmbox
-mod_mbox_la_SOURCES = mod_mbox.c mod_mbox_file.c mod_mbox_out.c mod_mbox_search.c \
- mod_mbox_index.c mod_mbox_cte.c mod_mbox_mime.c libmboxutil.la
-mod_mbox_la_LIBADD = libmboxutil.la
-mod_mbox_la_CFLAGS = -Wall ${MODULE_CFLAGS}
-mod_mbox_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LDFLAGS}
+lib_LTLIBRARIES = libmbox.la
-mod_mbox_util_SOURCES = mod-mbox-util.c
-mod_mbox_util_LDADD = libmboxutil.la
-mod_mbox_util_CFLAGS = -Wall ${MODULE_CFLAGS}
-mod_mbox_util_LDFLAGS = -avoid-version ${BIN_LDFLAGS}
+libmbox_la_SOURCES = \
+ mbox_search.c \
+ mbox_cache.c \
+ mbox_parse.c \
+ mbox_sort.c \
+ mbox_thread.c \
+ mbox_externals.c
+
+libmbox_la_CFLAGS = -Wall ${MODULE_CFLAGS}
+libmbox_la_LDFLAGS = -avoid-version ${MODULE_LDFLAGS}
-noinst_LTLIBRARIES = libmboxutil.la
-bin_PROGRAMS = mod-mbox-util
-mod_LTLIBRARIES = mod_mbox.la
-moddir=${AP_LIBEXECDIR}
-
-install: install-am
- rm -f $(DESTDIR)${AP_LIBEXECDIR}/mod_mbox.a
- rm -f $(DESTDIR)${AP_LIBEXECDIR}/mod_mbox.la
Modified: httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c?rev=366400&r1=366399&r2=366400&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c (original)
+++ httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c Thu Jan 5 19:11:14 2006
@@ -15,6 +15,10 @@
*/
/**
+ * The search feature is disabled.
+ */
+
+/**
* This file provides an experimental interface for a Full Text Search
* Engine. This current only supports indexing, and can spawn
* a java based program using Lucene to do the indexing. The long
Modified: httpd/mod_mbox/branches/surgery/src/libmime/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/libmime/Makefile.am?rev=366400&r1=366399&r2=366400&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/libmime/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/src/libmime/Makefile.am Thu Jan 5 19:11:14 2006
@@ -1,24 +0,0 @@
-libmboxutil_la_SOURCES = mbox_search.c mbox_cache.c mbox_parse.c \
- mbox_sort.c mbox_thread.c mbox_externals.c
-libmboxutil_la_CFLAGS = -Wall ${MODULE_CFLAGS}
-libmboxutil_la_LDFLAGS = -avoid-version ${MODULE_LDFLAGS}
-
-mod_mbox_la_SOURCES = mod_mbox.c mod_mbox_file.c mod_mbox_out.c mod_mbox_search.c \
- mod_mbox_index.c mod_mbox_cte.c mod_mbox_mime.c libmboxutil.la
-mod_mbox_la_LIBADD = libmboxutil.la
-mod_mbox_la_CFLAGS = -Wall ${MODULE_CFLAGS}
-mod_mbox_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LDFLAGS}
-
-mod_mbox_util_SOURCES = mod-mbox-util.c
-mod_mbox_util_LDADD = libmboxutil.la
-mod_mbox_util_CFLAGS = -Wall ${MODULE_CFLAGS}
-mod_mbox_util_LDFLAGS = -avoid-version ${BIN_LDFLAGS}
-
-noinst_LTLIBRARIES = libmboxutil.la
-bin_PROGRAMS = mod-mbox-util
-mod_LTLIBRARIES = mod_mbox.la
-moddir=${AP_LIBEXECDIR}
-
-install: install-am
- rm -f $(DESTDIR)${AP_LIBEXECDIR}/mod_mbox.a
- rm -f $(DESTDIR)${AP_LIBEXECDIR}/mod_mbox.la
Modified: httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am?rev=366400&r1=366399&r2=366400&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am Thu Jan 5 19:11:14 2006
@@ -1,7 +1,7 @@
# mod-mbox-util
mod_mbox_util_SOURCES = mod-mbox-util.c
-mod_mbox_util_LDADD = libmboxutil.la
+mod_mbox_util_LDADD = libmbox.la
mod_mbox_util_CFLAGS = -Wall ${MODULE_CFLAGS}
mod_mbox_util_LDFLAGS = -avoid-version ${BIN_LDFLAGS}
Modified: httpd/mod_mbox/branches/surgery/src/module/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/module/Makefile.am?rev=366400&r1=366399&r2=366400&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/module/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/src/module/Makefile.am Thu Jan 5 19:11:14 2006
@@ -1,24 +1,16 @@
-libmboxutil_la_SOURCES = mbox_search.c mbox_cache.c mbox_parse.c \
- mbox_sort.c mbox_thread.c mbox_externals.c
-libmboxutil_la_CFLAGS = -Wall ${MODULE_CFLAGS}
-libmboxutil_la_LDFLAGS = -avoid-version ${MODULE_LDFLAGS}
+# mod_mbox
-mod_mbox_la_SOURCES = mod_mbox.c mod_mbox_file.c mod_mbox_out.c mod_mbox_search.c \
- mod_mbox_index.c mod_mbox_cte.c mod_mbox_mime.c libmboxutil.la
-mod_mbox_la_LIBADD = libmboxutil.la
-mod_mbox_la_CFLAGS = -Wall ${MODULE_CFLAGS}
-mod_mbox_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LDFLAGS}
+mod_mbox_la_SOURCES = mod_mbox.c \
+ mod_mbox_file.c \
+ mod_mbox_out.c \
+ mod_mbox_search.c \
+ mod_mbox_index.c \
+ mod_mbox_cte.c \
+ mod_mbox_mime.c
-mod_mbox_util_SOURCES = mod-mbox-util.c
-mod_mbox_util_LDADD = libmboxutil.la
-mod_mbox_util_CFLAGS = -Wall ${MODULE_CFLAGS}
-mod_mbox_util_LDFLAGS = -avoid-version ${BIN_LDFLAGS}
+mod_mbox_la_LIBADD = libmbox.la libmime.la
+mod_mbox_la_CFLAGS = -Wall ${MOD_MBOX_LA_CFLAGS}
+mod_mbox_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MOD_MBOX_LA_LDFLAGS}
-noinst_LTLIBRARIES = libmboxutil.la
-bin_PROGRAMS = mod-mbox-util
-mod_LTLIBRARIES = mod_mbox.la
-moddir=${AP_LIBEXECDIR}
-
-install: install-am
- rm -f $(DESTDIR)${AP_LIBEXECDIR}/mod_mbox.a
- rm -f $(DESTDIR)${AP_LIBEXECDIR}/mod_mbox.la
+pkglib_LTLIBRARIES = mod_mbox.la
+pkginclude_HEADERS = mod_mbox.h