From f3188dcc18d8de1192c87e7e0284800e9488b976 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 9 Oct 2010 13:06:58 +0300 Subject: Reorganize libmailutils directory structure. * configure.ac (AC_CONFIG_FILES): Add libmailutils/ subdirs. * include/mailutils/Makefile.am: Update references to libmailutils. * po/POTFILES.in: Likewise. * libmailutils/.gitignore: Update. * libmailutils/Makefile.am: Use convenience libraries in subdirs. * libmailutils/string/Makefile.am: New file. * libmailutils/cstrcasecmp.c: Move to libmailutils/string. * libmailutils/cstrlower.c: Likewise. * libmailutils/cstrupper.c: Likewise. * libmailutils/strltrim.c: Likewise. * libmailutils/strskip.c: Likewise. * libmailutils/stripws.c: Likewise. * libmailutils/strrtrim.c: Likewise. * libmailutils/asnprintf.c: Likewise. * libmailutils/asprintf.c: Likewise. * libmailutils/muctype.c: Likewise. * libmailutils/vasnprintf.c: Likewise. * libmailutils/mkfilename.c: Likewise. * libmailutils/stream/Makefile.am: New file. * libmailutils/dbgstream.c: Move to libmailutils/stream. * libmailutils/file_stream.c: Likewise. * libmailutils/fltstream.c: Likewise. * libmailutils/iostream.c: Likewise. * libmailutils/mapfile_stream.c: Likewise. * libmailutils/memory_stream.c: Likewise. * libmailutils/message_stream.c: Likewise. * libmailutils/prog_stream.c: Likewise. * libmailutils/rdcache_stream.c: Likewise. * libmailutils/socket_stream.c: Likewise. * libmailutils/stdio_stream.c: Likewise. * libmailutils/stream.c: Likewise. * libmailutils/stream_printf.c: Likewise. * libmailutils/stream_vprintf.c: Likewise. * libmailutils/streamcpy.c: Likewise. * libmailutils/streamref.c: Likewise. * libmailutils/tcp.c: Likewise. * libmailutils/temp_file_stream.c: Likewise. * libmailutils/xscript-stream.c * libmailutils/cfg/Makefile.am: New file. * libmailutils/cfg/.gitignore: New file. * libmailutils/cfg_driver.c: Move to libmailutils/cfg/driver.c. * libmailutils/cfg_format.c: Move to libmailutils/cfg/format.c. * libmailutils/cfg_lexer.l: Move to libmailutils/cfg/lexer.l. * libmailutils/cfg_parser.y: Move to libmailutils/cfg/parser.y. * libmailutils/gocs.c: Move to libmailutils/cfg/gocs.c. * libmailutils/diag/Makefile.am: New file. * libmailutils/diag/.gitignore: New file. * libmailutils/debug.c: Move to libmailutils/diag. * libmailutils/diag.c: Likewise. * libmailutils/gdebug.c: Likewise. * libmailutils/errors: Likewise. * libmailutils/muerrno.cin: Likewise. * libmailutils/syslog.c: Likewise. * libmailutils/dbgstderr.c: Likewise. * libmailutils/dbgsyslog.c: Likewise. * libmailutils/address/Makefile.am: New file. * libmailutils/address.c: Move to libmailutils/address. * libmailutils/parse822.c: Likewise. * libmailutils/mailbox/Makefile.am: New file. * libmailutils/mailbox.c: Move to libmailutils/mailbox. * libmailutils/mbx_default.c: Likewise. * libmailutils/mbxitr.c: Likewise. * libmailutils/attribute.c: Likewise. * libmailutils/body.c: Likewise. * libmailutils/envelope.c: Likewise. * libmailutils/folder.c: Likewise. * libmailutils/hdritr.c: Likewise. * libmailutils/header.c: Likewise. * libmailutils/message.c: Likewise. * libmailutils/msgscan.c: Likewise. * libmailutils/mailer/Makefile.am: New file. * libmailutils/mailer.c: Move to libmailutils/mailer. * libmailutils/progmailer.c: Likewise. * libmailutils/mime/Makefile.am: New file. * libmailutils/attachment.c: Move to libmailutils/mime. * libmailutils/mime.c: Likewise. * libmailutils/mimehdr.c: Likewise. * libmailutils/server/Makefile.am: New file. * libmailutils/acl.c: Move to libmailutils/server. * libmailutils/server.c: Likewise. * libmailutils/msrv.c: Likewise. * libmailutils/ipsrv.c: Likewise. * libmailutils/auth/Makefile.am: New file. * libmailutils/auth.c: Move to libmailutils/auth. * libmailutils/mu_auth.c: Likewise. * libmailutils/system.c: Likewise. * libmailutils/base/Makefile.am: New file. * libmailutils/base/.gitignore: New file. * libmailutils/alloc.c: Move to libmailutils/base. * libmailutils/amd.c: Likewise. * libmailutils/argcv.c: Likewise. * libmailutils/assoc.c: Likewise. * libmailutils/daemon.c: Likewise. * libmailutils/date.c: Likewise. * libmailutils/fgetpwent.c: Likewise. * libmailutils/freeitem.c: Likewise. * libmailutils/getpass.c: Likewise. * libmailutils/iterator.c: Likewise. * libmailutils/kwd.c: Likewise. * libmailutils/list.c: Likewise. * libmailutils/listlist.c: Likewise. * libmailutils/locale.c: Likewise. * libmailutils/locker.c: Likewise. * libmailutils/mailcap.c: Likewise. * libmailutils/md5.c: Likewise. * libmailutils/monitor.c: Likewise. * libmailutils/munre.c: Likewise. * libmailutils/mutil.c: Likewise. * libmailutils/nls.c: Likewise. * libmailutils/nullrec.c: Likewise. * libmailutils/observer.c: Likewise. * libmailutils/opool.c: Likewise. * libmailutils/parsedate.y: Likewise. * libmailutils/permstr.c: Likewise. * libmailutils/property.c: Likewise. * libmailutils/registrar.c: Likewise. * libmailutils/refcount.c: Likewise. * libmailutils/rfc2047.c: Likewise. * libmailutils/sha1.c: Likewise. * libmailutils/secret.c: Likewise. * libmailutils/ticket.c: Likewise. * libmailutils/url.c: Likewise. * libmailutils/vartab.c: Likewise. * libmailutils/version.c: Likewise. * libmailutils/wicket.c: Likewise. --- libmailutils/Makefile.am | 218 ++++++++--------------------------------------- 1 file changed, 36 insertions(+), 182 deletions(-) (limited to 'libmailutils/Makefile.am') diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am index 07a0a4e54..f13085f32 100644 --- a/libmailutils/Makefile.am +++ b/libmailutils/Makefile.am @@ -1,188 +1,42 @@ -## Process this file with GNU Automake to create Makefile.in - -## Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, -## 2010 Free Software Foundation, Inc. -## -## GNU Mailutils is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License as -## published by the Free Software Foundation; either version 3, or (at -## your option) any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301 USA - -INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils - -YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap -AM_YFLAGS=-vt -AM_LFLAGS=-dvp - -SUBDIRS = . tests +# GNU Mailutils -- a suite of utilities for electronic mail +# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, +# 2010 Free Software Foundation, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General +# Public License along with this library. If not, see +# . + +SUBDIRS = auth base address cfg diag filter mailbox mailer mime\ + server string stream . tests lib_LTLIBRARIES = libmailutils.la -localedir = $(datadir)/locale -AM_CPPFLAGS = \ - -DSYSCONFDIR=\"$(sysconfdir)\"\ - -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\ - -DLOCALEDIR=\"$(localedir)\" - -EXTRA_DIST = \ - errors\ - muerrno.cin\ - parsedate.y\ - fgetpwent.c\ - cfg_lexer.l\ - cfg_parser.y\ - cfg_parser.h - -libmailutils_la_SOURCES = \ - acl.c\ - address.c\ - alloc.c\ - amd.c\ - argcv.c\ - asnprintf.c\ - asprintf.c\ - assoc.c\ - attachment.c\ - attribute.c\ - auth.c\ - base64.c\ - binflt.c\ - body.c\ - cstrcasecmp.c\ - cfg_driver.c\ - cfg_format.c\ - cfg_lexer.c\ - cfg_parser.c\ - crlfdot.c\ - crlfflt.c\ - cstrlower.c\ - cstrupper.c\ - daemon.c\ - date.c\ - dbgstderr.c\ - dbgstream.c\ - dbgsyslog.c\ - debug.c\ - diag.c\ - dot.c\ - envelope.c\ - fgetpwent.c\ - file_stream.c\ - filter.c\ - filter_iconv.c\ - fltstream.c\ - folder.c\ - freeitem.c\ - fromflt.c\ - gdebug.c\ - getpass.c\ - gocs.c\ - hdritr.c\ - header.c\ - iostream.c\ - iterator.c\ - ipsrv.c\ - kwd.c\ - linelenflt.c\ - list.c\ - listlist.c\ - locale.c\ - locker.c\ - mailbox.c\ - mailcap.c\ - mailer.c\ - mapfile_stream.c\ - mbx_default.c\ - mbxitr.c\ - md5.c\ - message.c\ - memory_stream.c\ - message_stream.c\ - mime.c\ - mimehdr.c\ - mkfilename.c\ - monitor.c\ - msgscan.c\ - msrv.c\ - mu_auth.c\ - muctype.c\ - munre.c\ - mutil.c\ - muerror.c\ - muerrno.c\ - nls.c\ - nullrec.c\ - observer.c\ - opool.c\ - parse822.c\ - parsedate.c\ - permstr.c\ - progmailer.c\ - prog_stream.c\ - property.c\ - qpflt.c\ - rdcache_stream.c\ - registrar.c\ - refcount.c\ - rfc2047.c\ - sha1.c\ - secret.c\ - server.c\ - socket_stream.c\ - stdio_stream.c\ - stream.c\ - stream_printf.c\ - stream_vprintf.c\ - streamcpy.c\ - streamref.c\ - strltrim.c\ - strskip.c\ - stripws.c\ - strrtrim.c\ - syslog.c\ - system.c\ - temp_file_stream.c\ - ticket.c\ - tcp.c\ - url.c\ - vartab.c\ - vasnprintf.c\ - version.c\ - wicket.c\ - xscript-stream.c - -BUILT_SOURCES = parsedate.c muerrno.c cfg_parser.c cfg_parser.h cfg_lexer.c -MOSTLYCLEANFILES= - -parsedate.c: $(srcdir)/parsedate.y - $(YLWRAP) "$(YACC) $(AM_YFLAGS)" $< \ - y.tab.c parsedate.c y.output parsedate.y.output \ - -- -yy pd_yy - -cfg_parser.c cfg_parser.h: $(srcdir)/cfg_parser.y - $(YLWRAP) "$(YACC) $(AM_YFLAGS) -d" $< \ - y.tab.c cfg_parser.c y.tab.h cfg_parser.h \ - y.output cfg_parser.y.output \ - -- -yy mu_cfg_yy - -cfg_lexer.c: $(srcdir)/cfg_lexer.l cfg_parser.h - $(YLWRAP) "$(LEX) $(AM_LFLAGS) $(LFLAGS)" \ - $(srcdir)/cfg_lexer.l lex.yy.c cfg_lexer.c \ - -- -yy mu_cfg_yy - -muerrno.c: errors muerrno.cin - $(AWK) -f $(mu_aux_dir)/generr.awk $^ > $@ +libmailutils_la_SOURCES = + +libmailutils_la_LIBADD = \ + @MU_COMMON_LIBRARIES@\ + auth/libauth.la\ + base/libbase.la\ + address/libaddress.la\ + cfg/libcfg.la\ + diag/libdiag.la\ + filter/libfilter.la\ + mailbox/libmailbox.la\ + mailer/libmailer.la\ + mime/libmime.la\ + server/libserver.la\ + string/libstring.la\ + stream/libstream.la -libmailutils_la_LIBADD = @MU_COMMON_LIBRARIES@ libmailutils_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ -- cgit v1.2.1