From: Pierre Habouzit Date: Sun, 12 Nov 2006 00:15:28 +0000 (+0100) Subject: lib-network -> lib-sys. X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=ccf2b75a9ed50a79c4d8e5d6235c7313fcd3719a lib-network -> lib-sys. it will receive the unix things soon (like signal handling, exit code handling and things like that). Signed-off-by: Pierre Habouzit --- diff --git a/Makefile.am b/Makefile.am index 36339da..6e18b90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ NNTP_INCLUDES = -I$(top_srcdir)/nntp 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 @@ -32,7 +32,7 @@ madmutt_SOURCES = $(BUILT_SOURCES) \ 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@ \ diff --git a/configure.ac b/configure.ac index 2a889f4..35dc32d 100644 --- a/configure.ac +++ b/configure.ac @@ -907,7 +907,7 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile lib-mime/Makefile lib-crypt/Makefile lib-hash/Makefile - lib-network/Makefile + lib-sys/Makefile lib-ui/Makefile lib/Makefile imap/Makefile diff --git a/imap/imap.c b/imap/imap.c index 48f1dc4..ec31f58 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -29,7 +29,7 @@ #include "message.h" #include "imap_private.h" #if defined(USE_SSL) || defined(USE_GNUTLS) -# include +# include #endif #include "buffy.h" diff --git a/imap/imap_private.h b/imap/imap_private.h index b61b9b2..eecc798 100644 --- a/imap/imap_private.h +++ b/imap/imap_private.h @@ -16,7 +16,7 @@ #include #include "imap.h" -#include +#include /* -- symbols -- */ #define IMAP_PORT 143 diff --git a/imap/util.c b/imap/util.c index 6088321..373cad0 100644 --- a/imap/util.c +++ b/imap/util.c @@ -20,7 +20,7 @@ #include "mx.h" /* for M_IMAP */ #include "url.h" #include "imap_private.h" -#include +#include #include #include diff --git a/init.c b/init.c index 96990c2..bb8bedb 100644 --- a/init.c +++ b/init.c @@ -36,7 +36,7 @@ #include "mutt_idna.h" #if defined(USE_SSL) || defined(USE_GNUTLS) -#include +#include #endif #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS)) diff --git a/lib-network/Makefile.am b/lib-network/Makefile.am deleted file mode 100644 index aadbab1..0000000 --- a/lib-network/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/lib-sys/Makefile.am b/lib-sys/Makefile.am new file mode 100644 index 0000000..de7194f --- /dev/null +++ b/lib-sys/Makefile.am @@ -0,0 +1,8 @@ +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 diff --git a/lib-network/mutt_socket.c b/lib-sys/mutt_socket.c similarity index 100% rename from lib-network/mutt_socket.c rename to lib-sys/mutt_socket.c diff --git a/lib-network/mutt_socket.h b/lib-sys/mutt_socket.h similarity index 100% rename from lib-network/mutt_socket.h rename to lib-sys/mutt_socket.h diff --git a/lib-network/mutt_ssl.c b/lib-sys/mutt_ssl.c similarity index 100% rename from lib-network/mutt_ssl.c rename to lib-sys/mutt_ssl.c diff --git a/lib-network/mutt_ssl.h b/lib-sys/mutt_ssl.h similarity index 100% rename from lib-network/mutt_ssl.h rename to lib-sys/mutt_ssl.h diff --git a/lib-network/mutt_ssl_gnutls.c b/lib-sys/mutt_ssl_gnutls.c similarity index 100% rename from lib-network/mutt_ssl_gnutls.c rename to lib-sys/mutt_ssl_gnutls.c diff --git a/lib-network/mutt_tunnel.c b/lib-sys/mutt_tunnel.c similarity index 100% rename from lib-network/mutt_tunnel.c rename to lib-sys/mutt_tunnel.c diff --git a/lib-network/mutt_tunnel.h b/lib-sys/mutt_tunnel.h similarity index 100% rename from lib-network/mutt_tunnel.h rename to lib-sys/mutt_tunnel.h diff --git a/mutt_sasl.c b/mutt_sasl.c index bb91271..956b164 100644 --- a/mutt_sasl.c +++ b/mutt_sasl.c @@ -25,7 +25,7 @@ #include "mutt.h" #include "account.h" #include "mutt_sasl.h" -#include +#include static int getnameinfo_err (int ret) { diff --git a/mutt_sasl.h b/mutt_sasl.h index 9c71a67..7cc6ff8 100644 --- a/mutt_sasl.h +++ b/mutt_sasl.h @@ -14,7 +14,7 @@ #include -#include +#include int mutt_sasl_client_new (CONNECTION *, sasl_conn_t **); sasl_callback_t *mutt_sasl_get_callbacks (ACCOUNT *); diff --git a/nntp/nntp.h b/nntp/nntp.h index d82bd60..2ef79de 100644 --- a/nntp/nntp.h +++ b/nntp/nntp.h @@ -12,7 +12,7 @@ #ifndef _NNTP_H_ #define _NNTP_H_ 1 -#include +#include #include "mx.h" #include diff --git a/pop/pop.h b/pop/pop.h index 495849b..5fa6271 100644 --- a/pop/pop.h +++ b/pop/pop.h @@ -13,7 +13,7 @@ #include #include "mx.h" -#include +#include #define POP_PORT 110 #define POP_SSL_PORT 995 diff --git a/pop/pop_lib.c b/pop/pop_lib.c index a8dfe5c..38454ef 100644 --- a/pop/pop_lib.c +++ b/pop/pop_lib.c @@ -26,7 +26,7 @@ #include "url.h" #include "pop.h" #if defined (USE_SSL) || defined (USE_GNUTLS) -# include +# include #endif /* given an POP mailbox name, return host, port, username and password */