updated build files

2016-04-28 15:57:20 +00:00
parent 616e24ee00
commit 5f46de1083
32 changed files with 68 additions and 69 deletions
--- a/qse/bld/qse.bkl
+++ b/qse/bld/qse.bkl
@ -186,8 +186,6 @@
 		mbwc.c 
 		mbwc-str.c 
 		mem.c 
-		nwad.c 
-		nwad-skad.c 
 		oht.c 
 		opt.c 
 		path-base.c 
@ -197,7 +195,6 @@
 		pma.c 
 		rbt.c 
 		rex.c 
-		sck.c
 		sll.c 
 		slmb.c 
 		str-beg.c 
@ -252,11 +249,14 @@
 		intr.c
 		mtx.c
 		mux.c 
+		nwad.c 
+		nwad-skad.c 
 		nwif.c 
 		nwif-cfg.c 
 		nwio.c
 		pio.c
 		rwl.c
+		sck.c
 		sio.c
 		task.c 
 		thr.c
--- a/qse/cmd/awk/Makefile.am
+++ b/qse/cmd/awk/Makefile.am
@ -19,8 +19,8 @@ bin_PROGRAMS = qseawk

 qseawk_SOURCES = awk.c
 qseawk_CFLAGS = $(PTHREAD_CFLAGS)
-qseawk_LDFLAGS = -L../../lib/awk -L../../lib/sys -L../../lib/cmn 
-qseawk_LDADD = -lqseawk -lqsesys -lqsecmn $(LIBM) $(LIBLTDL) $(PTHREAD_LIBS)
+qseawk_LDFLAGS = -L../../lib/awk -L../../lib/si -L../../lib/cmn 
+qseawk_LDADD = -lqseawk -lqsesi -lqsecmn $(LIBM) $(LIBLTDL) $(PTHREAD_LIBS)

 if WIN32
 if WCHAR
--- a/qse/cmd/awk/Makefile.in
+++ b/qse/cmd/awk/Makefile.in
@ -362,9 +362,9 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
 	$(LTDLINCL) $(am__append_1) $(am__append_2)
 qseawk_SOURCES = awk.c
 qseawk_CFLAGS = $(PTHREAD_CFLAGS)
-qseawk_LDFLAGS = -L../../lib/awk -L../../lib/sys -L../../lib/cmn \
+qseawk_LDFLAGS = -L../../lib/awk -L../../lib/si -L../../lib/cmn \
 	$(am__append_4)
-qseawk_LDADD = -lqseawk -lqsesys -lqsecmn $(LIBM) $(LIBLTDL) \
+qseawk_LDADD = -lqseawk -lqsesi -lqsecmn $(LIBM) $(LIBLTDL) \
 	$(PTHREAD_LIBS) $(am__append_3) $(am__append_5)
 all: all-am

--- a/qse/cmd/http/Makefile.am
+++ b/qse/cmd/http/Makefile.am
@ -11,8 +11,8 @@ qsecfg_DATA = httpd.conf httpd-mime.conf
 bin_PROGRAMS = qsehttpd qseursd

 qsehttpd_SOURCES = httpd.c
-qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/sys -L../../lib/io -L../../lib/cmn  
-qsehttpd_LDADD = -lqsexli -lqsehttp -lqseio -lqsesys -lqsecmn 
+qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/si -L../../lib/io -L../../lib/cmn  
+qsehttpd_LDADD = -lqsexli -lqsehttp -lqsesi -lqsecmn 

 if WIN32 
 if WCHAR
@ -21,7 +21,7 @@ endif
 endif

 qseursd_SOURCES = ursd.c
-qseursd_LDFLAGS = -L../../lib/sys -L../../lib/io -L../../lib/cmn
-qseursd_LDADD = -lqseio -lqsesys -lqsecmn 
+qseursd_LDFLAGS = -L../../lib/si -L../../lib/io -L../../lib/cmn
+qseursd_LDADD = -lqsesi -lqsecmn 

 EXTRA_DIST = $(qsecfg_DATA)
--- a/qse/cmd/http/Makefile.in
+++ b/qse/cmd/http/Makefile.in
@ -391,12 +391,11 @@ AM_CPPFLAGS = \
 qsecfgdir = $(sysconfdir)/qse
 qsecfg_DATA = httpd.conf httpd-mime.conf
 qsehttpd_SOURCES = httpd.c
-qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/sys -L../../lib/io -L../../lib/cmn  
-qsehttpd_LDADD = -lqsexli -lqsehttp -lqseio -lqsesys -lqsecmn \
-	$(am__append_1)
+qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/si -L../../lib/io -L../../lib/cmn  
+qsehttpd_LDADD = -lqsexli -lqsehttp -lqsesi -lqsecmn $(am__append_1)
 qseursd_SOURCES = ursd.c
