endif
SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
- lib-mime lib-lib lib-crypt lib-hash lib-network lib-ui lib \
+ lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui lib \
pop imap $(NNTP_SUBDIR)
BUILT_SOURCES = keymap_defs.h version.h
madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
-Limap -limap -Lpop -lpop $(LIBNNTP) \
-Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \
- -Llib-network -lnetwork -Llib-ui -lui \
+ -Llib-sys -lsys -Llib-ui -lui \
-Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
lib-mime/Makefile
lib-crypt/Makefile
lib-hash/Makefile
- lib-network/Makefile
+ lib-sys/Makefile
lib-ui/Makefile
lib/Makefile
imap/Makefile
#include "message.h"
#include "imap_private.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
-# include <lib-network/mutt_ssl.h>
+# include <lib-sys/mutt_ssl.h>
#endif
#include "buffy.h"
#include <lib-ui/curses.h>
#include "imap.h"
-#include <lib-network/mutt_socket.h>
+#include <lib-sys/mutt_socket.h>
/* -- symbols -- */
#define IMAP_PORT 143
#include "mx.h" /* for M_IMAP */
#include "url.h"
#include "imap_private.h"
-#include <lib-network/mutt_ssl.h>
+#include <lib-sys/mutt_ssl.h>
#include <lib-lib/macros.h>
#include <lib-lib/debug.h>
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
-#include <lib-network/mutt_ssl.h>
+#include <lib-sys/mutt_ssl.h>
#endif
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+++ /dev/null
-noinst_LIBRARIES = libnetwork.a
-
-libnetwork_a_SOURCES = mutt_socket.h mutt_tunnel.c mutt_ssl.h \
- mutt_socket.c mutt_tunnel.h mutt_ssl.c mutt_ssl_gnutls.c
-
-noinst_HEADERS = mutt_socket.h mutt_tunnel.c mutt_ssl.h
-
--include ../cflags.mk
--- /dev/null
+noinst_LIBRARIES = libsys.a
+
+libsys_a_SOURCES = mutt_socket.h mutt_tunnel.c mutt_ssl.h \
+ mutt_socket.c mutt_tunnel.h mutt_ssl.c mutt_ssl_gnutls.c
+
+noinst_HEADERS = mutt_socket.h mutt_tunnel.c mutt_ssl.h
+
+-include ../cflags.mk
#include "mutt.h"
#include "account.h"
#include "mutt_sasl.h"
-#include <lib-network/mutt_socket.h>
+#include <lib-sys/mutt_socket.h>
static int getnameinfo_err (int ret)
{
#include <sasl/sasl.h>
-#include <lib-network/mutt_socket.h>
+#include <lib-sys/mutt_socket.h>
int mutt_sasl_client_new (CONNECTION *, sasl_conn_t **);
sasl_callback_t *mutt_sasl_get_callbacks (ACCOUNT *);
#ifndef _NNTP_H_
#define _NNTP_H_ 1
-#include <lib-network/mutt_socket.h>
+#include <lib-sys/mutt_socket.h>
#include "mx.h"
#include <time.h>
#include <lib-ui/curses.h>
#include "mx.h"
-#include <lib-network/mutt_socket.h>
+#include <lib-sys/mutt_socket.h>
#define POP_PORT 110
#define POP_SSL_PORT 995
#include "url.h"
#include "pop.h"
#if defined (USE_SSL) || defined (USE_GNUTLS)
-# include <lib-network/mutt_ssl.h>
+# include <lib-sys/mutt_ssl.h>
#endif
/* given an POP mailbox name, return host, port, username and password */