-qseursd_LDFLAGS = -L../../lib/sys -L../../lib/io -L../../lib/cmn
-qseursd_LDADD = -lqseio -lqsesys -lqsecmn 
+qseursd_LDFLAGS = -L../../lib/si -L../../lib/io -L../../lib/cmn
+qseursd_LDADD = -lqsesi -lqsecmn 
 EXTRA_DIST = $(qsecfg_DATA)
 all: all-am

--- a/qse/cmd/http/ursd.c
+++ b/qse/cmd/http/ursd.c
@ -9,12 +9,12 @@
 #include <qse/cmn/htb.h>
 #include <qse/cmn/fmt.h>
 #include <qse/cmn/hton.h>
-#include <qse/cmn/sck.h>
-#include <qse/cmn/nwad.h>

-#include <qse/io/sio.h>
-#include <qse/io/pio.h>
-#include <qse/sys/mux.h>
+#include <qse/si/sck.h>
+#include <qse/si/nwad.h>
+#include <qse/si/sio.h>
+#include <qse/si/pio.h>
+#include <qse/si/mux.h>

 #include <signal.h>
 #include <locale.h>
--- a/qse/cmd/sed/Makefile.am
+++ b/qse/cmd/sed/Makefile.am
@ -8,8 +8,8 @@ bin_PROGRAMS = qsesed

 qsesed_SOURCES = sed.c
 qsesed_CFLAGS = $(PTHREAD_CFLAGS)
-qsesed_LDFLAGS = -L../../lib/sed -L../../lib/sys -L../../lib/cmn 
-qsesed_LDADD = -lqsesed -lqsesys -lqsecmn $(PTHREAD_LIBS)
+qsesed_LDFLAGS = -L../../lib/sed -L../../lib/si -L../../lib/cmn 
+qsesed_LDADD = -lqsesed -lqsesi -lqsecmn $(PTHREAD_LIBS)

 if WIN32 
 if WCHAR
--- a/qse/cmd/sed/Makefile.in
+++ b/qse/cmd/sed/Makefile.in
@ -355,8 +355,8 @@ AM_CPPFLAGS = \

 qsesed_SOURCES = sed.c
 qsesed_CFLAGS = $(PTHREAD_CFLAGS)
-qsesed_LDFLAGS = -L../../lib/sed -L../../lib/sys -L../../lib/cmn 
-qsesed_LDADD = -lqsesed -lqsesys -lqsecmn $(PTHREAD_LIBS) \
+qsesed_LDFLAGS = -L../../lib/sed -L../../lib/si -L../../lib/cmn 
+qsesed_LDADD = -lqsesed -lqsesi -lqsecmn $(PTHREAD_LIBS) \
 	$(am__append_1)
 all: all-am

--- a/qse/cmd/xli/Makefile.am
+++ b/qse/cmd/xli/Makefile.am
@ -7,8 +7,8 @@ AM_CPPFLAGS = \
 bin_PROGRAMS = qsexli

 qsexli_SOURCES = xli.c
-qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn 
-qsexli_LDADD = -lqsexli -lqsecmn
+qsexli_LDFLAGS = -L../../lib/xli -L../../lib/si -L../../lib/cmn 
+qsexli_LDADD = -lqsexli -lqsesi -lqsecmn

 if WIN32 
 if WCHAR
--- a/qse/cmd/xli/Makefile.in
+++ b/qse/cmd/xli/Makefile.in
@ -354,8 +354,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/include 

 qsexli_SOURCES = xli.c
-qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn 
-qsexli_LDADD = -lqsexli -lqsecmn $(am__append_1)
+qsexli_LDFLAGS = -L../../lib/xli -L../../lib/si -L../../lib/cmn 
+qsexli_LDADD = -lqsexli -lqsesi -lqsecmn $(am__append_1)
 all: all-am

 .SUFFIXES:
--- a/qse/include/qse/http/httpd.h
+++ b/qse/include/qse/http/httpd.h
@ -31,10 +31,10 @@
 #include <qse/macros.h>
 #include <qse/http/htre.h>
 #include <qse/http/htrd.h>
-#include <qse/cmn/nwad.h>
 #include <qse/cmn/time.h>
 #include <qse/cmn/tmr.h>
 #include <qse/cmn/env.h>
+#include <qse/si/nwad.h>

 typedef struct qse_httpd_t        qse_httpd_t;
 typedef struct qse_httpd_mate_t   qse_httpd_mate_t;
--- a/qse/include/qse/http/upxd.h
+++ b/qse/include/qse/http/upxd.h
@ -29,7 +29,7 @@

 #include <qse/types.h>
 #include <qse/macros.h>
-#include <qse/cmn/nwad.h>
+#include <qse/si/nwad.h>
 #include <qse/cmn/time.h>

 typedef struct qse_upxd_t qse_upxd_t;
--- a/qse/include/qse/si/Socket.hpp
+++ b/qse/include/qse/si/Socket.hpp
@ -24,11 +24,11 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_SYS_SOCKET_HPP_
-#define _QSE_SYS_SOCKET_HPP_
+#ifndef _QSE_SI_SOCKET_HPP_
+#define _QSE_SI_SOCKET_HPP_

 #include <qse/si/SocketAddress.hpp>
-#include <qse/cmn/sck.h>
+#include <qse/si/sck.h>

 /////////////////////////////////
 QSE_BEGIN_NAMESPACE(QSE)
--- a/qse/include/qse/si/SocketAddress.hpp
+++ b/qse/include/qse/si/SocketAddress.hpp
@ -24,10 +24,10 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_SYS_SOCKETADDRESS_HPP_
-#define _QSE_SYS_SOCKETADDRESS_HPP_
+#ifndef _QSE_SI_SOCKETADDRESS_HPP_
+#define _QSE_SI_SOCKETADDRESS_HPP_

-#include <qse/cmn/nwad.h>
+#include <qse/si/nwad.h>

 /////////////////////////////////
 QSE_BEGIN_NAMESPACE(QSE)
--- a/qse/include/qse/si/fio.h
+++ b/qse/include/qse/si/fio.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_FIO_H_
-#define _QSE_CMN_FIO_H_
+#ifndef _QSE_SI_FIO_H_
+#define _QSE_SI_FIO_H_

 /** @file
 * This file defines a simple file I/O interface.
--- a/qse/include/qse/si/nwad.h
+++ b/qse/include/qse/si/nwad.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_NWAD_H_
-#define _QSE_CMN_NWAD_H_
+#ifndef _QSE_SI_NWAD_H_
+#define _QSE_SI_NWAD_H_

 /** \file
 * This file defines functions and data types for handling
--- a/qse/include/qse/si/nwif.h
+++ b/qse/include/qse/si/nwif.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_NWIF_H_
-#define _QSE_CMN_NWIF_H_
+#ifndef _QSE_SI_NWIF_H_
+#define _QSE_SI_NWIF_H_

 #include <qse/types.h>
 #include <qse/macros.h>
--- a/qse/include/qse/si/nwio.h
+++ b/qse/include/qse/si/nwio.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_NWIO_H_
-#define _QSE_CMN_NWIO_H_
+#ifndef _QSE_SI_NWIO_H_
+#define _QSE_SI_NWIO_H_

 /** @file
 * This file defines a network-based text I/O interface.
--- a/qse/include/qse/si/pio.h
+++ b/qse/include/qse/si/pio.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_PIO_H_
-#define _QSE_CMN_PIO_H_
+#ifndef _QSE_SI_PIO_H_
+#define _QSE_SI_PIO_H_

 #include <qse/types.h>
 #include <qse/macros.h>
--- a/qse/include/qse/si/sio.h
+++ b/qse/include/qse/si/sio.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef _QSE_CMN_SIO_H_
-#define _QSE_CMN_SIO_H_
+#ifndef _QSE_SI_SIO_H_
+#define _QSE_SI_SIO_H_

 /** @file
 * This file defines a simple stream I/O interface.
--- a/qse/include/qse/si/task.h
+++ b/qse/include/qse/si/task.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_TASK_H_
-#define _QSE_CMN_TASK_H_
+#ifndef _QSE_SI_TASK_H_
+#define _QSE_SI_TASK_H_

 #include <qse/types.h>
 #include <qse/macros.h>
--- a/qse/include/qse/si/thr.h
+++ b/qse/include/qse/si/thr.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_THR_H_
-#define _QSE_CMN_THR_H_
+#ifndef _QSE_SI_THR_H_
+#define _QSE_SI_THR_H_

 #include <qse/types.h>
 #include <qse/macros.h>
--- a/qse/include/qse/si/tio.h
+++ b/qse/include/qse/si/tio.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_CMN_TIO_H_
-#define _QSE_CMN_TIO_H_
+#ifndef _QSE_SI_TIO_H_
+#define _QSE_SI_TIO_H_

 /** @file
 * This file provides an interface to a text stream processor.
--- a/qse/lib/awk/Makefile.am
+++ b/qse/lib/awk/Makefile.am
@ -4,7 +4,7 @@ CPPFLAGS_ALL_COMMON = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include

-LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined
+LDFLAGS_ALL_COMMON = -L. -L../cmn -L../si -version-info 1:0:0 -no-undefined

 ##################################################
 # MAIN LIBRARY 
@ -12,7 +12,7 @@ LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined

 CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL)
 LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) 
-LIBADD_LIB_COMMON = -lqsecmn -lqseio $(LIBM) $(LIBLTDL) 
+LIBADD_LIB_COMMON = -lqsecmn -lqsesi $(LIBM) $(LIBLTDL) 

 if WIN32
 # you must adjust the value of DEFAULT_MODPOSTFIX according 
--- a/qse/lib/awk/Makefile.in
+++ b/qse/lib/awk/Makefile.in
@ -544,7 +544,7 @@ CPPFLAGS_ALL_COMMON = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include

-LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined
+LDFLAGS_ALL_COMMON = -L. -L../cmn -L../si -version-info 1:0:0 -no-undefined

 ##################################################
 # MAIN LIBRARY 
@ -552,7 +552,7 @@ LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined
 CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) \
 	$(am__append_1) $(am__append_2)
 LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) 
-LIBADD_LIB_COMMON = -lqsecmn -lqseio $(LIBM) $(LIBLTDL) 
+LIBADD_LIB_COMMON = -lqsecmn -lqsesi $(LIBM) $(LIBLTDL) 
 lib_LTLIBRARIES = libqseawk.la $(am__append_3)
 libqseawk_la_SOURCES = awk.c err.c tree.c parse.c run.c rec.c val.c \
 	fnc.c misc.c rio.c std.c awk.h err.h rio.h val.h fnc.h misc.h \
--- a/qse/lib/awk/mod-sys.c
+++ b/qse/lib/awk/mod-sys.c
@ -28,8 +28,8 @@
 #include <qse/cmn/str.h>
 #include <qse/cmn/chr.h>
 #include <qse/cmn/time.h>
-#include <qse/cmn/nwad.h>
 #include <qse/cmn/mbwc.h>
+#include <qse/si/nwad.h>
 #include <qse/si/nwif.h>
 #include "../cmn/mem.h"

--- a/qse/lib/http/httpd-std.c
+++ b/qse/lib/http/httpd-std.c
@ -39,7 +39,7 @@
 #include <qse/si/sio.h>
 #include <qse/si/mux.h>
 #include <qse/si/nwif.h>
-#include <qse/cmn/sck.h>
+#include <qse/si/sck.h>

 #define STAT_REG   1
 #define STAT_DIR   2
--- a/qse/lib/si/Makefile.am
+++ b/qse/lib/si/Makefile.am
@ -32,7 +32,7 @@ libqsesi_la_SOURCES =  \

 libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS)
 libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
-libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS)
+libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS)

 if ENABLE_CXX
 lib_LTLIBRARIES += libqsesixx.la
--- a/qse/lib/si/Makefile.in
+++ b/qse/lib/si/Makefile.in
@ -127,7 +127,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libqsesi_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libqsesi_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libqsesi_la_OBJECTS = libqsesi_la-aio.lo libqsesi_la-aio-pro.lo \
 	libqsesi_la-aio-sck.lo libqsesi_la-aio-tmr.lo \
 	libqsesi_la-cnd.lo libqsesi_la-fio.lo libqsesi_la-intr.lo \
@ -441,7 +441,7 @@ libqsesi_la_SOURCES = \

 libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS)
 libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
-libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS)
+libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS)
@ENABLE_CXX_TRUE@libqsesixx_la_SOURCES = \
@ENABLE_CXX_TRUE@	SocketAddress.cpp \
@ENABLE_CXX_TRUE@	Socket.cpp
--- a/qse/lib/si/nwif-cfg.c
+++ b/qse/lib/si/nwif-cfg.c
@ -52,7 +52,7 @@
 #elif defined(__DOS__)
 	/* TODO: */
 #else
-#	include "syscall.h"
+#	include "../cmn/syscall.h"
 #	include <sys/socket.h>
 #	include <netinet/in.h>
 #	if defined(HAVE_SYS_IOCTL_H)
--- a/qse/lib/si/nwif.c
+++ b/qse/lib/si/nwif.c
@ -36,7 +36,7 @@
 #elif defined(__DOS__)
 	/* TODO: */
 #else
-#	include "syscall.h"
+#	include "../cmn/syscall.h"
 #	include <sys/socket.h>
 #	if defined(HAVE_SYS_IOCTL_H)
 #		include <sys/ioctl.h>
--- a/qse/lib/si/sck.c
+++ b/qse/lib/si/sck.c
@ -24,7 +24,7 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <qse/cmn/sck.h>
+#include <qse/si/sck.h>

 #if defined(_WIN32)
 #	include <winsock2.h>
@ -50,12 +50,12 @@

 #elif defined(HAVE_T_CONNECT) && !defined(HAVE_CONNECT) && defined(HAVE_TIUSER_H)

-#	include "syscall.h"
+#	include "../cmn/syscall.h"
 #	include <tiuser.h>
 #	define USE_TLI

 #else
-#	include "syscall.h"
+#	include "../cmn/syscall.h"
 #	include <sys/socket.h>
 #	include <netinet/in.h>
 #	if defined(HAVE_NETINET_SCTP_H)