From 66dfa3a2fd342ff890a5d793cd9e4a7aedcb7ae5 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 29 Apr 2016 03:55:42 +0000 Subject: [PATCH] did more migrating works --- qse/bld/msdos-watcom/makefile | 72 +-- qse/bld/os2-watcom/makefile | 148 ++--- qse/bld/qse.bkl | 19 +- qse/bld/win32-borland/makefile | 148 ++--- qse/bld/win32-msvc/makefile | 148 ++--- qse/bld/win32-watcom/makefile | 148 ++--- qse/cmd/awk/awk.c | 3 +- qse/cmd/http/Makefile.am | 4 +- qse/cmd/http/Makefile.in | 4 +- qse/cmd/sed/sed.c | 4 +- qse/cmd/xli/xli.c | 4 +- qse/include/qse/cmn/Makefile.am | 3 - qse/include/qse/cmn/Makefile.in | 24 +- qse/include/qse/cmn/si | 111 ---- qse/include/qse/http/stdhttpd.h | 4 +- qse/include/qse/si/Makefile.am | 3 + qse/include/qse/si/Makefile.in | 3 + qse/include/qse/{cmn => si}/dir.h | 0 qse/include/qse/{cmn => si}/fs.h | 4 +- qse/include/qse/{cmn => si}/glob.h | 4 +- qse/lib/awk/Awk.cpp | 4 +- qse/lib/awk/Makefile.am | 10 +- qse/lib/awk/Makefile.in | 23 +- qse/lib/awk/StdAwk.cpp | 2 +- qse/lib/awk/{awk.h => awk-prv.h} | 6 +- qse/lib/awk/awk.c | 2 +- qse/lib/awk/err.c | 2 +- qse/lib/awk/fnc.c | 2 +- qse/lib/awk/misc.c | 2 +- qse/lib/awk/mod-dir.c | 4 +- qse/lib/awk/mod-math.c | 2 +- qse/lib/awk/mod-sed.c | 2 +- qse/lib/awk/mod-str.c | 2 +- qse/lib/awk/mod-sys.c | 2 +- qse/lib/awk/mod-uci.c | 2 +- qse/lib/awk/parse.c | 2 +- qse/lib/awk/rec.c | 2 +- qse/lib/awk/rio.c | 2 +- qse/lib/awk/run.c | 2 +- qse/lib/awk/std.c | 2 +- qse/lib/awk/std.h | 2 +- qse/lib/awk/tree.c | 2 +- qse/lib/awk/val.c | 4 +- qse/lib/cmn/Makefile.am | 15 +- qse/lib/cmn/Makefile.in | 89 ++- qse/lib/cmn/Mmgr.cpp | 2 +- qse/lib/cmn/String.cpp | 2 +- qse/lib/cmn/assert.c | 2 +- qse/lib/cmn/dll.c | 2 +- qse/lib/cmn/env.c | 2 +- qse/lib/cmn/fma.c | 2 +- qse/lib/cmn/fmt-out.c | 4 +- qse/lib/cmn/{fmt.h => fmt-prv.h} | 4 +- qse/lib/cmn/htb.c | 2 +- qse/lib/cmn/ipad.c | 2 +- qse/lib/cmn/lda.c | 2 +- qse/lib/cmn/main.c | 2 +- qse/lib/cmn/mbwc-str.c | 2 +- qse/lib/cmn/{mem.h => mem-prv.h} | 4 +- qse/lib/cmn/oht.c | 2 +- qse/lib/cmn/pma.c | 2 +- qse/lib/cmn/rbt.c | 2 +- qse/lib/cmn/rex.c | 2 +- qse/lib/cmn/sll.c | 2 +- qse/lib/cmn/slmb.c | 2 +- qse/lib/cmn/str-cnv.c | 2 +- qse/lib/cmn/str-cpy.c | 2 +- qse/lib/cmn/str-dup.c | 2 +- qse/lib/cmn/str-dyn.c | 2 +- qse/lib/cmn/str-dyn.h | 4 +- qse/lib/cmn/str-fmt.c | 2 +- qse/lib/cmn/str-trm.c | 2 +- qse/lib/cmn/time.c | 2 +- qse/lib/cmn/tmr.c | 2 +- qse/lib/cmn/tre.h | 2 +- qse/lib/cmn/uri.c | 2 +- qse/lib/cmn/xma.c | 2 +- qse/lib/http/Makefile.am | 4 +- qse/lib/http/Makefile.in | 4 +- qse/lib/http/htrd.c | 2 +- qse/lib/http/htre.c | 2 +- qse/lib/http/http.c | 2 +- qse/lib/http/httpd-cgi.c | 2 +- qse/lib/http/httpd-dir.c | 2 +- qse/lib/http/httpd-file.c | 2 +- qse/lib/http/httpd-proxy.c | 2 +- qse/lib/http/httpd-std.c | 4 +- qse/lib/http/httpd-task.c | 2 +- qse/lib/http/httpd-text.c | 2 +- qse/lib/http/httpd.c | 2 +- qse/lib/http/upxd.h | 2 +- qse/lib/sed/Makefile.am | 12 +- qse/lib/sed/Makefile.in | 17 +- qse/lib/sed/Sed.cpp | 4 +- qse/lib/sed/StdSed.cpp | 4 +- qse/lib/sed/err.c | 4 +- qse/lib/sed/{sed.h => sed-prv.h} | 4 +- qse/lib/sed/sed.c | 4 +- qse/lib/sed/std.c | 4 +- qse/lib/si/Makefile.am | 15 +- qse/lib/si/Makefile.in | 99 ++- qse/lib/si/SocketAddress.cpp | 2 +- qse/lib/si/aio-prv.h | 2 +- qse/lib/si/cnd.c | 2 +- qse/lib/{cmn => si}/dir.c | 8 +- qse/lib/si/fio.c | 2 +- qse/lib/{cmn => si}/fs-attr.c | 4 +- qse/lib/{cmn => si}/fs-copy.c | 4 +- qse/lib/{cmn => si}/fs-delete.c | 2 +- qse/lib/{cmn => si}/fs-err.c | 2 +- qse/lib/{cmn => si}/fs-make.c | 2 +- qse/lib/{cmn => si}/fs-move.c | 4 +- qse/lib/{cmn/fs.h => si/fs-prv.h} | 8 +- qse/lib/{cmn => si}/fs.c | 4 +- qse/lib/{cmn/glob.h => si/glob-imp.h} | 0 qse/lib/{cmn => si}/glob.c | 13 +- qse/lib/si/mtx.c | 2 +- qse/lib/si/mux.c | 2 +- qse/lib/si/nwad-skad.c | 2 +- qse/lib/si/nwad.c | 2 +- qse/lib/si/nwif-cfg.c | 2 +- qse/lib/si/nwif.c | 2 +- qse/lib/si/nwio.c | 2 +- qse/lib/si/pio.c | 2 +- qse/lib/si/rwl.c | 2 +- qse/lib/si/sio.c | 4 +- qse/lib/si/task.c | 2 +- qse/lib/si/thr.c | 2 +- qse/lib/si/tio.c | 2 +- qse/lib/xli/Makefile.am | 4 +- qse/lib/xli/Makefile.in | 4 +- qse/lib/xli/err.c | 2 +- qse/lib/xli/std.c | 2 +- qse/lib/xli/xli.h | 2 +- qse/samples/awk/awk01.c | 2 +- qse/samples/awk/awk02.c | 2 +- qse/samples/awk/awk03.c | 2 +- qse/samples/awk/awk04.c | 2 +- qse/samples/awk/awk05.c | 2 +- qse/samples/awk/awk06.c | 2 +- qse/samples/awk/awk07.c | 2 +- qse/samples/awk/awk08.c | 2 +- qse/samples/awk/awk09.c | 2 +- qse/samples/awk/awk10.c | 2 +- qse/samples/awk/awk11.c | 2 +- qse/samples/awk/awk12.c | 2 +- qse/samples/awk/awk15.c | 2 +- qse/samples/awk/awk22.cpp | 2 +- qse/samples/awk/awk23.cpp | 2 +- qse/samples/awk/awk24.cpp | 2 +- qse/samples/awk/awk25.cpp | 2 +- qse/samples/awk/awk26.cpp | 2 +- qse/samples/awk/awk27.cpp | 2 +- qse/samples/awk/awk28.cpp | 2 +- qse/samples/cmn/Makefile.am | 19 +- qse/samples/cmn/Makefile.in | 145 +---- qse/samples/cmn/chr01.c | 2 +- qse/samples/cmn/dll.c | 2 +- qse/samples/cmn/env01.c | 2 +- qse/samples/cmn/fma.c | 2 +- qse/samples/cmn/fmt01.c | 2 +- qse/samples/cmn/fmt02.c | 2 +- qse/samples/cmn/hl01.cpp | 2 +- qse/samples/cmn/htb01.c | 2 +- qse/samples/cmn/htb02.cpp | 2 +- qse/samples/cmn/ipad01.c | 2 +- qse/samples/cmn/lda.c | 2 +- qse/samples/cmn/main01.c | 2 +- qse/samples/cmn/main02.c | 2 +- qse/samples/cmn/mbwc01.c | 2 +- qse/samples/cmn/mbwc02.c | 2 +- qse/samples/cmn/oht.c | 2 +- qse/samples/cmn/path01.c | 2 +- qse/samples/cmn/pma.c | 2 +- qse/samples/cmn/rbt01.c | 2 +- qse/samples/cmn/rbt03.cpp | 2 +- qse/samples/cmn/rex01.c | 2 +- qse/samples/cmn/sll.c | 2 +- qse/samples/cmn/slmb01.c | 2 +- qse/samples/cmn/str01.c | 2 +- qse/samples/cmn/str02.cpp | 2 +- qse/samples/cmn/time.c | 2 +- qse/samples/cmn/tre01.c | 2 +- qse/samples/cmn/uri01.c | 2 +- qse/samples/cmn/xma.c | 2 +- qse/samples/http/Makefile.am | 7 +- qse/samples/http/Makefile.in | 31 +- qse/samples/http/httpd01.c | 31 +- qse/samples/http/httpd02.c | 296 --------- qse/samples/http/upxd01.c | 897 -------------------------- qse/samples/sed/sed01.c | 2 +- qse/samples/sed/sed02.c | 2 +- qse/samples/sed/sed03.c | 2 +- qse/samples/si/Makefile.am | 22 +- qse/samples/si/Makefile.in | 123 +++- qse/samples/{cmn => si}/dir01.c | 4 +- qse/samples/si/fio01.c | 4 +- qse/samples/si/fio02.c | 4 +- qse/samples/{cmn => si}/fs01.c | 5 +- qse/samples/{cmn => si}/fs02.c | 4 +- qse/samples/{cmn => si}/fs03.c | 4 +- qse/samples/{cmn => si}/glob01.c | 4 +- qse/samples/{cmn => si}/nwad01.c | 4 +- qse/samples/{cmn => si}/nwif01.c | 4 +- qse/samples/{cmn => si}/nwif02.c | 4 +- qse/samples/si/pio01.c | 4 +- qse/samples/si/rwl01.c | 8 +- qse/samples/si/sio01.c | 2 +- qse/samples/si/sio02.c | 2 +- qse/samples/si/sio03.c | 2 +- qse/samples/{cmn => si}/task01.c | 4 +- 211 files changed, 965 insertions(+), 2194 deletions(-) delete mode 100644 qse/include/qse/cmn/si rename qse/include/qse/{cmn => si}/dir.h (100%) rename qse/include/qse/{cmn => si}/fs.h (99%) rename qse/include/qse/{cmn => si}/glob.h (98%) rename qse/lib/awk/{awk.h => awk-prv.h} (98%) rename qse/lib/cmn/{fmt.h => fmt-prv.h} (98%) rename qse/lib/cmn/{mem.h => mem-prv.h} (97%) rename qse/lib/sed/{sed.h => sed-prv.h} (98%) rename qse/lib/{cmn => si}/dir.c (99%) rename qse/lib/{cmn => si}/fs-attr.c (98%) rename qse/lib/{cmn => si}/fs-copy.c (99%) rename qse/lib/{cmn => si}/fs-delete.c (99%) rename qse/lib/{cmn => si}/fs-err.c (99%) rename qse/lib/{cmn => si}/fs-make.c (99%) rename qse/lib/{cmn => si}/fs-move.c (99%) rename qse/lib/{cmn/fs.h => si/fs-prv.h} (98%) rename qse/lib/{cmn => si}/fs.c (99%) rename qse/lib/{cmn/glob.h => si/glob-imp.h} (100%) rename qse/lib/{cmn => si}/glob.c (97%) delete mode 100644 qse/samples/http/httpd02.c delete mode 100644 qse/samples/http/upxd01.c rename qse/samples/{cmn => si}/dir01.c (98%) rename qse/samples/{cmn => si}/fs01.c (97%) rename qse/samples/{cmn => si}/fs02.c (98%) rename qse/samples/{cmn => si}/fs03.c (98%) rename qse/samples/{cmn => si}/glob01.c (96%) rename qse/samples/{cmn => si}/nwad01.c (98%) rename qse/samples/{cmn => si}/nwif01.c (97%) rename qse/samples/{cmn => si}/nwif02.c (98%) rename qse/samples/{cmn => si}/task01.c (97%) diff --git a/qse/bld/msdos-watcom/makefile b/qse/bld/msdos-watcom/makefile index c57f0219..6c700f12 100644 --- a/qse/bld/msdos-watcom/makefile +++ b/qse/bld/msdos-watcom/makefile @@ -212,7 +212,6 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_alg_sort.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_assert.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_env.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_gdl.obj & @@ -220,14 +219,6 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_ipad.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_lda.obj & @@ -297,7 +288,16 @@ LIBQSESI_CFLAGS = $(____DOS_CFLAG_p) -i=..\..\include $(CPPFLAGS_BUILD) & -ox $(CPPFLAGS) $(CFLAGS) LIBQSESI_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_mtx.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_mux.obj & @@ -561,9 +561,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_assert $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj : .AUTODEPEND ..\..\lib\cmn\chr.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj : .AUTODEPEND ..\..\lib\cmn\dir.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj : .AUTODEPEND ..\..\lib\cmn\dll.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -585,30 +582,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_in $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj : .AUTODEPEND ..\..\lib\cmn\fmt-out.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj : .AUTODEPEND ..\..\lib\cmn\fs.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj : .AUTODEPEND ..\..\lib\cmn\fs-attr.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj : .AUTODEPEND ..\..\lib\cmn\fs-copy.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj : .AUTODEPEND ..\..\lib\cmn\fs-delete.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj : .AUTODEPEND ..\..\lib\cmn\fs-err.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj : .AUTODEPEND ..\..\lib\cmn\glob.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj : .AUTODEPEND ..\..\lib\cmn\hton.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -804,9 +777,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_uni.ob $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj : .AUTODEPEND ..\..\lib\si\cnd.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj : .AUTODEPEND ..\..\lib\si\dir.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj : .AUTODEPEND ..\..\lib\si\fio.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj : .AUTODEPEND ..\..\lib\si\fs.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj : .AUTODEPEND ..\..\lib\si\fs-attr.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj : .AUTODEPEND ..\..\lib\si\fs-copy.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj : .AUTODEPEND ..\..\lib\si\fs-delete.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj : .AUTODEPEND ..\..\lib\si\fs-err.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj : .AUTODEPEND ..\..\lib\si\fs-make.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj : .AUTODEPEND ..\..\lib\si\fs-move.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj : .AUTODEPEND ..\..\lib\si\glob.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj : .AUTODEPEND ..\..\lib\si\intr.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< diff --git a/qse/bld/os2-watcom/makefile b/qse/bld/os2-watcom/makefile index fb36a949..6f2595e8 100644 --- a/qse/bld/os2-watcom/makefile +++ b/qse/bld/os2-watcom/makefile @@ -340,7 +340,6 @@ DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_alg_sort.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_assert.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_env.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_gdl.obj & @@ -348,14 +347,6 @@ DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_ipad.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_lda.obj & @@ -429,7 +420,6 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_alg_sort.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_assert.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_env.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_gdl.obj & @@ -437,14 +427,6 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_ipad.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_lda.obj & @@ -513,7 +495,16 @@ DLLQSESI_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & $(CPPFLAGS_TCPV40HDRS) -wx $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSESI_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mtx.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mux.obj & @@ -534,7 +525,16 @@ LIBQSESI_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & $(CPPFLAGS_TCPV40HDRS) -wx $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) LIBQSESI_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mtx.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mux.obj & @@ -892,14 +892,14 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsea !endif !ifeq SHARED on -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\awk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqseawk___depname) $(__dllqseawk___depname) +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\awk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqsesi___depname) $(__libqseawk___depname) $(__dllqseawk___depname) @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc $(__DEBUG_INFO_1_7) $(LDFLAGS) @for %i in ($(MODQSEAWKDIR_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsesi.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc system os2v2 dll wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc @@ -1142,9 +1142,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj : .AUTODEPEND ..\..\lib\cmn\chr.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj : .AUTODEPEND ..\..\lib\cmn\dir.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj : .AUTODEPEND ..\..\lib\cmn\dll.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1166,30 +1163,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj : .AUTODEPEND ..\..\lib\cmn\fmt-out.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj : .AUTODEPEND ..\..\lib\cmn\fs.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj : .AUTODEPEND ..\..\lib\cmn\fs-attr.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj : .AUTODEPEND ..\..\lib\cmn\fs-copy.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj : .AUTODEPEND ..\..\lib\cmn\fs-delete.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj : .AUTODEPEND ..\..\lib\cmn\fs-err.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj : .AUTODEPEND ..\..\lib\cmn\glob.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj : .AUTODEPEND ..\..\lib\cmn\hton.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1400,9 +1373,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj : .AUTODEPEND ..\..\lib\cmn\chr.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj : .AUTODEPEND ..\..\lib\cmn\dir.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj : .AUTODEPEND ..\..\lib\cmn\dll.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -1424,30 +1394,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj : .AUTODEPEND ..\..\lib\cmn\fmt-out.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj : .AUTODEPEND ..\..\lib\cmn\fs.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj : .AUTODEPEND ..\..\lib\cmn\fs-attr.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj : .AUTODEPEND ..\..\lib\cmn\fs-copy.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj : .AUTODEPEND ..\..\lib\cmn\fs-delete.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj : .AUTODEPEND ..\..\lib\cmn\fs-err.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj : .AUTODEPEND ..\..\lib\cmn\glob.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj : .AUTODEPEND ..\..\lib\cmn\hton.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -1643,9 +1589,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj : .AUTODEPEND ..\..\lib\si\cnd.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj : .AUTODEPEND ..\..\lib\si\dir.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj : .AUTODEPEND ..\..\lib\si\fio.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj : .AUTODEPEND ..\..\lib\si\fs.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj : .AUTODEPEND ..\..\lib\si\fs-attr.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj : .AUTODEPEND ..\..\lib\si\fs-copy.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj : .AUTODEPEND ..\..\lib\si\fs-delete.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj : .AUTODEPEND ..\..\lib\si\fs-err.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj : .AUTODEPEND ..\..\lib\si\fs-make.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj : .AUTODEPEND ..\..\lib\si\fs-move.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj : .AUTODEPEND ..\..\lib\si\glob.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj : .AUTODEPEND ..\..\lib\si\intr.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< @@ -1694,9 +1667,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj : .AUTODEPEND ..\..\lib\si\cnd.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj : .AUTODEPEND ..\..\lib\si\dir.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj : .AUTODEPEND ..\..\lib\si\fio.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj : .AUTODEPEND ..\..\lib\si\fs.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj : .AUTODEPEND ..\..\lib\si\fs-attr.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj : .AUTODEPEND ..\..\lib\si\fs-copy.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj : .AUTODEPEND ..\..\lib\si\fs-delete.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj : .AUTODEPEND ..\..\lib\si\fs-err.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj : .AUTODEPEND ..\..\lib\si\fs-make.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj : .AUTODEPEND ..\..\lib\si\fs-move.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj : .AUTODEPEND ..\..\lib\si\glob.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj : .AUTODEPEND ..\..\lib\si\intr.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< diff --git a/qse/bld/qse.bkl b/qse/bld/qse.bkl index 697090c2..0891c658 100644 --- a/qse/bld/qse.bkl +++ b/qse/bld/qse.bkl @@ -162,7 +162,6 @@ alg-sort.c assert.c chr.c - dir.c dll.c env.c gdl.c @@ -170,14 +169,6 @@ fma.c fmt-intmax.c fmt-out.c - fs.c - fs-attr.c - fs-copy.c - fs-delete.c - fs-err.c - fs-make.c - fs-move.c - glob.c hton.c ipad.c lda.c @@ -245,7 +236,16 @@ cnd.c + dir.c fio.c + fs.c + fs-attr.c + fs-copy.c + fs-delete.c + fs-err.c + fs-make.c + fs-move.c + glob.c intr.c mtx.c mux.c @@ -466,6 +466,7 @@ ../../lib/awk mod-dir.c libqsecmn + libqsesi libqseawk dllqseawk diff --git a/qse/bld/win32-borland/makefile b/qse/bld/win32-borland/makefile index 561afb56..fbe45777 100644 --- a/qse/bld/win32-borland/makefile +++ b/qse/bld/win32-borland/makefile @@ -98,7 +98,6 @@ DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_alg_sort.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_assert.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_env.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_gdl.obj \ @@ -106,14 +105,6 @@ DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_ipad.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_lda.obj \ @@ -188,7 +179,6 @@ LIBQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_alg_sort.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_assert.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_env.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_gdl.obj \ @@ -196,14 +186,6 @@ LIBQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_ipad.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_lda.obj \ @@ -273,7 +255,16 @@ DLLQSESI_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS) $(CFLAGS) DLLQSESI_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mtx.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mux.obj \ @@ -295,7 +286,16 @@ LIBQSESI_CFLAGS = -I$(BCCDIR)\include -I..\..\include $(CPPFLAGS_BUILD) \ $(CPPFLAGS) $(CFLAGS) LIBQSESI_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mtx.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mux.obj \ @@ -932,9 +932,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsea !endif !if "$(SHARED)" == "on" -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqseawk___depname) $(__dllqseawk___depname) +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqsesi___depname) $(__libqseawk___depname) $(__dllqseawk___depname) ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUG_INFO) $(LDFLAGS) @&&| - c0d32.obj $(MODQSEAWKDIR_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib import32.lib cw32mt.lib,, + c0d32.obj $(MODQSEAWKDIR_OBJECTS),$@,, $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsesi.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib import32.lib cw32mt.lib,, | implib -f $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir $@ !endif @@ -1089,9 +1089,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj: ..\..\lib\cmn\chr.c $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\chr.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj: ..\..\lib\cmn\dir.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\dir.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj: ..\..\lib\cmn\dll.c $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\dll.c @@ -1113,30 +1110,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj: ..\..\lib\cmn\fmt-out.c $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fmt-out.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj: ..\..\lib\cmn\fs.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj: ..\..\lib\cmn\fs-attr.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-attr.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj: ..\..\lib\cmn\fs-copy.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-copy.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj: ..\..\lib\cmn\glob.c - $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\glob.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj: ..\..\lib\cmn\hton.c $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\hton.c @@ -1347,9 +1320,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj: ..\..\lib\cmn\chr.c $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\chr.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj: ..\..\lib\cmn\dir.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\dir.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj: ..\..\lib\cmn\dll.c $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\dll.c @@ -1371,30 +1341,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj: ..\..\lib\cmn\fmt-out.c $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fmt-out.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj: ..\..\lib\cmn\fs.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj: ..\..\lib\cmn\fs-attr.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-attr.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj: ..\..\lib\cmn\fs-copy.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-copy.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj: ..\..\lib\cmn\glob.c - $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\glob.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj: ..\..\lib\cmn\hton.c $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\hton.c @@ -1590,9 +1536,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj: ..\..\lib\si\cnd.c $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\cnd.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj: ..\..\lib\si\dir.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\dir.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj: ..\..\lib\si\fio.c $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fio.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj: ..\..\lib\si\fs.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj: ..\..\lib\si\fs-attr.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-attr.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj: ..\..\lib\si\fs-copy.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-copy.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj: ..\..\lib\si\fs-delete.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-delete.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj: ..\..\lib\si\fs-err.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-err.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj: ..\..\lib\si\fs-make.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-make.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj: ..\..\lib\si\fs-move.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-move.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj: ..\..\lib\si\glob.c + $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\glob.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj: ..\..\lib\si\intr.c $(CC) -q -c -P- -o$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\intr.c @@ -1641,9 +1614,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj: ..\..\lib\si\cnd.c $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\cnd.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj: ..\..\lib\si\dir.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\dir.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj: ..\..\lib\si\fio.c $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fio.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj: ..\..\lib\si\fs.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj: ..\..\lib\si\fs-attr.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-attr.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj: ..\..\lib\si\fs-copy.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-copy.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj: ..\..\lib\si\fs-delete.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-delete.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj: ..\..\lib\si\fs-err.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-err.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj: ..\..\lib\si\fs-make.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-make.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj: ..\..\lib\si\fs-move.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-move.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj: ..\..\lib\si\glob.c + $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\glob.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj: ..\..\lib\si\intr.c $(CC) -q -c -P- -o$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\intr.c diff --git a/qse/bld/win32-msvc/makefile b/qse/bld/win32-msvc/makefile index e822945f..94f916f5 100644 --- a/qse/bld/win32-msvc/makefile +++ b/qse/bld/win32-msvc/makefile @@ -67,7 +67,6 @@ DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_alg_sort.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_assert.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_env.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_gdl.obj \ @@ -75,14 +74,6 @@ DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_ipad.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_lda.obj \ @@ -159,7 +150,6 @@ LIBQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_alg_sort.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_assert.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_env.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_gdl.obj \ @@ -167,14 +157,6 @@ LIBQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_ipad.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_lda.obj \ @@ -246,7 +228,16 @@ DLLQSESI_CFLAGS = /MD$(__DEBUG_INFO_3_0) /DWIN32 /I..\..\include \ /O2 $(CPPFLAGS) $(CFLAGS) DLLQSESI_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mtx.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mux.obj \ @@ -270,7 +261,16 @@ LIBQSESI_CFLAGS = /MD$(__DEBUG_INFO_3_0) /DWIN32 /I..\..\include \ /O2 $(CPPFLAGS) $(CFLAGS) LIBQSESI_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mtx.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mux.obj \ @@ -1027,9 +1027,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsea !endif !if "$(SHARED)" == "on" -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqseawk___depname) $(__dllqseawk___depname) +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.dll: $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqsesi___depname) $(__libqseawk___depname) $(__dllqseawk___depname) link /DLL /NOLOGO /OUT:$@ $(__DEBUG_INFO_28) /pdb:"$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.pdb" $(__DEBUG_INFO_117) $(LDFLAGS) @<< - $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.lib + $(MODQSEAWKDIR_OBJECTS) $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsesi.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib /IMPLIB:$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.lib << !endif @@ -1174,9 +1174,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj: ..\..\lib\cmn\chr.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\chr.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj: ..\..\lib\cmn\dir.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\dir.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj: ..\..\lib\cmn\dll.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\dll.c @@ -1198,30 +1195,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj: ..\..\lib\cmn\fmt-out.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fmt-out.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj: ..\..\lib\cmn\fs.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj: ..\..\lib\cmn\fs-attr.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-attr.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj: ..\..\lib\cmn\fs-copy.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-copy.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj: ..\..\lib\cmn\glob.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\glob.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj: ..\..\lib\cmn\hton.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\hton.c @@ -1432,9 +1405,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj: ..\..\lib\cmn\chr.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\chr.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj: ..\..\lib\cmn\dir.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\dir.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj: ..\..\lib\cmn\dll.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\dll.c @@ -1456,30 +1426,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj: ..\..\lib\cmn\fmt-out.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fmt-out.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj: ..\..\lib\cmn\fs.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj: ..\..\lib\cmn\fs-attr.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-attr.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj: ..\..\lib\cmn\fs-copy.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-copy.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj: ..\..\lib\cmn\fs-delete.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-delete.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj: ..\..\lib\cmn\fs-err.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-err.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj: ..\..\lib\cmn\fs-make.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-make.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj: ..\..\lib\cmn\fs-move.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\fs-move.c - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj: ..\..\lib\cmn\glob.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\glob.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj: ..\..\lib\cmn\hton.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\hton.c @@ -1675,9 +1621,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj: ..\..\lib\si\cnd.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\cnd.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj: ..\..\lib\si\dir.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\dir.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj: ..\..\lib\si\fio.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fio.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj: ..\..\lib\si\fs.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj: ..\..\lib\si\fs-attr.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-attr.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj: ..\..\lib\si\fs-copy.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-copy.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj: ..\..\lib\si\fs-delete.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-delete.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj: ..\..\lib\si\fs-err.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-err.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj: ..\..\lib\si\fs-make.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-make.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj: ..\..\lib\si\fs-move.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\fs-move.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj: ..\..\lib\si\glob.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\glob.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj: ..\..\lib\si\intr.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSESI_CFLAGS) ..\..\lib\si\intr.c @@ -1726,9 +1699,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj: ..\..\lib\si\cnd.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\cnd.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj: ..\..\lib\si\dir.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\dir.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj: ..\..\lib\si\fio.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fio.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj: ..\..\lib\si\fs.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj: ..\..\lib\si\fs-attr.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-attr.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj: ..\..\lib\si\fs-copy.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-copy.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj: ..\..\lib\si\fs-delete.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-delete.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj: ..\..\lib\si\fs-err.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-err.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj: ..\..\lib\si\fs-make.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-make.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj: ..\..\lib\si\fs-move.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\fs-move.c + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj: ..\..\lib\si\glob.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\glob.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj: ..\..\lib\si\intr.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSESI_CFLAGS) ..\..\lib\si\intr.c diff --git a/qse/bld/win32-watcom/makefile b/qse/bld/win32-watcom/makefile index 24917942..5c183c48 100644 --- a/qse/bld/win32-watcom/makefile +++ b/qse/bld/win32-watcom/makefile @@ -329,7 +329,6 @@ DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_alg_sort.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_assert.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_env.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_gdl.obj & @@ -337,14 +336,6 @@ DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_intmax.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_ipad.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_lda.obj & @@ -418,7 +409,6 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_alg_sort.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_assert.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_env.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_gdl.obj & @@ -426,14 +416,6 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_intmax.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_ipad.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_lda.obj & @@ -502,7 +484,16 @@ DLLQSESI_CFLAGS = -bd -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & $(CPPFLAGS_TCPV40HDRS) -wx $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) DLLQSESI_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mtx.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_mux.obj & @@ -523,7 +514,16 @@ LIBQSESI_CFLAGS = -i=..\..\include $(CPPFLAGS_BUILD) $(CPPFLAGS_CHAR) & $(CPPFLAGS_TCPV40HDRS) -wx $(__DEBUG_INFO) -bm -ot -ox $(CPPFLAGS) $(CFLAGS) LIBQSESI_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mtx.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_mux.obj & @@ -881,14 +881,14 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsea !endif !ifeq SHARED on -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqseawk___depname) $(__dllqseawk___depname) +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk-dir.dll : $(MODQSEAWKDIR_OBJECTS) $(__libqsecmn___depname) $(__libqsesi___depname) $(__libqseawk___depname) $(__dllqseawk___depname) @%create $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc option quiet @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc name $^@ @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc $(__DEBUG_INFO_1_7) $(LDFLAGS) @for %i in ($(MODQSEAWKDIR_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc file %i - @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc library %i + @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qsesi.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\qseawk.lib) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc library %i @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc system nt_dll wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\modqseawkdir.lbc @@ -1131,9 +1131,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_chr.obj : .AUTODEPEND ..\..\lib\cmn\chr.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dir.obj : .AUTODEPEND ..\..\lib\cmn\dir.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_dll.obj : .AUTODEPEND ..\..\lib\cmn\dll.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1155,30 +1152,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fmt_out.obj : .AUTODEPEND ..\..\lib\cmn\fmt-out.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs.obj : .AUTODEPEND ..\..\lib\cmn\fs.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_attr.obj : .AUTODEPEND ..\..\lib\cmn\fs-attr.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_copy.obj : .AUTODEPEND ..\..\lib\cmn\fs-copy.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_delete.obj : .AUTODEPEND ..\..\lib\cmn\fs-delete.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_err.obj : .AUTODEPEND ..\..\lib\cmn\fs-err.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_glob.obj : .AUTODEPEND ..\..\lib\cmn\glob.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_hton.obj : .AUTODEPEND ..\..\lib\cmn\hton.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1389,9 +1362,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_chr.obj : .AUTODEPEND ..\..\lib\cmn\chr.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dir.obj : .AUTODEPEND ..\..\lib\cmn\dir.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_dll.obj : .AUTODEPEND ..\..\lib\cmn\dll.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -1413,30 +1383,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fmt_out.obj : .AUTODEPEND ..\..\lib\cmn\fmt-out.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs.obj : .AUTODEPEND ..\..\lib\cmn\fs.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_attr.obj : .AUTODEPEND ..\..\lib\cmn\fs-attr.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_copy.obj : .AUTODEPEND ..\..\lib\cmn\fs-copy.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_delete.obj : .AUTODEPEND ..\..\lib\cmn\fs-delete.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_err.obj : .AUTODEPEND ..\..\lib\cmn\fs-err.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_make.obj : .AUTODEPEND ..\..\lib\cmn\fs-make.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_fs_move.obj : .AUTODEPEND ..\..\lib\cmn\fs-move.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_glob.obj : .AUTODEPEND ..\..\lib\cmn\glob.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_hton.obj : .AUTODEPEND ..\..\lib\cmn\hton.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -1632,9 +1578,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_cnd.obj : .AUTODEPEND ..\..\lib\si\cnd.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_dir.obj : .AUTODEPEND ..\..\lib\si\dir.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fio.obj : .AUTODEPEND ..\..\lib\si\fio.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs.obj : .AUTODEPEND ..\..\lib\si\fs.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_attr.obj : .AUTODEPEND ..\..\lib\si\fs-attr.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_copy.obj : .AUTODEPEND ..\..\lib\si\fs-copy.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_delete.obj : .AUTODEPEND ..\..\lib\si\fs-delete.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_err.obj : .AUTODEPEND ..\..\lib\si\fs-err.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_make.obj : .AUTODEPEND ..\..\lib\si\fs-make.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_fs_move.obj : .AUTODEPEND ..\..\lib\si\fs-move.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_glob.obj : .AUTODEPEND ..\..\lib\si\glob.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsesi_intr.obj : .AUTODEPEND ..\..\lib\si\intr.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSESI_CFLAGS) $< @@ -1683,9 +1656,36 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_cnd.obj : .AUTODEPEND ..\..\lib\si\cnd.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_dir.obj : .AUTODEPEND ..\..\lib\si\dir.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fio.obj : .AUTODEPEND ..\..\lib\si\fio.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs.obj : .AUTODEPEND ..\..\lib\si\fs.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_attr.obj : .AUTODEPEND ..\..\lib\si\fs-attr.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_copy.obj : .AUTODEPEND ..\..\lib\si\fs-copy.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_delete.obj : .AUTODEPEND ..\..\lib\si\fs-delete.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_err.obj : .AUTODEPEND ..\..\lib\si\fs-err.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_make.obj : .AUTODEPEND ..\..\lib\si\fs-make.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_fs_move.obj : .AUTODEPEND ..\..\lib\si\fs-move.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_glob.obj : .AUTODEPEND ..\..\lib\si\glob.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsesi_intr.obj : .AUTODEPEND ..\..\lib\si\intr.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSESI_CFLAGS) $< diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c index 700496a5..59acc17a 100644 --- a/qse/cmd/awk/awk.c +++ b/qse/cmd/awk/awk.c @@ -33,8 +33,9 @@ #include #include #include -#include #include + +#include #include #include diff --git a/qse/cmd/http/Makefile.am b/qse/cmd/http/Makefile.am index 9c5f0522..11840795 100644 --- a/qse/cmd/http/Makefile.am +++ b/qse/cmd/http/Makefile.am @@ -11,7 +11,7 @@ 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/si -L../../lib/io -L../../lib/cmn +qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/si -L../../lib/cmn qsehttpd_LDADD = -lqsexli -lqsehttp -lqsesi -lqsecmn if WIN32 @@ -21,7 +21,7 @@ endif endif qseursd_SOURCES = ursd.c -qseursd_LDFLAGS = -L../../lib/si -L../../lib/io -L../../lib/cmn +qseursd_LDFLAGS = -L../../lib/si -L../../lib/cmn qseursd_LDADD = -lqsesi -lqsecmn EXTRA_DIST = $(qsecfg_DATA) diff --git a/qse/cmd/http/Makefile.in b/qse/cmd/http/Makefile.in index b6e7689d..ee0dac22 100644 --- a/qse/cmd/http/Makefile.in +++ b/qse/cmd/http/Makefile.in @@ -391,10 +391,10 @@ 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/si -L../../lib/io -L../../lib/cmn +qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/si -L../../lib/cmn qsehttpd_LDADD = -lqsexli -lqsehttp -lqsesi -lqsecmn $(am__append_1) qseursd_SOURCES = ursd.c -qseursd_LDFLAGS = -L../../lib/si -L../../lib/io -L../../lib/cmn +qseursd_LDFLAGS = -L../../lib/si -L../../lib/cmn qseursd_LDADD = -lqsesi -lqsecmn EXTRA_DIST = $(qsecfg_DATA) all: all-am diff --git a/qse/cmd/sed/sed.c b/qse/cmd/sed/sed.c index 13fc98a2..863912ec 100644 --- a/qse/cmd/sed/sed.c +++ b/qse/cmd/sed/sed.c @@ -31,11 +31,11 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include diff --git a/qse/cmd/xli/xli.c b/qse/cmd/xli/xli.c index b0bab00e..80efada3 100644 --- a/qse/cmd/xli/xli.c +++ b/qse/cmd/xli/xli.c @@ -31,11 +31,11 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include diff --git a/qse/include/qse/cmn/Makefile.am b/qse/include/qse/cmn/Makefile.am index df9d6812..cde8cbb9 100644 --- a/qse/include/qse/cmn/Makefile.am +++ b/qse/include/qse/cmn/Makefile.am @@ -5,14 +5,11 @@ pkginclude_HEADERS = \ chr.h \ cp949.h \ cp950.h \ - dir.h \ dll.h \ env.h \ fma.h \ fmt.h \ - fs.h \ gdl.h \ - glob.h \ htb.h \ hton.h \ ipad.h \ diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index a960dafe..d33729e0 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -122,14 +122,14 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__pkginclude_HEADERS_DIST = alg.h chr.h cp949.h cp950.h dir.h dll.h \ - env.h fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h lda.h \ - main.h map.h mb8.h mbwc.h mem.h oht.h opt.h path.h pma.h rbt.h \ - rex.h sll.h slmb.h str.h time.h tmr.h tre.h uni.h uri.h utf8.h \ - xma.h Mmgr.hpp StdMmgr.hpp HeapMmgr.hpp Mmged.hpp \ - ScopedPtr.hpp SharedPtr.hpp StrBase.hpp String.hpp Mpool.hpp \ - Association.hpp LinkedList.hpp HashList.hpp HashTable.hpp \ - RedBlackTree.hpp RedBlackTable.hpp Array.hpp BinaryHeap.hpp +am__pkginclude_HEADERS_DIST = alg.h chr.h cp949.h cp950.h dll.h env.h \ + fma.h fmt.h gdl.h htb.h hton.h ipad.h lda.h main.h map.h mb8.h \ + mbwc.h mem.h oht.h opt.h path.h pma.h rbt.h rex.h sll.h slmb.h \ + str.h time.h tmr.h tre.h uni.h uri.h utf8.h xma.h Mmgr.hpp \ + StdMmgr.hpp HeapMmgr.hpp Mmged.hpp ScopedPtr.hpp SharedPtr.hpp \ + StrBase.hpp String.hpp Mpool.hpp Association.hpp \ + LinkedList.hpp HashList.hpp HashTable.hpp RedBlackTree.hpp \ + RedBlackTable.hpp Array.hpp BinaryHeap.hpp am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -355,10 +355,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkginclude_HEADERS = alg.h chr.h cp949.h cp950.h dir.h dll.h env.h \ - fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h lda.h main.h \ - map.h mb8.h mbwc.h mem.h oht.h opt.h path.h pma.h rbt.h rex.h \ - sll.h slmb.h str.h time.h tmr.h tre.h uni.h uri.h utf8.h xma.h \ +pkginclude_HEADERS = alg.h chr.h cp949.h cp950.h dll.h env.h fma.h \ + fmt.h gdl.h htb.h hton.h ipad.h lda.h main.h map.h mb8.h \ + mbwc.h mem.h oht.h opt.h path.h pma.h rbt.h rex.h sll.h slmb.h \ + str.h time.h tmr.h tre.h uni.h uri.h utf8.h xma.h \ $(am__append_1) all: all-am diff --git a/qse/include/qse/cmn/si b/qse/include/qse/cmn/si deleted file mode 100644 index 56da2fbc..00000000 --- a/qse/include/qse/cmn/si +++ /dev/null @@ -1,111 +0,0 @@ -/* - * $Id$ - * - Copyright (c) 2006-2014 Chung, Hyung-Hwan. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _QSE_CMN_SCK_H_ -#define _QSE_CMN_SCK_H_ - - -#include -#include -#include - -#if defined(_WIN32) - typedef qse_uintptr_t qse_sck_hnd_t; -# define QSE_INVALID_SCKHND (~(qse_sck_hnd_t)0) -#elif defined(__OS2__) - typedef int qse_sck_hnd_t; -# define QSE_INVALID_SCKHND (-1) -#elif defined(__DOS__) - typedef int qse_sck_hnd_t; -# define QSE_INVALID_SCKHND (-1) -#else - typedef int qse_sck_hnd_t; -# define QSE_INVALID_SCKHND (-1) -#endif - -#if (QSE_SIZEOF_SOCKLEN_T == QSE_SIZEOF_INT) - #if defined(QSE_SOCKLEN_T_IS_SIGNED) - typedef int qse_sck_len_t; - #else - typedef unsigned int qse_sck_len_t; - #endif -#elif (QSE_SIZEOF_SOCKLEN_T == QSE_SIZEOF_LONG) - #if defined(QSE_SOCKLEN_T_IS_SIGNED) - typedef long qse_sck_len_t; - #else - typedef unsigned long qse_sck_len_t; - #endif -#else - typedef int qse_sck_len_t; -#endif - -enum qse_shutsckhnd_how_t -{ - QSE_SHUTSCKHND_R = 0, - QSE_SHUTSCKHND_W = 1, - QSE_SHUTSCKHND_RW = 2 -}; -typedef enum qse_shutsckhnd_how_t qse_shutsckhnd_how_t; - -#if defined(__cplusplus) -extern "C" { -#endif - -QSE_EXPORT int qse_isvalidsckhnd ( - qse_sck_hnd_t handle -); - -QSE_EXPORT void qse_closesckhnd ( - qse_sck_hnd_t handle -); - - -QSE_EXPORT void qse_shutsckhnd ( - qse_sck_hnd_t handle, - qse_shutsckhnd_how_t how -); - -QSE_EXPORT int qse_setscknonblock ( - qse_sck_hnd_t handle, - int enabled -); - -QSE_EXPORT int qse_initsckconn ( - qse_sck_hnd_t handle, - const qse_nwad_t* nwad -); - -QSE_EXPORT int qse_finisckconn ( - qse_sck_hnd_t handle -); - -#if defined(__cplusplus) -} -#endif - - -#endif - diff --git a/qse/include/qse/http/stdhttpd.h b/qse/include/qse/http/stdhttpd.h index 3a137a38..b1dcd9ec 100644 --- a/qse/include/qse/http/stdhttpd.h +++ b/qse/include/qse/http/stdhttpd.h @@ -182,8 +182,8 @@ typedef int (*qse_httpd_serverstd_query_t) ( enum qse_httpd_serverstd_opt_t { QSE_HTTPD_SERVERSTD_QUERY, /* qse_httpd_serverstd_query_t */ - QSE_HTTPD_SERVERSTD_MAKERSRC, /* qse_httpd_serverstd_makersrc_t* */ - QSE_HTTPD_SERVERSTD_FREERSRC /* qse_httpd_serverstd_freersrc_t* */ + QSE_HTTPD_SERVERSTD_MAKERSRC, /* qse_httpd_serverstd_makersrc_t */ + QSE_HTTPD_SERVERSTD_FREERSRC /* qse_httpd_serverstd_freersrc_t */ }; typedef enum qse_httpd_serverstd_opt_t qse_httpd_serverstd_opt_t; diff --git a/qse/include/qse/si/Makefile.am b/qse/include/qse/si/Makefile.am index dff5ceb6..d2a0715c 100644 --- a/qse/include/qse/si/Makefile.am +++ b/qse/include/qse/si/Makefile.am @@ -5,7 +5,10 @@ pkginclude_HEADERS = \ aio-pro.h \ aio-sck.h cnd.h \ + dir.h \ fio.h \ + fs.h \ + glob.h \ intr.h \ mtx.h \ mux.h \ diff --git a/qse/include/qse/si/Makefile.in b/qse/include/qse/si/Makefile.in index 9b3757f5..06a5e078 100644 --- a/qse/include/qse/si/Makefile.in +++ b/qse/include/qse/si/Makefile.in @@ -609,7 +609,10 @@ uninstall-am: uninstall-pkgincludeHEADERS uninstall-pkgincludeHEADERS cnd.h \ + dir.h \ fio.h \ + fs.h \ + glob.h \ intr.h \ mtx.h \ mux.h \ diff --git a/qse/include/qse/cmn/dir.h b/qse/include/qse/si/dir.h similarity index 100% rename from qse/include/qse/cmn/dir.h rename to qse/include/qse/si/dir.h diff --git a/qse/include/qse/cmn/fs.h b/qse/include/qse/si/fs.h similarity index 99% rename from qse/include/qse/cmn/fs.h rename to qse/include/qse/si/fs.h index 15996e59..abf7683e 100644 --- a/qse/include/qse/cmn/fs.h +++ b/qse/include/qse/si/fs.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_FS_H_ -#define _QSE_CMN_FS_H_ +#ifndef _QSE_SI_FS_H_ +#define _QSE_SI_FS_H_ /** \file * This file defines data types and functions for manipulating files and diff --git a/qse/include/qse/cmn/glob.h b/qse/include/qse/si/glob.h similarity index 98% rename from qse/include/qse/cmn/glob.h rename to qse/include/qse/si/glob.h index 88108a47..b9aa1413 100644 --- a/qse/include/qse/cmn/glob.h +++ b/qse/include/qse/si/glob.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_GLOB_H_ -#define _QSE_CMN_GLOB_H_ +#ifndef _QSE_SI_GLOB_H_ +#define _QSE_SI_GLOB_H_ #include #include diff --git a/qse/lib/awk/Awk.cpp b/qse/lib/awk/Awk.cpp index 55145275..06d5fd5d 100644 --- a/qse/lib/awk/Awk.cpp +++ b/qse/lib/awk/Awk.cpp @@ -26,8 +26,8 @@ #include #include -#include "../cmn/mem.h" -#include "awk.h" +#include "../cmn/mem-prv.h" +#include "awk-prv.h" ///////////////////////////////// QSE_BEGIN_NAMESPACE(QSE) diff --git a/qse/lib/awk/Makefile.am b/qse/lib/awk/Makefile.am index 915b6733..0d10c925 100644 --- a/qse/lib/awk/Makefile.am +++ b/qse/lib/awk/Makefile.am @@ -22,8 +22,10 @@ else CPPFLAGS_LIB_COMMON += -DQSE_AWK_DEFAULT_MODPREFIX=\"$(libdir)/libqseawk-\" -DQSE_AWK_DEFAULT_MODPOSTFIX=\"\" endif +noinst_HEADERS = awk-prv.h err.h rio.h val.h fnc.h misc.h parse.h run.h tree.h std.h + lib_LTLIBRARIES = libqseawk.la -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 parse.h run.h tree.h std.h +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 libqseawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) libqseawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) libqseawk_la_LIBADD = $(LIBADD_LIB_COMMON) @@ -33,7 +35,7 @@ lib_LTLIBRARIES += libqseawkxx.la libqseawkxx_la_SOURCES = Awk.cpp StdAwk.cpp libqseawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) libqseawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) -libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsecmn $(LIBADD_LIB_COMMON) +libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsesi -lqsecmn $(LIBADD_LIB_COMMON) endif if ENABLE_STATIC_MODULE @@ -74,8 +76,8 @@ modexecdir = $(libdir) modexec_LTLIBRARIES = libqseawk-dir.la libqseawk_dir_la_SOURCES = mod-dir.c mod-dir.h libqseawk_dir_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -libqseawk_dir_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -libqseawk_dir_la_LIBADD = $(LIBADD_MOD_COMMON) +libqseawk_dir_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -L../si +libqseawk_dir_la_LIBADD = $(LIBADD_MOD_COMMON) -lqsesi modexec_LTLIBRARIES += libqseawk-math.la libqseawk_math_la_SOURCES = mod-math.c mod-math.h diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index 968d3c75..ad9e6fa8 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -105,7 +106,7 @@ host_triplet = @host@ @ENABLE_STATIC_MODULE_FALSE@@HAVE_LIBUCI_TRUE@am__append_12 = libqseawk-uci.la subdir = lib/awk DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/ac/depcomp + $(top_srcdir)/ac/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -243,10 +244,9 @@ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libqseawk_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) am__libqseawk_la_SOURCES_DIST = 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 parse.h run.h tree.h std.h mod-dir.c mod-dir.h \ - mod-math.c mod-math.h mod-sed.c mod-sed.h mod-str.c mod-str.h \ - mod-sys.c mod-sys.h mod-mpi.c mod-mpi.h mod-uci.c mod-uci.h + val.c fnc.c misc.c rio.c std.c mod-dir.c mod-dir.h mod-math.c \ + mod-math.h mod-sed.c mod-sed.h mod-str.c mod-str.h mod-sys.c \ + mod-sys.h mod-mpi.c mod-mpi.h mod-uci.c mod-uci.h @ENABLE_STATIC_MODULE_TRUE@am__objects_1 = libqseawk_la-mod-dir.lo \ @ENABLE_STATIC_MODULE_TRUE@ libqseawk_la-mod-math.lo \ @ENABLE_STATIC_MODULE_TRUE@ libqseawk_la-mod-sed.lo \ @@ -344,6 +344,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -553,10 +554,10 @@ CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) \ $(am__append_1) $(am__append_2) LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) LIBADD_LIB_COMMON = -lqsecmn -lqsesi $(LIBM) $(LIBLTDL) +noinst_HEADERS = awk-prv.h err.h rio.h val.h fnc.h misc.h parse.h run.h tree.h std.h 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 \ - parse.h run.h tree.h std.h $(am__append_4) $(am__append_6) \ + fnc.c misc.c rio.c std.c $(am__append_4) $(am__append_6) \ $(am__append_9) libqseawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) $(am__append_7) libqseawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) $(am__append_8) @@ -565,7 +566,7 @@ libqseawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_5) \ @ENABLE_CXX_TRUE@libqseawkxx_la_SOURCES = Awk.cpp StdAwk.cpp @ENABLE_CXX_TRUE@libqseawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) @ENABLE_CXX_TRUE@libqseawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) -@ENABLE_CXX_TRUE@libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsecmn $(LIBADD_LIB_COMMON) +@ENABLE_CXX_TRUE@libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsesi -lqsecmn $(LIBADD_LIB_COMMON) ################################################## # DYNAMIC MODULES @@ -580,8 +581,8 @@ libqseawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_5) \ @ENABLE_STATIC_MODULE_FALSE@ $(am__append_11) $(am__append_12) @ENABLE_STATIC_MODULE_FALSE@libqseawk_dir_la_SOURCES = mod-dir.c mod-dir.h @ENABLE_STATIC_MODULE_FALSE@libqseawk_dir_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -@ENABLE_STATIC_MODULE_FALSE@libqseawk_dir_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -@ENABLE_STATIC_MODULE_FALSE@libqseawk_dir_la_LIBADD = $(LIBADD_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libqseawk_dir_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -L../si +@ENABLE_STATIC_MODULE_FALSE@libqseawk_dir_la_LIBADD = $(LIBADD_MOD_COMMON) -lqsesi @ENABLE_STATIC_MODULE_FALSE@libqseawk_math_la_SOURCES = mod-math.c mod-math.h @ENABLE_STATIC_MODULE_FALSE@libqseawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) @ENABLE_STATIC_MODULE_FALSE@libqseawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) @@ -1093,7 +1094,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modexecdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ diff --git a/qse/lib/awk/StdAwk.cpp b/qse/lib/awk/StdAwk.cpp index 7fcbde85..8e09a7f5 100644 --- a/qse/lib/awk/StdAwk.cpp +++ b/qse/lib/awk/StdAwk.cpp @@ -33,7 +33,7 @@ #include #include -#include "awk.h" +#include "awk-prv.h" #include "std.h" #include diff --git a/qse/lib/awk/awk.h b/qse/lib/awk/awk-prv.h similarity index 98% rename from qse/lib/awk/awk.h rename to qse/lib/awk/awk-prv.h index 5793869c..6045f1c5 100644 --- a/qse/lib/awk/awk.h +++ b/qse/lib/awk/awk-prv.h @@ -24,10 +24,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_LIB_AWK_AWK_H_ -#define _QSE_LIB_AWK_AWK_H_ +#ifndef _QSE_LIB_AWK_AWK_PRV_H_ +#define _QSE_LIB_AWK_AWK_PRV_H_ -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include #include diff --git a/qse/lib/awk/awk.c b/qse/lib/awk/awk.c index 2e6da55f..807e6d11 100644 --- a/qse/lib/awk/awk.c +++ b/qse/lib/awk/awk.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" static void free_fun (qse_htb_t* map, void* vptr, qse_size_t vlen) { diff --git a/qse/lib/awk/err.c b/qse/lib/awk/err.c index 4ea3201a..56151077 100644 --- a/qse/lib/awk/err.c +++ b/qse/lib/awk/err.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" const qse_char_t* qse_awk_dflerrstr (const qse_awk_t* awk, qse_awk_errnum_t errnum) { diff --git a/qse/lib/awk/fnc.c b/qse/lib/awk/fnc.c index 37bb07d1..7ff1d245 100644 --- a/qse/lib/awk/fnc.c +++ b/qse/lib/awk/fnc.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" static int fnc_close (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); static int fnc_fflush (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); diff --git a/qse/lib/awk/misc.c b/qse/lib/awk/misc.c index 02bc9884..5d6104d7 100644 --- a/qse/lib/awk/misc.c +++ b/qse/lib/awk/misc.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" /*#define USE_REX */ diff --git a/qse/lib/awk/mod-dir.c b/qse/lib/awk/mod-dir.c index bca56817..d3c2ea81 100644 --- a/qse/lib/awk/mod-dir.c +++ b/qse/lib/awk/mod-dir.c @@ -41,10 +41,10 @@ BEGIN { */ #include "mod-dir.h" +#include #include #include -#include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" typedef struct dir_list_t dir_list_t; typedef struct dir_node_t dir_node_t; diff --git a/qse/lib/awk/mod-math.c b/qse/lib/awk/mod-math.c index b41c49f9..85724a53 100644 --- a/qse/lib/awk/mod-math.c +++ b/qse/lib/awk/mod-math.c @@ -29,7 +29,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include "fnc.h" #include diff --git a/qse/lib/awk/mod-sed.c b/qse/lib/awk/mod-sed.c index 532bd128..10d60fb6 100644 --- a/qse/lib/awk/mod-sed.c +++ b/qse/lib/awk/mod-sed.c @@ -26,7 +26,7 @@ #include "mod-sed.h" #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if 0 static int fnc_errno (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi) diff --git a/qse/lib/awk/mod-str.c b/qse/lib/awk/mod-str.c index fd0266e7..76c61657 100644 --- a/qse/lib/awk/mod-str.c +++ b/qse/lib/awk/mod-str.c @@ -27,7 +27,7 @@ #include "mod-str.h" #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include "fnc.h" static int fnc_normspace (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi) diff --git a/qse/lib/awk/mod-sys.c b/qse/lib/awk/mod-sys.c index 056f56d8..6f1a3992 100644 --- a/qse/lib/awk/mod-sys.c +++ b/qse/lib/awk/mod-sys.c @@ -31,7 +31,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/awk/mod-uci.c b/qse/lib/awk/mod-uci.c index eea17437..f06efe80 100644 --- a/qse/lib/awk/mod-uci.c +++ b/qse/lib/awk/mod-uci.c @@ -29,7 +29,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(HAVE_UCI_H) # include diff --git a/qse/lib/awk/parse.c b/qse/lib/awk/parse.c index 61a0cf30..044a982b 100644 --- a/qse/lib/awk/parse.c +++ b/qse/lib/awk/parse.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" #if !defined(QSE_AWK_DEFAULT_MODPREFIX) # if defined(_WIN32) diff --git a/qse/lib/awk/rec.c b/qse/lib/awk/rec.c index 2a33b901..170163c4 100644 --- a/qse/lib/awk/rec.c +++ b/qse/lib/awk/rec.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" static int split_record (qse_awk_rtx_t* run); static int recomp_record_fields ( diff --git a/qse/lib/awk/rio.c b/qse/lib/awk/rio.c index aade5d0e..0bc57c0f 100644 --- a/qse/lib/awk/rio.c +++ b/qse/lib/awk/rio.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" enum io_mask_t { diff --git a/qse/lib/awk/run.c b/qse/lib/awk/run.c index 828040e3..4aa9d12a 100644 --- a/qse/lib/awk/run.c +++ b/qse/lib/awk/run.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" #include #ifdef DEBUG_RUN diff --git a/qse/lib/awk/std.c b/qse/lib/awk/std.c index b108f8af..9607990b 100644 --- a/qse/lib/awk/std.c +++ b/qse/lib/awk/std.c @@ -35,7 +35,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include diff --git a/qse/lib/awk/std.h b/qse/lib/awk/std.h index 93de16ef..58744b72 100644 --- a/qse/lib/awk/std.h +++ b/qse/lib/awk/std.h @@ -27,7 +27,7 @@ #ifndef _QSE_LIB_AWK_STD_H #define _QSE_LIB_AWK_STD_H_ -#include "awk.h" +#include "awk-prv.h" #if defined(__cplusplus) extern "C" { diff --git a/qse/lib/awk/tree.c b/qse/lib/awk/tree.c index 82a6e075..363d9e37 100644 --- a/qse/lib/awk/tree.c +++ b/qse/lib/awk/tree.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" #include static const qse_char_t* assop_str[] = diff --git a/qse/lib/awk/val.c b/qse/lib/awk/val.c index 1e6452d9..65a2fe0d 100644 --- a/qse/lib/awk/val.c +++ b/qse/lib/awk/val.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "awk.h" +#include "awk-prv.h" #include #ifdef DEBUG_VAL @@ -1021,7 +1021,7 @@ int qse_awk_rtx_valtobool (qse_awk_rtx_t* rtx, const qse_awk_val_t* val) QSE_ASSERTX ( !"should never happen - invalid value type", - "the type of a value should be one of QSE_AWK_VAL_XXX's defined in awk.h"); + "the type of a value should be one of QSE_AWK_VAL_XXX's defined in awk-prv.h"); return 0; } diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am index c37b0442..956a81df 100644 --- a/qse/lib/cmn/Makefile.am +++ b/qse/lib/cmn/Makefile.am @@ -9,12 +9,10 @@ lib_LTLIBRARIES = libqsecmn.la noinst_HEADERS = \ cp949.h \ cp950.h \ - fmt.h \ + fmt-prv.h \ fmt-intmax.h \ fmt-out.h \ - fs.h \ - glob.h \ - mem.h \ + mem-prv.h \ str-cat.h \ str-dyn.h \ str-fcpy.h \ @@ -39,7 +37,6 @@ libqsecmn_la_SOURCES = \ alg-sort.c \ assert.c \ chr.c \ - dir.c \ dll.c \ env.c \ gdl.c \ @@ -47,14 +44,6 @@ libqsecmn_la_SOURCES = \ fma.c \ fmt-intmax.c \ fmt-out.c \ - fs.c \ - fs-attr.c \ - fs-copy.c \ - fs-delete.c \ - fs-err.c \ - fs-make.c \ - fs-move.c \ - glob.c \ hton.c \ ipad.c \ lda.c \ diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index f1479eb6..60f9bef2 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -133,35 +133,32 @@ am__DEPENDENCIES_1 = libqsecmn_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am__libqsecmn_la_SOURCES_DIST = alg-base64.c alg-rand.c alg-search.c \ - alg-sort.c assert.c chr.c dir.c dll.c env.c gdl.c htb.c fma.c \ - fmt-intmax.c fmt-out.c fs.c fs-attr.c fs-copy.c fs-delete.c \ - fs-err.c fs-make.c fs-move.c glob.c hton.c ipad.c lda.c main.c \ - mb8.c mbwc.c mbwc-str.c mem.c oht.c opt.c path-base.c \ - path-canon.c path-core.c path-merge.c pma.c rbt.c rex.c sll.c \ - slmb.c str-beg.c str-cat.c str-chr.c str-cnv.c str-cmp.c \ - str-cpy.c str-del.c str-dup.c str-dyn.c str-end.c str-excl.c \ - str-fcpy.c str-fmt.c str-fnmat.c str-incl.c str-join.c \ - str-len.c str-pac.c str-pbrk.c str-put.c str-rev.c str-rot.c \ - str-set.c str-spl.c str-spn.c str-str.c str-subst.c str-tok.c \ - str-trm.c str-word.c time.c tmr.c tre.c tre-ast.c \ - tre-compile.c tre-match-bt.c tre-match-pa.c tre-parse.c \ - tre-stack.c uri.c utf8.c xma.c uni.c cp949.c cp950.c + alg-sort.c assert.c chr.c dll.c env.c gdl.c htb.c fma.c \ + fmt-intmax.c fmt-out.c hton.c ipad.c lda.c main.c mb8.c mbwc.c \ + mbwc-str.c mem.c oht.c opt.c path-base.c path-canon.c \ + path-core.c path-merge.c pma.c rbt.c rex.c sll.c slmb.c \ + str-beg.c str-cat.c str-chr.c str-cnv.c str-cmp.c str-cpy.c \ + str-del.c str-dup.c str-dyn.c str-end.c str-excl.c str-fcpy.c \ + str-fmt.c str-fnmat.c str-incl.c str-join.c str-len.c \ + str-pac.c str-pbrk.c str-put.c str-rev.c str-rot.c str-set.c \ + str-spl.c str-spn.c str-str.c str-subst.c str-tok.c str-trm.c \ + str-word.c time.c tmr.c tre.c tre-ast.c tre-compile.c \ + tre-match-bt.c tre-match-pa.c tre-parse.c tre-stack.c uri.c \ + utf8.c xma.c uni.c cp949.c cp950.c @ENABLE_BUNDLED_UNICODE_TRUE@am__objects_1 = uni.lo @ENABLE_XCMGRS_TRUE@am__objects_2 = cp949.lo cp950.lo am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \ - alg-sort.lo assert.lo chr.lo dir.lo dll.lo env.lo gdl.lo \ - htb.lo fma.lo fmt-intmax.lo fmt-out.lo fs.lo fs-attr.lo \ - fs-copy.lo fs-delete.lo fs-err.lo fs-make.lo fs-move.lo \ - glob.lo hton.lo ipad.lo lda.lo main.lo mb8.lo mbwc.lo \ - mbwc-str.lo mem.lo oht.lo opt.lo path-base.lo path-canon.lo \ - path-core.lo path-merge.lo pma.lo rbt.lo rex.lo sll.lo slmb.lo \ - str-beg.lo str-cat.lo str-chr.lo str-cnv.lo str-cmp.lo \ - str-cpy.lo str-del.lo str-dup.lo str-dyn.lo str-end.lo \ - str-excl.lo str-fcpy.lo str-fmt.lo str-fnmat.lo str-incl.lo \ - str-join.lo str-len.lo str-pac.lo str-pbrk.lo str-put.lo \ - str-rev.lo str-rot.lo str-set.lo str-spl.lo str-spn.lo \ - str-str.lo str-subst.lo str-tok.lo str-trm.lo str-word.lo \ - time.lo tmr.lo tre.lo tre-ast.lo tre-compile.lo \ + alg-sort.lo assert.lo chr.lo dll.lo env.lo gdl.lo htb.lo \ + fma.lo fmt-intmax.lo fmt-out.lo hton.lo ipad.lo lda.lo main.lo \ + mb8.lo mbwc.lo mbwc-str.lo mem.lo oht.lo opt.lo path-base.lo \ + path-canon.lo path-core.lo path-merge.lo pma.lo rbt.lo rex.lo \ + sll.lo slmb.lo str-beg.lo str-cat.lo str-chr.lo str-cnv.lo \ + str-cmp.lo str-cpy.lo str-del.lo str-dup.lo str-dyn.lo \ + str-end.lo str-excl.lo str-fcpy.lo str-fmt.lo str-fnmat.lo \ + str-incl.lo str-join.lo str-len.lo str-pac.lo str-pbrk.lo \ + str-put.lo str-rev.lo str-rot.lo str-set.lo str-spl.lo \ + str-spn.lo str-str.lo str-subst.lo str-tok.lo str-trm.lo \ + str-word.lo time.lo tmr.lo tre.lo tre-ast.lo tre-compile.lo \ tre-match-bt.lo tre-match-pa.lo tre-parse.lo tre-stack.lo \ uri.lo utf8.lo xma.lo $(am__objects_1) $(am__objects_2) libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS) @@ -448,12 +445,10 @@ lib_LTLIBRARIES = libqsecmn.la $(am__append_3) noinst_HEADERS = \ cp949.h \ cp950.h \ - fmt.h \ + fmt-prv.h \ fmt-intmax.h \ fmt-out.h \ - fs.h \ - glob.h \ - mem.h \ + mem-prv.h \ str-cat.h \ str-dyn.h \ str-fcpy.h \ @@ -472,19 +467,18 @@ noinst_HEADERS = \ uni-trait.h libqsecmn_la_SOURCES = alg-base64.c alg-rand.c alg-search.c alg-sort.c \ - assert.c chr.c dir.c dll.c env.c gdl.c htb.c fma.c \ - fmt-intmax.c fmt-out.c fs.c fs-attr.c fs-copy.c fs-delete.c \ - fs-err.c fs-make.c fs-move.c glob.c hton.c ipad.c lda.c main.c \ - mb8.c mbwc.c mbwc-str.c mem.c oht.c opt.c path-base.c \ - path-canon.c path-core.c path-merge.c pma.c rbt.c rex.c sll.c \ - slmb.c str-beg.c str-cat.c str-chr.c str-cnv.c str-cmp.c \ - str-cpy.c str-del.c str-dup.c str-dyn.c str-end.c str-excl.c \ - str-fcpy.c str-fmt.c str-fnmat.c str-incl.c str-join.c \ - str-len.c str-pac.c str-pbrk.c str-put.c str-rev.c str-rot.c \ - str-set.c str-spl.c str-spn.c str-str.c str-subst.c str-tok.c \ - str-trm.c str-word.c time.c tmr.c tre.c tre-ast.c \ - tre-compile.c tre-match-bt.c tre-match-pa.c tre-parse.c \ - tre-stack.c uri.c utf8.c xma.c $(am__append_1) $(am__append_2) + assert.c chr.c dll.c env.c gdl.c htb.c fma.c fmt-intmax.c \ + fmt-out.c hton.c ipad.c lda.c main.c mb8.c mbwc.c mbwc-str.c \ + mem.c oht.c opt.c path-base.c path-canon.c path-core.c \ + path-merge.c pma.c rbt.c rex.c sll.c slmb.c str-beg.c \ + str-cat.c str-chr.c str-cnv.c str-cmp.c str-cpy.c str-del.c \ + str-dup.c str-dyn.c str-end.c str-excl.c str-fcpy.c str-fmt.c \ + str-fnmat.c str-incl.c str-join.c str-len.c str-pac.c \ + str-pbrk.c str-put.c str-rev.c str-rot.c str-set.c str-spl.c \ + str-spn.c str-str.c str-subst.c str-tok.c str-trm.c str-word.c \ + time.c tmr.c tre.c tre-ast.c tre-compile.c tre-match-bt.c \ + tre-match-pa.c tre-parse.c tre-stack.c uri.c utf8.c xma.c \ + $(am__append_1) $(am__append_2) libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined libqsecmn_la_LIBADD = $(SOCKET_LIBS) $(QUADMATH_LIBS) @ENABLE_CXX_TRUE@libqsecmnxx_la_SOURCES = \ @@ -588,21 +582,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cp949.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cp950.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dll.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fma.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt-intmax.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt-out.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-attr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-copy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-delete.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-make.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs-move.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glob.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipad.Plo@am__quote@ diff --git a/qse/lib/cmn/Mmgr.cpp b/qse/lib/cmn/Mmgr.cpp index e019075f..b68dbefc 100644 --- a/qse/lib/cmn/Mmgr.cpp +++ b/qse/lib/cmn/Mmgr.cpp @@ -26,7 +26,7 @@ #include #include -#include "mem.h" +#include "mem-prv.h" ///////////////////////////////// QSE_BEGIN_NAMESPACE(QSE) diff --git a/qse/lib/cmn/String.cpp b/qse/lib/cmn/String.cpp index 1129d71a..08f2c24c 100644 --- a/qse/lib/cmn/String.cpp +++ b/qse/lib/cmn/String.cpp @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #if !defined(QSE_HAVE_CONFIG_H) # if defined(_WIN32) || defined(__OS2__) || defined(__DOS__) diff --git a/qse/lib/cmn/assert.c b/qse/lib/cmn/assert.c index 09d402b1..c4d38350 100644 --- a/qse/lib/cmn/assert.c +++ b/qse/lib/cmn/assert.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #if defined(HAVE_EXECINFO_H) # include diff --git a/qse/lib/cmn/dll.c b/qse/lib/cmn/dll.c index 304f35f4..c7368327 100644 --- a/qse/lib/cmn/dll.c +++ b/qse/lib/cmn/dll.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #define TOB(dll,len) ((len)*(dll)->scale) #define DPTR(node) QSE_DLL_DPTR(node) diff --git a/qse/lib/cmn/env.c b/qse/lib/cmn/env.c index 810f4bf7..032ed918 100644 --- a/qse/lib/cmn/env.c +++ b/qse/lib/cmn/env.c @@ -28,7 +28,7 @@ #include #include #include -#include "mem.h" +#include "mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/cmn/fma.c b/qse/lib/cmn/fma.c index c8ca3f12..b7a8f234 100644 --- a/qse/lib/cmn/fma.c +++ b/qse/lib/cmn/fma.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" qse_fma_t* qse_fma_open ( qse_mmgr_t* mmgr, qse_size_t xtnsize, diff --git a/qse/lib/cmn/fmt-out.c b/qse/lib/cmn/fmt-out.c index 44afdedf..f13c9391 100644 --- a/qse/lib/cmn/fmt-out.c +++ b/qse/lib/cmn/fmt-out.c @@ -29,8 +29,8 @@ #include #include #include -#include "mem.h" -#include "fmt.h" +#include "mem-prv.h" +#include "fmt-prv.h" #include /* for snrintf(). used for floating-point number formatting */ #if defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) diff --git a/qse/lib/cmn/fmt.h b/qse/lib/cmn/fmt-prv.h similarity index 98% rename from qse/lib/cmn/fmt.h rename to qse/lib/cmn/fmt-prv.h index 36acd5be..226ec7d7 100644 --- a/qse/lib/cmn/fmt.h +++ b/qse/lib/cmn/fmt-prv.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_LIB_CMN_FMT_H_ -#define _QSE_LIB_CMN_FMT_H_ +#ifndef _QSE_LIB_CMN_FMT_PRV_H_ +#define _QSE_LIB_CMN_FMT_PRV_H_ #include #include diff --git a/qse/lib/cmn/htb.c b/qse/lib/cmn/htb.c index 872ba504..0b3833e2 100644 --- a/qse/lib/cmn/htb.c +++ b/qse/lib/cmn/htb.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #define htb_t qse_htb_t diff --git a/qse/lib/cmn/ipad.c b/qse/lib/cmn/ipad.c index 9ff68f79..dbb4de41 100644 --- a/qse/lib/cmn/ipad.c +++ b/qse/lib/cmn/ipad.c @@ -44,7 +44,7 @@ #include #include #include -#include "mem.h" +#include "mem-prv.h" #if 0 const qse_ip4ad_t qse_ip4ad_any = diff --git a/qse/lib/cmn/lda.c b/qse/lib/cmn/lda.c index aef30d4f..820de766 100644 --- a/qse/lib/cmn/lda.c +++ b/qse/lib/cmn/lda.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #define lda_t qse_lda_t #define slot_t qse_lda_slot_t diff --git a/qse/lib/cmn/main.c b/qse/lib/cmn/main.c index 73dc57e9..9ac38890 100644 --- a/qse/lib/cmn/main.c +++ b/qse/lib/cmn/main.c @@ -27,7 +27,7 @@ #include #include -#include "mem.h" +#include "mem-prv.h" int qse_runmain ( int argc, qse_achar_t* argv[], qse_runmain_handler_t handler) diff --git a/qse/lib/cmn/mbwc-str.c b/qse/lib/cmn/mbwc-str.c index 22b54fb6..4ac1dfec 100644 --- a/qse/lib/cmn/mbwc-str.c +++ b/qse/lib/cmn/mbwc-str.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" static int mbsn_to_wcsn_with_cmgr ( const qse_mchar_t* mbs, qse_size_t* mbslen, diff --git a/qse/lib/cmn/mem.h b/qse/lib/cmn/mem-prv.h similarity index 97% rename from qse/lib/cmn/mem.h rename to qse/lib/cmn/mem-prv.h index f12bcc11..3f821a2a 100644 --- a/qse/lib/cmn/mem.h +++ b/qse/lib/cmn/mem-prv.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_LIB_CMN_MEM_H_ -#define _QSE_LIB_CMN_MEM_H_ +#ifndef _QSE_LIB_CMN_MEM_PRV_H_ +#define _QSE_LIB_CMN_MEM_PRV_H_ #include diff --git a/qse/lib/cmn/oht.c b/qse/lib/cmn/oht.c index e4ae6b1d..e0bd8830 100644 --- a/qse/lib/cmn/oht.c +++ b/qse/lib/cmn/oht.c @@ -1,5 +1,5 @@ #include -#include "mem.h" +#include "mem-prv.h" #define DATA_PTR(oht,index) \ ((void*)(((qse_byte_t*)(oht)->data) + ((index) * (oht)->scale))) diff --git a/qse/lib/cmn/pma.c b/qse/lib/cmn/pma.c index 562f110c..cc8e9bfa 100644 --- a/qse/lib/cmn/pma.c +++ b/qse/lib/cmn/pma.c @@ -44,7 +44,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" /* Returns number of bytes to add to (char *)ptr to make it properly aligned for the type. */ diff --git a/qse/lib/cmn/rbt.c b/qse/lib/cmn/rbt.c index 68543f6d..b98c22f5 100644 --- a/qse/lib/cmn/rbt.c +++ b/qse/lib/cmn/rbt.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #define rbt_t qse_rbt_t #define pair_t qse_rbt_pair_t diff --git a/qse/lib/cmn/rex.c b/qse/lib/cmn/rex.c index 1debec83..d8f060b2 100644 --- a/qse/lib/cmn/rex.c +++ b/qse/lib/cmn/rex.c @@ -28,7 +28,7 @@ #include #include #include -#include "mem.h" +#include "mem-prv.h" #define OCC_MAX QSE_TYPE_MAX(qse_size_t) diff --git a/qse/lib/cmn/sll.c b/qse/lib/cmn/sll.c index 97d4e59d..0337e279 100644 --- a/qse/lib/cmn/sll.c +++ b/qse/lib/cmn/sll.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #define sll_t qse_sll_t #define node_t qse_sll_node_t diff --git a/qse/lib/cmn/slmb.c b/qse/lib/cmn/slmb.c index 7ead5b6b..a29ec91d 100644 --- a/qse/lib/cmn/slmb.c +++ b/qse/lib/cmn/slmb.c @@ -26,7 +26,7 @@ #include #include -#include "mem.h" +#include "mem-prv.h" #if !defined(QSE_HAVE_CONFIG_H) # if defined(_WIN32) || defined(__OS2__) || defined(__DOS__) diff --git a/qse/lib/cmn/str-cnv.c b/qse/lib/cmn/str-cnv.c index 1ce16f27..33d38d2e 100644 --- a/qse/lib/cmn/str-cnv.c +++ b/qse/lib/cmn/str-cnv.c @@ -26,7 +26,7 @@ #include #include -#include "mem.h" +#include "mem-prv.h" /*--------------------------------------------------------------- diff --git a/qse/lib/cmn/str-cpy.c b/qse/lib/cmn/str-cpy.c index f568b1cb..ed27c921 100644 --- a/qse/lib/cmn/str-cpy.c +++ b/qse/lib/cmn/str-cpy.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" qse_size_t qse_mbscpy (qse_mchar_t* buf, const qse_mchar_t* str) { diff --git a/qse/lib/cmn/str-dup.c b/qse/lib/cmn/str-dup.c index 129c6d8b..2ba47466 100644 --- a/qse/lib/cmn/str-dup.c +++ b/qse/lib/cmn/str-dup.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" qse_mchar_t* qse_mbsdup (const qse_mchar_t* str, qse_mmgr_t* mmgr) { diff --git a/qse/lib/cmn/str-dyn.c b/qse/lib/cmn/str-dyn.c index 110ea07a..51c862e5 100644 --- a/qse/lib/cmn/str-dyn.c +++ b/qse/lib/cmn/str-dyn.c @@ -26,7 +26,7 @@ #include #include -#include "mem.h" +#include "mem-prv.h" #if !defined(QSE_HAVE_CONFIG_H) # if defined(_WIN32) || defined(__OS2__) || defined(__DOS__) diff --git a/qse/lib/cmn/str-dyn.h b/qse/lib/cmn/str-dyn.h index e4ae3ef1..58754411 100644 --- a/qse/lib/cmn/str-dyn.h +++ b/qse/lib/cmn/str-dyn.h @@ -25,8 +25,8 @@ */ #include -#include "mem.h" -#include "fmt.h" +#include "mem-prv.h" +#include "fmt-prv.h" #include str_t* str_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_size_t capa) diff --git a/qse/lib/cmn/str-fmt.c b/qse/lib/cmn/str-fmt.c index 2ded6fa3..e6e7dd01 100644 --- a/qse/lib/cmn/str-fmt.c +++ b/qse/lib/cmn/str-fmt.c @@ -26,7 +26,7 @@ #include #include -#include "fmt.h" +#include "fmt-prv.h" struct mbuf_t { diff --git a/qse/lib/cmn/str-trm.c b/qse/lib/cmn/str-trm.c index 8e3f010c..334920a8 100644 --- a/qse/lib/cmn/str-trm.c +++ b/qse/lib/cmn/str-trm.c @@ -26,7 +26,7 @@ #include #include -#include "mem.h" +#include "mem-prv.h" qse_mchar_t* qse_mbstrmx (qse_mchar_t* str, int opt) { diff --git a/qse/lib/cmn/time.c b/qse/lib/cmn/time.c index 0db39232..1162fa1d 100644 --- a/qse/lib/cmn/time.c +++ b/qse/lib/cmn/time.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/cmn/tmr.c b/qse/lib/cmn/tmr.c index dd315507..c0cf681c 100644 --- a/qse/lib/cmn/tmr.c +++ b/qse/lib/cmn/tmr.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #define HEAP_PARENT(x) (((x) - 1) / 2) #define HEAP_LEFT(x) ((x) * 2 + 1) diff --git a/qse/lib/cmn/tre.h b/qse/lib/cmn/tre.h index abee58ae..b1337b32 100644 --- a/qse/lib/cmn/tre.h +++ b/qse/lib/cmn/tre.h @@ -153,7 +153,7 @@ SUBMATCH[4] = [defg] #include #include #include -#include "mem.h" +#include "mem-prv.h" #define tre_islower(c) QSE_ISLOWER(c) #define tre_isupper(c) QSE_ISUPPER(c) diff --git a/qse/lib/cmn/uri.c b/qse/lib/cmn/uri.c index 7594396e..749eee22 100644 --- a/qse/lib/cmn/uri.c +++ b/qse/lib/cmn/uri.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" int qse_mbstouri (const qse_mchar_t* str, qse_muri_t* uri, int flags) { diff --git a/qse/lib/cmn/xma.c b/qse/lib/cmn/xma.c index 0769f7e8..edaabd6c 100644 --- a/qse/lib/cmn/xma.c +++ b/qse/lib/cmn/xma.c @@ -25,7 +25,7 @@ */ #include -#include "mem.h" +#include "mem-prv.h" #define ALIGN QSE_SIZEOF(qse_size_t) /* this must be a power of 2 */ #define HDRSIZE QSE_SIZEOF(qse_xma_blk_t) diff --git a/qse/lib/http/Makefile.am b/qse/lib/http/Makefile.am index 82c2d798..89693e6a 100644 --- a/qse/lib/http/Makefile.am +++ b/qse/lib/http/Makefile.am @@ -33,6 +33,6 @@ libqsehttp_la_SOURCES = \ upxd.c libqsehttp_la_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) $(CPPFLAGS_HTTPD_MOD) $(LTDLINCL) -libqsehttp_la_LDFLAGS = -L../sys -L../cmn -L../io -version-info 1:0:0 -no-undefined -libqsehttp_la_LIBADD = -lqsesys -lqsecmn -lqseio $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL) +libqsehttp_la_LDFLAGS = -L../si -L../cmn -version-info 1:0:0 -no-undefined +libqsehttp_la_LIBADD = -lqsesi -lqsecmn $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL) diff --git a/qse/lib/http/Makefile.in b/qse/lib/http/Makefile.in index 0c831245..161cefd2 100644 --- a/qse/lib/http/Makefile.in +++ b/qse/lib/http/Makefile.in @@ -410,8 +410,8 @@ libqsehttp_la_SOURCES = \ upxd.c libqsehttp_la_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) $(CPPFLAGS_HTTPD_MOD) $(LTDLINCL) -libqsehttp_la_LDFLAGS = -L../sys -L../cmn -L../io -version-info 1:0:0 -no-undefined -libqsehttp_la_LIBADD = -lqsesys -lqsecmn -lqseio $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL) +libqsehttp_la_LDFLAGS = -L../si -L../cmn -version-info 1:0:0 -no-undefined +libqsehttp_la_LIBADD = -lqsesi -lqsecmn $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL) all: all-am .SUFFIXES: diff --git a/qse/lib/http/htrd.c b/qse/lib/http/htrd.c index 9dd54b7f..038e6112 100644 --- a/qse/lib/http/htrd.c +++ b/qse/lib/http/htrd.c @@ -27,7 +27,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" static const qse_mchar_t NUL = QSE_MT('\0'); diff --git a/qse/lib/http/htre.c b/qse/lib/http/htre.c index 319160fe..647f5ca8 100644 --- a/qse/lib/http/htre.c +++ b/qse/lib/http/htre.c @@ -25,7 +25,7 @@ */ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" static void free_hdrval (qse_htb_t* htb, void* vptr, qse_size_t vlen) { diff --git a/qse/lib/http/http.c b/qse/lib/http/http.c index dda3f9e8..462e0f3b 100644 --- a/qse/lib/http/http.c +++ b/qse/lib/http/http.c @@ -28,7 +28,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" int qse_comparehttpversions ( const qse_http_version_t* v1, diff --git a/qse/lib/http/httpd-cgi.c b/qse/lib/http/httpd-cgi.c index be8ca890..d82b915d 100644 --- a/qse/lib/http/httpd-cgi.c +++ b/qse/lib/http/httpd-cgi.c @@ -25,7 +25,7 @@ */ #include "httpd.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include #include diff --git a/qse/lib/http/httpd-dir.c b/qse/lib/http/httpd-dir.c index 75ed4685..c1e69a17 100644 --- a/qse/lib/http/httpd-dir.c +++ b/qse/lib/http/httpd-dir.c @@ -25,7 +25,7 @@ */ #include "httpd.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include diff --git a/qse/lib/http/httpd-file.c b/qse/lib/http/httpd-file.c index 78885ea1..7b6340c3 100644 --- a/qse/lib/http/httpd-file.c +++ b/qse/lib/http/httpd-file.c @@ -25,7 +25,7 @@ */ #include "httpd.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include diff --git a/qse/lib/http/httpd-proxy.c b/qse/lib/http/httpd-proxy.c index fc918903..87002e35 100644 --- a/qse/lib/http/httpd-proxy.c +++ b/qse/lib/http/httpd-proxy.c @@ -26,7 +26,7 @@ #include "httpd.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include #include diff --git a/qse/lib/http/httpd-std.c b/qse/lib/http/httpd-std.c index b5d4bcef..e80b0d38 100644 --- a/qse/lib/http/httpd-std.c +++ b/qse/lib/http/httpd-std.c @@ -26,7 +26,7 @@ #include #include "httpd.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include #include @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qse/lib/http/httpd-task.c b/qse/lib/http/httpd-task.c index 4d9e235f..d8190a6b 100644 --- a/qse/lib/http/httpd-task.c +++ b/qse/lib/http/httpd-task.c @@ -26,7 +26,7 @@ #include "httpd.h" #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" /* TODO: * many functions in this file use qse_size_t. diff --git a/qse/lib/http/httpd-text.c b/qse/lib/http/httpd-text.c index 42a85310..f45aaa48 100644 --- a/qse/lib/http/httpd-text.c +++ b/qse/lib/http/httpd-text.c @@ -25,7 +25,7 @@ */ #include "httpd.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include typedef struct task_text_t task_text_t; diff --git a/qse/lib/http/httpd.c b/qse/lib/http/httpd.c index af5665d2..faf242fd 100644 --- a/qse/lib/http/httpd.c +++ b/qse/lib/http/httpd.c @@ -25,7 +25,7 @@ */ #include "httpd.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include #include diff --git a/qse/lib/http/upxd.h b/qse/lib/http/upxd.h index a69f2cd0..57461cfd 100644 --- a/qse/lib/http/upxd.h +++ b/qse/lib/http/upxd.h @@ -28,7 +28,7 @@ #define _QSE_LIB_NET_UPXD_H_ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" typedef struct qse_upxd_server_session_t qse_upxd_server_session_t; diff --git a/qse/lib/sed/Makefile.am b/qse/lib/sed/Makefile.am index fccad3e0..04839785 100644 --- a/qse/lib/sed/Makefile.am +++ b/qse/lib/sed/Makefile.am @@ -4,15 +4,17 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include +noinst_HEADERS = sed-prv.h + lib_LTLIBRARIES = libqsesed.la -libqsesed_la_SOURCES = sed.c err.c sed.h std.c -libqsesed_la_LDFLAGS = -L../cmn -L../io -version-info 1:0:0 -no-undefined -libqsesed_la_LIBADD = -lqsecmn -lqseio +libqsesed_la_SOURCES = sed.c err.c std.c +libqsesed_la_LDFLAGS = -L../cmn -L../si -version-info 1:0:0 -no-undefined +libqsesed_la_LIBADD = -lqsecmn -lqsesi if ENABLE_CXX lib_LTLIBRARIES += libqsesedxx.la libqsesedxx_la_SOURCES = Sed.cpp StdSed.cpp -libqsesedxx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined -libqsesedxx_la_LIBADD = -lqsesed -lqsecmnxx -lqsecmn +libqsesedxx_la_LDFLAGS = -L. -L../cmn -L../si -version-info 1:0:0 -no-undefined +libqsesedxx_la_LIBADD = -lqsesed -lqsecmnxx -lqsesi -lqsecmn endif diff --git a/qse/lib/sed/Makefile.in b/qse/lib/sed/Makefile.in index c43edc34..07103019 100644 --- a/qse/lib/sed/Makefile.in +++ b/qse/lib/sed/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -81,7 +82,7 @@ host_triplet = @host@ @ENABLE_CXX_TRUE@am__append_1 = libqsesedxx.la subdir = lib/sed DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/ac/depcomp + $(top_srcdir)/ac/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -205,6 +206,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -405,13 +407,14 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include +noinst_HEADERS = sed-prv.h lib_LTLIBRARIES = libqsesed.la $(am__append_1) -libqsesed_la_SOURCES = sed.c err.c sed.h std.c -libqsesed_la_LDFLAGS = -L../cmn -L../io -version-info 1:0:0 -no-undefined -libqsesed_la_LIBADD = -lqsecmn -lqseio +libqsesed_la_SOURCES = sed.c err.c std.c +libqsesed_la_LDFLAGS = -L../cmn -L../si -version-info 1:0:0 -no-undefined +libqsesed_la_LIBADD = -lqsecmn -lqsesi @ENABLE_CXX_TRUE@libqsesedxx_la_SOURCES = Sed.cpp StdSed.cpp -@ENABLE_CXX_TRUE@libqsesedxx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined -@ENABLE_CXX_TRUE@libqsesedxx_la_LIBADD = -lqsesed -lqsecmnxx -lqsecmn +@ENABLE_CXX_TRUE@libqsesedxx_la_LDFLAGS = -L. -L../cmn -L../si -version-info 1:0:0 -no-undefined +@ENABLE_CXX_TRUE@libqsesedxx_la_LIBADD = -lqsesed -lqsecmnxx -lqsesi -lqsecmn all: all-am .SUFFIXES: @@ -632,7 +635,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ diff --git a/qse/lib/sed/Sed.cpp b/qse/lib/sed/Sed.cpp index 507bd9bd..2a6fc564 100644 --- a/qse/lib/sed/Sed.cpp +++ b/qse/lib/sed/Sed.cpp @@ -26,8 +26,8 @@ #include #include -#include "../cmn/mem.h" -#include "sed.h" +#include "../cmn/mem-prv.h" +#include "sed-prv.h" ///////////////////////////////// QSE_BEGIN_NAMESPACE(QSE) diff --git a/qse/lib/sed/StdSed.cpp b/qse/lib/sed/StdSed.cpp index 25fc9be0..d6cc22f0 100644 --- a/qse/lib/sed/StdSed.cpp +++ b/qse/lib/sed/StdSed.cpp @@ -27,8 +27,8 @@ #include #include #include -#include "sed.h" -#include "../cmn/mem.h" +#include "sed-prv.h" +#include "../cmn/mem-prv.h" ///////////////////////////////// QSE_BEGIN_NAMESPACE(QSE) diff --git a/qse/lib/sed/err.c b/qse/lib/sed/err.c index 0522c0ff..19abf23e 100644 --- a/qse/lib/sed/err.c +++ b/qse/lib/sed/err.c @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "sed.h" -#include "../cmn/mem.h" +#include "sed-prv.h" +#include "../cmn/mem-prv.h" const qse_char_t* qse_sed_dflerrstr ( const qse_sed_t* sed, qse_sed_errnum_t errnum) diff --git a/qse/lib/sed/sed.h b/qse/lib/sed/sed-prv.h similarity index 98% rename from qse/lib/sed/sed.h rename to qse/lib/sed/sed-prv.h index badf5920..1028b69a 100644 --- a/qse/lib/sed/sed.h +++ b/qse/lib/sed/sed-prv.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_LIB_SED_SED_H_ -#define _QSE_LIB_SED_SED_H_ +#ifndef _QSE_LIB_SED_SED_PRV_H_ +#define _QSE_LIB_SED_SED_PRV_H_ #include #include diff --git a/qse/lib/sed/sed.c b/qse/lib/sed/sed.c index 44019211..70bd52ce 100644 --- a/qse/lib/sed/sed.c +++ b/qse/lib/sed/sed.c @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "sed.h" -#include "../cmn/mem.h" +#include "sed-prv.h" +#include "../cmn/mem-prv.h" #include /* Define USE_REX to use */ diff --git a/qse/lib/sed/std.c b/qse/lib/sed/std.c index dd5cf82a..f4eae5fc 100644 --- a/qse/lib/sed/std.c +++ b/qse/lib/sed/std.c @@ -24,11 +24,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "sed.h" +#include "sed-prv.h" #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" typedef struct xtn_in_t xtn_in_t; struct xtn_in_t diff --git a/qse/lib/si/Makefile.am b/qse/lib/si/Makefile.am index 68db9a28..b832b371 100644 --- a/qse/lib/si/Makefile.am +++ b/qse/lib/si/Makefile.am @@ -4,15 +4,28 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include +noinst_HEADERS = \ + aio-prv.h \ + fs-prv.h \ + glob-imp.h + lib_LTLIBRARIES = libqsesi.la libqsesi_la_SOURCES = \ - aio-prv.h \ aio.c \ aio-pro.c \ aio-sck.c \ aio-tmr.c \ cnd.c \ + dir.c \ fio.c \ + fs.c \ + fs-attr.c \ + fs-copy.c \ + fs-delete.c \ + fs-err.c \ + fs-make.c \ + fs-move.c \ + glob.c \ intr.c \ mtx.c \ mux.c \ diff --git a/qse/lib/si/Makefile.in b/qse/lib/si/Makefile.in index 3437de52..4f63bd2b 100644 --- a/qse/lib/si/Makefile.in +++ b/qse/lib/si/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -81,7 +82,7 @@ host_triplet = @host@ @ENABLE_CXX_TRUE@am__append_1 = libqsesixx.la subdir = lib/si DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/ac/depcomp + $(top_srcdir)/ac/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -130,7 +131,11 @@ 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 \ + libqsesi_la-cnd.lo libqsesi_la-dir.lo libqsesi_la-fio.lo \ + libqsesi_la-fs.lo libqsesi_la-fs-attr.lo \ + libqsesi_la-fs-copy.lo libqsesi_la-fs-delete.lo \ + libqsesi_la-fs-err.lo libqsesi_la-fs-make.lo \ + libqsesi_la-fs-move.lo libqsesi_la-glob.lo libqsesi_la-intr.lo \ libqsesi_la-mtx.lo libqsesi_la-mux.lo libqsesi_la-nwad.lo \ libqsesi_la-nwad-skad.lo libqsesi_la-nwif.lo \ libqsesi_la-nwif-cfg.lo libqsesi_la-nwio.lo libqsesi_la-pio.lo \ @@ -213,6 +218,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -413,15 +419,28 @@ AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include +noinst_HEADERS = \ + aio-prv.h \ + fs-prv.h \ + glob-imp.h + lib_LTLIBRARIES = libqsesi.la $(am__append_1) libqsesi_la_SOURCES = \ - aio-prv.h \ aio.c \ aio-pro.c \ aio-sck.c \ aio-tmr.c \ cnd.c \ + dir.c \ fio.c \ + fs.c \ + fs-attr.c \ + fs-copy.c \ + fs-delete.c \ + fs-err.c \ + fs-make.c \ + fs-move.c \ + glob.c \ intr.c \ mtx.c \ mux.c \ @@ -537,7 +556,16 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-aio-tmr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-aio.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-cnd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-dir.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fs-attr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fs-copy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fs-delete.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fs-err.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fs-make.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fs-move.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-fs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-glob.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-intr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-mtx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libqsesi_la-mux.Plo@am__quote@ @@ -610,6 +638,13 @@ libqsesi_la-cnd.lo: cnd.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-cnd.lo `test -f 'cnd.c' || echo '$(srcdir)/'`cnd.c +libqsesi_la-dir.lo: dir.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-dir.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-dir.Tpo -c -o libqsesi_la-dir.lo `test -f 'dir.c' || echo '$(srcdir)/'`dir.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-dir.Tpo $(DEPDIR)/libqsesi_la-dir.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dir.c' object='libqsesi_la-dir.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-dir.lo `test -f 'dir.c' || echo '$(srcdir)/'`dir.c + libqsesi_la-fio.lo: fio.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fio.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fio.Tpo -c -o libqsesi_la-fio.lo `test -f 'fio.c' || echo '$(srcdir)/'`fio.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fio.Tpo $(DEPDIR)/libqsesi_la-fio.Plo @@ -617,6 +652,62 @@ libqsesi_la-fio.lo: fio.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fio.lo `test -f 'fio.c' || echo '$(srcdir)/'`fio.c +libqsesi_la-fs.lo: fs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fs.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fs.Tpo -c -o libqsesi_la-fs.lo `test -f 'fs.c' || echo '$(srcdir)/'`fs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fs.Tpo $(DEPDIR)/libqsesi_la-fs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fs.c' object='libqsesi_la-fs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fs.lo `test -f 'fs.c' || echo '$(srcdir)/'`fs.c + +libqsesi_la-fs-attr.lo: fs-attr.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fs-attr.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fs-attr.Tpo -c -o libqsesi_la-fs-attr.lo `test -f 'fs-attr.c' || echo '$(srcdir)/'`fs-attr.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fs-attr.Tpo $(DEPDIR)/libqsesi_la-fs-attr.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fs-attr.c' object='libqsesi_la-fs-attr.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fs-attr.lo `test -f 'fs-attr.c' || echo '$(srcdir)/'`fs-attr.c + +libqsesi_la-fs-copy.lo: fs-copy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fs-copy.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fs-copy.Tpo -c -o libqsesi_la-fs-copy.lo `test -f 'fs-copy.c' || echo '$(srcdir)/'`fs-copy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fs-copy.Tpo $(DEPDIR)/libqsesi_la-fs-copy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fs-copy.c' object='libqsesi_la-fs-copy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fs-copy.lo `test -f 'fs-copy.c' || echo '$(srcdir)/'`fs-copy.c + +libqsesi_la-fs-delete.lo: fs-delete.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fs-delete.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fs-delete.Tpo -c -o libqsesi_la-fs-delete.lo `test -f 'fs-delete.c' || echo '$(srcdir)/'`fs-delete.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fs-delete.Tpo $(DEPDIR)/libqsesi_la-fs-delete.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fs-delete.c' object='libqsesi_la-fs-delete.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fs-delete.lo `test -f 'fs-delete.c' || echo '$(srcdir)/'`fs-delete.c + +libqsesi_la-fs-err.lo: fs-err.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fs-err.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fs-err.Tpo -c -o libqsesi_la-fs-err.lo `test -f 'fs-err.c' || echo '$(srcdir)/'`fs-err.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fs-err.Tpo $(DEPDIR)/libqsesi_la-fs-err.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fs-err.c' object='libqsesi_la-fs-err.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fs-err.lo `test -f 'fs-err.c' || echo '$(srcdir)/'`fs-err.c + +libqsesi_la-fs-make.lo: fs-make.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fs-make.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fs-make.Tpo -c -o libqsesi_la-fs-make.lo `test -f 'fs-make.c' || echo '$(srcdir)/'`fs-make.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fs-make.Tpo $(DEPDIR)/libqsesi_la-fs-make.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fs-make.c' object='libqsesi_la-fs-make.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fs-make.lo `test -f 'fs-make.c' || echo '$(srcdir)/'`fs-make.c + +libqsesi_la-fs-move.lo: fs-move.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-fs-move.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-fs-move.Tpo -c -o libqsesi_la-fs-move.lo `test -f 'fs-move.c' || echo '$(srcdir)/'`fs-move.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-fs-move.Tpo $(DEPDIR)/libqsesi_la-fs-move.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fs-move.c' object='libqsesi_la-fs-move.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-fs-move.lo `test -f 'fs-move.c' || echo '$(srcdir)/'`fs-move.c + +libqsesi_la-glob.lo: glob.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-glob.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-glob.Tpo -c -o libqsesi_la-glob.lo `test -f 'glob.c' || echo '$(srcdir)/'`glob.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-glob.Tpo $(DEPDIR)/libqsesi_la-glob.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glob.c' object='libqsesi_la-glob.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -c -o libqsesi_la-glob.lo `test -f 'glob.c' || echo '$(srcdir)/'`glob.c + libqsesi_la-intr.lo: intr.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libqsesi_la_CFLAGS) $(CFLAGS) -MT libqsesi_la-intr.lo -MD -MP -MF $(DEPDIR)/libqsesi_la-intr.Tpo -c -o libqsesi_la-intr.lo `test -f 'intr.c' || echo '$(srcdir)/'`intr.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libqsesi_la-intr.Tpo $(DEPDIR)/libqsesi_la-intr.Plo @@ -833,7 +924,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ diff --git a/qse/lib/si/SocketAddress.cpp b/qse/lib/si/SocketAddress.cpp index a9e7588f..350edd6c 100644 --- a/qse/lib/si/SocketAddress.cpp +++ b/qse/lib/si/SocketAddress.cpp @@ -26,7 +26,7 @@ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/si/aio-prv.h b/qse/lib/si/aio-prv.h index 17c81593..42e6c60f 100644 --- a/qse/lib/si/aio-prv.h +++ b/qse/lib/si/aio-prv.h @@ -28,7 +28,7 @@ #define _QSE_LIB_SI_AIO_PRV_H_ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" typedef struct qse_aio_mux_t qse_aio_mux_t; diff --git a/qse/lib/si/cnd.c b/qse/lib/si/cnd.c index 4df562d3..b60cbe3d 100644 --- a/qse/lib/si/cnd.c +++ b/qse/lib/si/cnd.c @@ -25,7 +25,7 @@ */ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if (!defined(__unix__) && !defined(__unix)) || defined(HAVE_PTHREAD) diff --git a/qse/lib/cmn/dir.c b/qse/lib/si/dir.c similarity index 99% rename from qse/lib/cmn/dir.c rename to qse/lib/si/dir.c index e158032e..573b6dcc 100644 --- a/qse/lib/cmn/dir.c +++ b/qse/lib/si/dir.c @@ -24,12 +24,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include #include -#include "mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include @@ -41,7 +41,7 @@ # include # include #else -# include "syscall.h" +# include "../cmn/syscall.h" #endif @@ -102,7 +102,7 @@ static void close_dir_safely (qse_dir_t* dir); static int reset_to_path (qse_dir_t* dir, const qse_char_t* path); static int read_ahead_and_sort (qse_dir_t* dir, const qse_char_t* path); -#include "syserr.h" +#include "../cmn/syserr.h" IMPLEMENT_SYSERR_TO_ERRNUM (dir, DIR) qse_dir_t* qse_dir_open ( diff --git a/qse/lib/si/fio.c b/qse/lib/si/fio.c index 7d13b36e..73a91606 100644 --- a/qse/lib/si/fio.c +++ b/qse/lib/si/fio.c @@ -30,7 +30,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/cmn/fs-attr.c b/qse/lib/si/fs-attr.c similarity index 98% rename from qse/lib/cmn/fs-attr.c rename to qse/lib/si/fs-attr.c index 333d922d..00dd0df2 100644 --- a/qse/lib/cmn/fs-attr.c +++ b/qse/lib/si/fs-attr.c @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fs.h" -#include "mem.h" +#include "fs-prv.h" +#include "../cmn/mem-prv.h" int qse_fs_sysgetattr (qse_fs_t* fs, const qse_fs_char_t* fspath, qse_fs_attr_t* attr) { diff --git a/qse/lib/cmn/fs-copy.c b/qse/lib/si/fs-copy.c similarity index 99% rename from qse/lib/cmn/fs-copy.c rename to qse/lib/si/fs-copy.c index d999499e..92e89d95 100644 --- a/qse/lib/cmn/fs-copy.c +++ b/qse/lib/si/fs-copy.c @@ -24,10 +24,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fs.h" +#include "fs-prv.h" #include #include -#include "mem.h" +#include "../cmn/mem-prv.h" #define NO_RECURSION 1 diff --git a/qse/lib/cmn/fs-delete.c b/qse/lib/si/fs-delete.c similarity index 99% rename from qse/lib/cmn/fs-delete.c rename to qse/lib/si/fs-delete.c index 11dd4fca..18c02b86 100644 --- a/qse/lib/cmn/fs-delete.c +++ b/qse/lib/si/fs-delete.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fs.h" +#include "fs-prv.h" /* NOTE: * The current implementation require mbs/wcs conversion as diff --git a/qse/lib/cmn/fs-err.c b/qse/lib/si/fs-err.c similarity index 99% rename from qse/lib/cmn/fs-err.c rename to qse/lib/si/fs-err.c index c3054270..9ee94d0c 100644 --- a/qse/lib/cmn/fs-err.c +++ b/qse/lib/si/fs-err.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fs.h" +#include "fs-prv.h" qse_fs_errnum_t qse_fs_geterrnum (qse_fs_t* fs) { diff --git a/qse/lib/cmn/fs-make.c b/qse/lib/si/fs-make.c similarity index 99% rename from qse/lib/cmn/fs-make.c rename to qse/lib/si/fs-make.c index 2899e925..d8b1d916 100644 --- a/qse/lib/cmn/fs-make.c +++ b/qse/lib/si/fs-make.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fs.h" +#include "fs-prv.h" int qse_fs_sysmkdir (qse_fs_t* fs, const qse_fs_char_t* fspath) { diff --git a/qse/lib/cmn/fs-move.c b/qse/lib/si/fs-move.c similarity index 99% rename from qse/lib/cmn/fs-move.c rename to qse/lib/si/fs-move.c index 705cd7bd..8e3a2b69 100644 --- a/qse/lib/cmn/fs-move.c +++ b/qse/lib/si/fs-move.c @@ -24,11 +24,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fs.h" +#include "fs-prv.h" #include #include #include -#include "mem.h" +#include "../cmn/mem-prv.h" /* OVERWRITE AND FORCE handled by callback??? diff --git a/qse/lib/cmn/fs.h b/qse/lib/si/fs-prv.h similarity index 98% rename from qse/lib/cmn/fs.h rename to qse/lib/si/fs-prv.h index 47575d60..06dd5286 100644 --- a/qse/lib/cmn/fs.h +++ b/qse/lib/si/fs-prv.h @@ -24,10 +24,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include +#include +#include #include -#include -#include #include #include #include @@ -46,7 +46,7 @@ # include /* for rename() */ typedef int qse_fs_syserr_t; #else -# include "syscall.h" +# include "../cmn/syscall.h" typedef int qse_fs_syserr_t; #endif diff --git a/qse/lib/cmn/fs.c b/qse/lib/si/fs.c similarity index 99% rename from qse/lib/cmn/fs.c rename to qse/lib/si/fs.c index e90f028f..7e323f3e 100644 --- a/qse/lib/cmn/fs.c +++ b/qse/lib/si/fs.c @@ -24,11 +24,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fs.h" +#include "fs-prv.h" #include #include #include -#include "mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) /* nothing else */ diff --git a/qse/lib/cmn/glob.h b/qse/lib/si/glob-imp.h similarity index 100% rename from qse/lib/cmn/glob.h rename to qse/lib/si/glob-imp.h diff --git a/qse/lib/cmn/glob.c b/qse/lib/si/glob.c similarity index 97% rename from qse/lib/cmn/glob.c rename to qse/lib/si/glob.c index 5e8a6761..40164ef4 100644 --- a/qse/lib/cmn/glob.c +++ b/qse/lib/si/glob.c @@ -24,12 +24,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include +#include + #include #include #include -#include -#include "mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include @@ -43,7 +44,7 @@ #elif defined(macintosh) # include #else -# include "syscall.h" +# include "../cmn/syscall.h" #endif #define NO_RECURSION 1 @@ -116,7 +117,7 @@ typedef enum segment_type_t segment_type_t; #define handle_non_wild_segments mbs_handle_non_wild_segments #define CHAR_IS_MCHAR #undef INCLUDE_MBUF -#include "glob.h" +#include "glob-imp.h" /* -------------------------------------------------------------------- */ @@ -200,4 +201,4 @@ typedef enum segment_type_t segment_type_t; #if !defined(_WIN32) # define INCLUDE_MBUF 1 #endif -#include "glob.h" +#include "glob-imp.h" diff --git a/qse/lib/si/mtx.c b/qse/lib/si/mtx.c index 21d273ae..928246e5 100644 --- a/qse/lib/si/mtx.c +++ b/qse/lib/si/mtx.c @@ -25,7 +25,7 @@ */ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if (!defined(__unix__) && !defined(__unix)) || defined(HAVE_PTHREAD) diff --git a/qse/lib/si/mux.c b/qse/lib/si/mux.c index 78eb2fad..5ccfdf38 100644 --- a/qse/lib/si/mux.c +++ b/qse/lib/si/mux.c @@ -25,7 +25,7 @@ */ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # define FD_SETSIZE 4096 /* what is the best value??? */ diff --git a/qse/lib/si/nwad-skad.c b/qse/lib/si/nwad-skad.c index c481685e..fae4b686 100644 --- a/qse/lib/si/nwad-skad.c +++ b/qse/lib/si/nwad-skad.c @@ -27,7 +27,7 @@ #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/si/nwad.c b/qse/lib/si/nwad.c index a155c745..30840eca 100644 --- a/qse/lib/si/nwad.c +++ b/qse/lib/si/nwad.c @@ -32,7 +32,7 @@ #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" int qse_nwadequal (const qse_nwad_t* x, const qse_nwad_t* y) { diff --git a/qse/lib/si/nwif-cfg.c b/qse/lib/si/nwif-cfg.c index e2bc3d5d..52cd2749 100644 --- a/qse/lib/si/nwif-cfg.c +++ b/qse/lib/si/nwif-cfg.c @@ -28,7 +28,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/si/nwif.c b/qse/lib/si/nwif.c index 0c696893..98319b77 100644 --- a/qse/lib/si/nwif.c +++ b/qse/lib/si/nwif.c @@ -27,7 +27,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) /* TODO: */ diff --git a/qse/lib/si/nwio.c b/qse/lib/si/nwio.c index 5418142a..2424639a 100644 --- a/qse/lib/si/nwio.c +++ b/qse/lib/si/nwio.c @@ -26,7 +26,7 @@ #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/si/pio.c b/qse/lib/si/pio.c index 8ff708c3..03e278a8 100644 --- a/qse/lib/si/pio.c +++ b/qse/lib/si/pio.c @@ -26,7 +26,7 @@ #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN32) # include diff --git a/qse/lib/si/rwl.c b/qse/lib/si/rwl.c index 9f4aabcc..59957d47 100644 --- a/qse/lib/si/rwl.c +++ b/qse/lib/si/rwl.c @@ -25,7 +25,7 @@ */ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" qse_rwl_t* qse_rwl_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, int flags) { diff --git a/qse/lib/si/sio.c b/qse/lib/si/sio.c index 73cd1b1a..5d272155 100644 --- a/qse/lib/si/sio.c +++ b/qse/lib/si/sio.c @@ -26,8 +26,8 @@ #include #include -#include "../cmn/mem.h" -#include "../cmn/fmt.h" +#include "../cmn/mem-prv.h" +#include "../cmn/fmt-prv.h" #if defined(_WIN32) # include /* for the UGLY hack */ diff --git a/qse/lib/si/task.c b/qse/lib/si/task.c index 9315f694..fa982dfd 100644 --- a/qse/lib/si/task.c +++ b/qse/lib/si/task.c @@ -25,7 +25,7 @@ */ #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #if defined(_WIN64) # if !defined(_WIN32_WINNT) diff --git a/qse/lib/si/thr.c b/qse/lib/si/thr.c index 8f3b70b0..6a698801 100644 --- a/qse/lib/si/thr.c +++ b/qse/lib/si/thr.c @@ -26,7 +26,7 @@ #include "thr-prv.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #include #include diff --git a/qse/lib/si/tio.c b/qse/lib/si/tio.c index 542f51ef..db745fdb 100644 --- a/qse/lib/si/tio.c +++ b/qse/lib/si/tio.c @@ -26,7 +26,7 @@ #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" #define STATUS_OUTPUT_DYNBUF (1 << 0) #define STATUS_INPUT_DYNBUF (1 << 1) diff --git a/qse/lib/xli/Makefile.am b/qse/lib/xli/Makefile.am index 4e53cc7e..d96821f4 100644 --- a/qse/lib/xli/Makefile.am +++ b/qse/lib/xli/Makefile.am @@ -6,6 +6,6 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libqsexli.la libqsexli_la_SOURCES = xli.h xli.c err.c read.c read-ini.c write.c write-ini.c std.c -libqsexli_la_LDFLAGS = -L../cmn -L../io -version-info 1:0:0 -no-undefined -libqsexli_la_LIBADD = -lqsecmn -lqseio +libqsexli_la_LDFLAGS = -L../cmn -L../si -version-info 1:0:0 -no-undefined +libqsexli_la_LIBADD = -lqsesi -lqsecmn diff --git a/qse/lib/xli/Makefile.in b/qse/lib/xli/Makefile.in index 171bc296..45fa88cb 100644 --- a/qse/lib/xli/Makefile.in +++ b/qse/lib/xli/Makefile.in @@ -379,8 +379,8 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libqsexli.la libqsexli_la_SOURCES = xli.h xli.c err.c read.c read-ini.c write.c write-ini.c std.c -libqsexli_la_LDFLAGS = -L../cmn -L../io -version-info 1:0:0 -no-undefined -libqsexli_la_LIBADD = -lqsecmn -lqseio +libqsexli_la_LDFLAGS = -L../cmn -L../si -version-info 1:0:0 -no-undefined +libqsexli_la_LIBADD = -lqsesi -lqsecmn all: all-am .SUFFIXES: diff --git a/qse/lib/xli/err.c b/qse/lib/xli/err.c index 35f5e509..1eedce31 100644 --- a/qse/lib/xli/err.c +++ b/qse/lib/xli/err.c @@ -25,7 +25,7 @@ */ #include "xli.h" -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" const qse_char_t* qse_xli_dflerrstr ( const qse_xli_t* xli, qse_xli_errnum_t errnum) diff --git a/qse/lib/xli/std.c b/qse/lib/xli/std.c index 507dfd91..ec1f0061 100644 --- a/qse/lib/xli/std.c +++ b/qse/lib/xli/std.c @@ -27,7 +27,7 @@ #include "xli.h" #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" typedef struct xtn_t { diff --git a/qse/lib/xli/xli.h b/qse/lib/xli/xli.h index fd1f4923..3fc1e7db 100644 --- a/qse/lib/xli/xli.h +++ b/qse/lib/xli/xli.h @@ -30,7 +30,7 @@ #include #include #include -#include "../cmn/mem.h" +#include "../cmn/mem-prv.h" enum qse_xli_tok_type_t { diff --git a/qse/samples/awk/awk01.c b/qse/samples/awk/awk01.c index 1eb3fa24..f0f2d270 100644 --- a/qse/samples/awk/awk01.c +++ b/qse/samples/awk/awk01.c @@ -1,5 +1,5 @@ #include -#include +#include static const qse_char_t* script = QSE_T("BEGIN { print \"hello, world\"; }"); diff --git a/qse/samples/awk/awk02.c b/qse/samples/awk/awk02.c index 12d76bee..7739b2bb 100644 --- a/qse/samples/awk/awk02.c +++ b/qse/samples/awk/awk02.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include "awk00.h" diff --git a/qse/samples/awk/awk03.c b/qse/samples/awk/awk03.c index 5d80dac8..81bc76cd 100644 --- a/qse/samples/awk/awk03.c +++ b/qse/samples/awk/awk03.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include "awk00.h" diff --git a/qse/samples/awk/awk04.c b/qse/samples/awk/awk04.c index abb775fc..c820a920 100644 --- a/qse/samples/awk/awk04.c +++ b/qse/samples/awk/awk04.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include "awk00.h" diff --git a/qse/samples/awk/awk05.c b/qse/samples/awk/awk05.c index 7ee024c5..665424c5 100644 --- a/qse/samples/awk/awk05.c +++ b/qse/samples/awk/awk05.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include "awk00.h" diff --git a/qse/samples/awk/awk06.c b/qse/samples/awk/awk06.c index 4f28db56..09681052 100644 --- a/qse/samples/awk/awk06.c +++ b/qse/samples/awk/awk06.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include "awk00.h" diff --git a/qse/samples/awk/awk07.c b/qse/samples/awk/awk07.c index ec18a2be..09a04a3a 100644 --- a/qse/samples/awk/awk07.c +++ b/qse/samples/awk/awk07.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include "awk00.h" diff --git a/qse/samples/awk/awk08.c b/qse/samples/awk/awk08.c index 54e558c0..0e28711a 100644 --- a/qse/samples/awk/awk08.c +++ b/qse/samples/awk/awk08.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include "awk00.h" diff --git a/qse/samples/awk/awk09.c b/qse/samples/awk/awk09.c index a2265572..a2bc60f4 100644 --- a/qse/samples/awk/awk09.c +++ b/qse/samples/awk/awk09.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/qse/samples/awk/awk10.c b/qse/samples/awk/awk10.c index f200a521..ce0df1aa 100644 --- a/qse/samples/awk/awk10.c +++ b/qse/samples/awk/awk10.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/qse/samples/awk/awk11.c b/qse/samples/awk/awk11.c index 1ac5c92c..4022c44a 100644 --- a/qse/samples/awk/awk11.c +++ b/qse/samples/awk/awk11.c @@ -25,7 +25,7 @@ */ #include -#include +#include const qse_char_t* src = QSE_T("BEGIN { print \"hello, world\" | \"dir\"; }"); diff --git a/qse/samples/awk/awk12.c b/qse/samples/awk/awk12.c index 3ccbb060..a6cd7fe6 100644 --- a/qse/samples/awk/awk12.c +++ b/qse/samples/awk/awk12.c @@ -1,5 +1,5 @@ #include -#include +#include /* this sample produces 8 text files containing multiplication chart. */ diff --git a/qse/samples/awk/awk15.c b/qse/samples/awk/awk15.c index b8958e40..a2fb12ee 100644 --- a/qse/samples/awk/awk15.c +++ b/qse/samples/awk/awk15.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include static const qse_char_t* src = QSE_T( "BEGIN {" diff --git a/qse/samples/awk/awk22.cpp b/qse/samples/awk/awk22.cpp index b32603fc..14f7add3 100644 --- a/qse/samples/awk/awk22.cpp +++ b/qse/samples/awk/awk22.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #if defined(QSE_CHAR_IS_WCHAR) diff --git a/qse/samples/awk/awk23.cpp b/qse/samples/awk/awk23.cpp index cd469f79..464f8ac9 100644 --- a/qse/samples/awk/awk23.cpp +++ b/qse/samples/awk/awk23.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #if defined(QSE_CHAR_IS_WCHAR) diff --git a/qse/samples/awk/awk24.cpp b/qse/samples/awk/awk24.cpp index 3bf0aa99..ff2ddb81 100644 --- a/qse/samples/awk/awk24.cpp +++ b/qse/samples/awk/awk24.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include diff --git a/qse/samples/awk/awk25.cpp b/qse/samples/awk/awk25.cpp index b94559ed..e0cd19bc 100644 --- a/qse/samples/awk/awk25.cpp +++ b/qse/samples/awk/awk25.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/qse/samples/awk/awk26.cpp b/qse/samples/awk/awk26.cpp index aae497a5..7afb4c47 100644 --- a/qse/samples/awk/awk26.cpp +++ b/qse/samples/awk/awk26.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include diff --git a/qse/samples/awk/awk27.cpp b/qse/samples/awk/awk27.cpp index ce705beb..c4617888 100644 --- a/qse/samples/awk/awk27.cpp +++ b/qse/samples/awk/awk27.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include diff --git a/qse/samples/awk/awk28.cpp b/qse/samples/awk/awk28.cpp index 24b379a3..600aa0bd 100644 --- a/qse/samples/awk/awk28.cpp +++ b/qse/samples/awk/awk28.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include diff --git a/qse/samples/cmn/Makefile.am b/qse/samples/cmn/Makefile.am index 87be46aa..3720b9d3 100644 --- a/qse/samples/cmn/Makefile.am +++ b/qse/samples/cmn/Makefile.am @@ -8,43 +8,34 @@ AM_CPPFLAGS = \ bin_PROGRAMS = \ chr01 \ - dir01 \ dll \ env01 \ fma \ fmt01 \ fmt02 \ - fs01 \ - fs02 \ - fs03 \ htb01 \ - glob01 \ ipad01 \ lda \ main01 \ main02 \ mbwc01 \ mbwc02 \ - nwad01 \ - nwif01 \ - nwif02 \ oht \ path01 \ - pio \ pma \ rex01 \ rbt01 \ sll \ slmb01 \ str01 \ - task01 \ + str02 \ time \ tre01 \ uri01 \ xma -AM_LDFLAGS = -L../../lib/cmn -LDADD = -lqsecmn +AM_LDFLAGS = -L../../lib/si -L../../lib/cmn +LDADD = -lqsesi -lqsecmn if WIN32 if WCHAR @@ -58,8 +49,6 @@ dll_SOURCES = dll.c fma_SOURCES = fma.c fmt01_SOURCES = fmt01.c fmt02_SOURCES = fmt02.c -fs01_SOURCES = fs01.c -glob01_SOURCES = glob01.c htb01_SOURCES = htb01.c ipad01_SOURCES = ipad01.c lda_SOURCES = lda.c @@ -67,10 +56,8 @@ main01_SOURCES = main01.c main02_SOURCES = main02.c mbwc01_SOURCES = mbwc01.c mbwc02_SOURCES = mbwc02.c -nwad01_SOURCES = nwad01.c oht_SOURCES = oht.c path01_SOURCES = path01.c -pio_SOURCES = pio.c pma_SOURCES = pma.c rex01_SOURCES = rex01.c rbt01_SOURCES = rbt01.c diff --git a/qse/samples/cmn/Makefile.in b/qse/samples/cmn/Makefile.in index 37ae5ea0..255446be 100644 --- a/qse/samples/cmn/Makefile.in +++ b/qse/samples/cmn/Makefile.in @@ -78,16 +78,13 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = chr01$(EXEEXT) dir01$(EXEEXT) dll$(EXEEXT) \ - env01$(EXEEXT) fma$(EXEEXT) fmt01$(EXEEXT) fmt02$(EXEEXT) \ - fs01$(EXEEXT) fs02$(EXEEXT) fs03$(EXEEXT) htb01$(EXEEXT) \ - glob01$(EXEEXT) ipad01$(EXEEXT) lda$(EXEEXT) main01$(EXEEXT) \ - main02$(EXEEXT) mbwc01$(EXEEXT) mbwc02$(EXEEXT) \ - nwad01$(EXEEXT) nwif01$(EXEEXT) nwif02$(EXEEXT) oht$(EXEEXT) \ - path01$(EXEEXT) pio$(EXEEXT) pma$(EXEEXT) rex01$(EXEEXT) \ - rbt01$(EXEEXT) sll$(EXEEXT) slmb01$(EXEEXT) str01$(EXEEXT) \ - task01$(EXEEXT) time$(EXEEXT) tre01$(EXEEXT) uri01$(EXEEXT) \ - xma$(EXEEXT) $(am__EXEEXT_1) +bin_PROGRAMS = chr01$(EXEEXT) dll$(EXEEXT) env01$(EXEEXT) fma$(EXEEXT) \ + fmt01$(EXEEXT) fmt02$(EXEEXT) htb01$(EXEEXT) ipad01$(EXEEXT) \ + lda$(EXEEXT) main01$(EXEEXT) main02$(EXEEXT) mbwc01$(EXEEXT) \ + mbwc02$(EXEEXT) oht$(EXEEXT) path01$(EXEEXT) pma$(EXEEXT) \ + rex01$(EXEEXT) rbt01$(EXEEXT) sll$(EXEEXT) slmb01$(EXEEXT) \ + str01$(EXEEXT) str02$(EXEEXT) time$(EXEEXT) tre01$(EXEEXT) \ + uri01$(EXEEXT) xma$(EXEEXT) $(am__EXEEXT_1) @WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS) #bin_PROGRAMS += rex02 @@ -146,10 +143,6 @@ am_chr01_OBJECTS = chr01.$(OBJEXT) chr01_OBJECTS = $(am_chr01_OBJECTS) chr01_LDADD = $(LDADD) chr01_DEPENDENCIES = $(am__DEPENDENCIES_2) -dir01_SOURCES = dir01.c -dir01_OBJECTS = dir01.$(OBJEXT) -dir01_LDADD = $(LDADD) -dir01_DEPENDENCIES = $(am__DEPENDENCIES_2) am_dll_OBJECTS = dll.$(OBJEXT) dll_OBJECTS = $(am_dll_OBJECTS) dll_LDADD = $(LDADD) @@ -170,22 +163,6 @@ am_fmt02_OBJECTS = fmt02.$(OBJEXT) fmt02_OBJECTS = $(am_fmt02_OBJECTS) fmt02_LDADD = $(LDADD) fmt02_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_fs01_OBJECTS = fs01.$(OBJEXT) -fs01_OBJECTS = $(am_fs01_OBJECTS) -fs01_LDADD = $(LDADD) -fs01_DEPENDENCIES = $(am__DEPENDENCIES_2) -fs02_SOURCES = fs02.c -fs02_OBJECTS = fs02.$(OBJEXT) -fs02_LDADD = $(LDADD) -fs02_DEPENDENCIES = $(am__DEPENDENCIES_2) -fs03_SOURCES = fs03.c -fs03_OBJECTS = fs03.$(OBJEXT) -fs03_LDADD = $(LDADD) -fs03_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_glob01_OBJECTS = glob01.$(OBJEXT) -glob01_OBJECTS = $(am_glob01_OBJECTS) -glob01_LDADD = $(LDADD) -glob01_DEPENDENCIES = $(am__DEPENDENCIES_2) am__hl01_SOURCES_DIST = hl01.cpp @ENABLE_CXX_TRUE@am_hl01_OBJECTS = hl01.$(OBJEXT) hl01_OBJECTS = $(am_hl01_OBJECTS) @@ -222,18 +199,6 @@ am_mbwc02_OBJECTS = mbwc02.$(OBJEXT) mbwc02_OBJECTS = $(am_mbwc02_OBJECTS) mbwc02_LDADD = $(LDADD) mbwc02_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_nwad01_OBJECTS = nwad01.$(OBJEXT) -nwad01_OBJECTS = $(am_nwad01_OBJECTS) -nwad01_LDADD = $(LDADD) -nwad01_DEPENDENCIES = $(am__DEPENDENCIES_2) -nwif01_SOURCES = nwif01.c -nwif01_OBJECTS = nwif01.$(OBJEXT) -nwif01_LDADD = $(LDADD) -nwif01_DEPENDENCIES = $(am__DEPENDENCIES_2) -nwif02_SOURCES = nwif02.c -nwif02_OBJECTS = nwif02.$(OBJEXT) -nwif02_LDADD = $(LDADD) -nwif02_DEPENDENCIES = $(am__DEPENDENCIES_2) am_oht_OBJECTS = oht.$(OBJEXT) oht_OBJECTS = $(am_oht_OBJECTS) oht_LDADD = $(LDADD) @@ -242,10 +207,6 @@ am_path01_OBJECTS = path01.$(OBJEXT) path01_OBJECTS = $(am_path01_OBJECTS) path01_LDADD = $(LDADD) path01_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_pio_OBJECTS = pio.$(OBJEXT) -pio_OBJECTS = $(am_pio_OBJECTS) -pio_LDADD = $(LDADD) -pio_DEPENDENCIES = $(am__DEPENDENCIES_2) am_pma_OBJECTS = pma.$(OBJEXT) pma_OBJECTS = $(am_pma_OBJECTS) pma_LDADD = $(LDADD) @@ -290,10 +251,6 @@ am__str02_SOURCES_DIST = str02.cpp @ENABLE_CXX_TRUE@am_str02_OBJECTS = str02.$(OBJEXT) str02_OBJECTS = $(am_str02_OBJECTS) @ENABLE_CXX_TRUE@str02_DEPENDENCIES = $(am__DEPENDENCIES_3) -task01_SOURCES = task01.c -task01_OBJECTS = task01.$(OBJEXT) -task01_LDADD = $(LDADD) -task01_DEPENDENCIES = $(am__DEPENDENCIES_2) am_time_OBJECTS = time.$(OBJEXT) time_OBJECTS = $(am_time_OBJECTS) time_LDADD = $(LDADD) @@ -363,35 +320,31 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = SOURCES = $(arr01_SOURCES) $(arr02_SOURCES) $(bh01_SOURCES) \ - $(bh02_SOURCES) $(chr01_SOURCES) dir01.c $(dll_SOURCES) \ + $(bh02_SOURCES) $(chr01_SOURCES) $(dll_SOURCES) \ $(env01_SOURCES) $(fma_SOURCES) $(fmt01_SOURCES) \ - $(fmt02_SOURCES) $(fs01_SOURCES) fs02.c fs03.c \ - $(glob01_SOURCES) $(hl01_SOURCES) $(htb01_SOURCES) \ + $(fmt02_SOURCES) $(hl01_SOURCES) $(htb01_SOURCES) \ $(htb02_SOURCES) $(ipad01_SOURCES) $(lda_SOURCES) \ $(main01_SOURCES) $(main02_SOURCES) $(mbwc01_SOURCES) \ - $(mbwc02_SOURCES) $(nwad01_SOURCES) nwif01.c nwif02.c \ - $(oht_SOURCES) $(path01_SOURCES) $(pio_SOURCES) $(pma_SOURCES) \ - $(rbt01_SOURCES) $(rbt02_SOURCES) $(rbt03_SOURCES) \ - $(rex01_SOURCES) $(sll_SOURCES) $(slmb01_SOURCES) \ - $(sp01_SOURCES) $(sp02_SOURCES) $(str01_SOURCES) \ - $(str02_SOURCES) task01.c $(time_SOURCES) $(tre01_SOURCES) \ - uri01.c $(xma_SOURCES) + $(mbwc02_SOURCES) $(oht_SOURCES) $(path01_SOURCES) \ + $(pma_SOURCES) $(rbt01_SOURCES) $(rbt02_SOURCES) \ + $(rbt03_SOURCES) $(rex01_SOURCES) $(sll_SOURCES) \ + $(slmb01_SOURCES) $(sp01_SOURCES) $(sp02_SOURCES) \ + $(str01_SOURCES) $(str02_SOURCES) $(time_SOURCES) \ + $(tre01_SOURCES) uri01.c $(xma_SOURCES) DIST_SOURCES = $(am__arr01_SOURCES_DIST) $(am__arr02_SOURCES_DIST) \ $(am__bh01_SOURCES_DIST) $(am__bh02_SOURCES_DIST) \ - $(chr01_SOURCES) dir01.c $(dll_SOURCES) $(env01_SOURCES) \ + $(chr01_SOURCES) $(dll_SOURCES) $(env01_SOURCES) \ $(fma_SOURCES) $(fmt01_SOURCES) $(fmt02_SOURCES) \ - $(fs01_SOURCES) fs02.c fs03.c $(glob01_SOURCES) \ $(am__hl01_SOURCES_DIST) $(htb01_SOURCES) \ $(am__htb02_SOURCES_DIST) $(ipad01_SOURCES) $(lda_SOURCES) \ $(main01_SOURCES) $(main02_SOURCES) $(mbwc01_SOURCES) \ - $(mbwc02_SOURCES) $(nwad01_SOURCES) nwif01.c nwif02.c \ - $(oht_SOURCES) $(path01_SOURCES) $(pio_SOURCES) $(pma_SOURCES) \ - $(rbt01_SOURCES) $(am__rbt02_SOURCES_DIST) \ + $(mbwc02_SOURCES) $(oht_SOURCES) $(path01_SOURCES) \ + $(pma_SOURCES) $(rbt01_SOURCES) $(am__rbt02_SOURCES_DIST) \ $(am__rbt03_SOURCES_DIST) $(rex01_SOURCES) $(sll_SOURCES) \ $(slmb01_SOURCES) $(am__sp01_SOURCES_DIST) \ $(am__sp02_SOURCES_DIST) $(str01_SOURCES) \ - $(am__str02_SOURCES_DIST) task01.c $(time_SOURCES) \ - $(tre01_SOURCES) uri01.c $(xma_SOURCES) + $(am__str02_SOURCES_DIST) $(time_SOURCES) $(tre01_SOURCES) \ + uri01.c $(xma_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -598,16 +551,14 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(includedir) -AM_LDFLAGS = -L../../lib/cmn -LDADD = -lqsecmn $(am__append_1) +AM_LDFLAGS = -L../../lib/si -L../../lib/cmn +LDADD = -lqsesi -lqsecmn $(am__append_1) chr01_SOURCES = chr01.c env01_SOURCES = env01.c dll_SOURCES = dll.c fma_SOURCES = fma.c fmt01_SOURCES = fmt01.c fmt02_SOURCES = fmt02.c -fs01_SOURCES = fs01.c -glob01_SOURCES = glob01.c htb01_SOURCES = htb01.c ipad01_SOURCES = ipad01.c lda_SOURCES = lda.c @@ -615,10 +566,8 @@ main01_SOURCES = main01.c main02_SOURCES = main02.c mbwc01_SOURCES = mbwc01.c mbwc02_SOURCES = mbwc02.c -nwad01_SOURCES = nwad01.c oht_SOURCES = oht.c path01_SOURCES = path01.c -pio_SOURCES = pio.c pma_SOURCES = pma.c rex01_SOURCES = rex01.c rbt01_SOURCES = rbt01.c @@ -754,10 +703,6 @@ chr01$(EXEEXT): $(chr01_OBJECTS) $(chr01_DEPENDENCIES) $(EXTRA_chr01_DEPENDENCIE @rm -f chr01$(EXEEXT) $(AM_V_CCLD)$(LINK) $(chr01_OBJECTS) $(chr01_LDADD) $(LIBS) -dir01$(EXEEXT): $(dir01_OBJECTS) $(dir01_DEPENDENCIES) $(EXTRA_dir01_DEPENDENCIES) - @rm -f dir01$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dir01_OBJECTS) $(dir01_LDADD) $(LIBS) - dll$(EXEEXT): $(dll_OBJECTS) $(dll_DEPENDENCIES) $(EXTRA_dll_DEPENDENCIES) @rm -f dll$(EXEEXT) $(AM_V_CCLD)$(LINK) $(dll_OBJECTS) $(dll_LDADD) $(LIBS) @@ -778,22 +723,6 @@ fmt02$(EXEEXT): $(fmt02_OBJECTS) $(fmt02_DEPENDENCIES) $(EXTRA_fmt02_DEPENDENCIE @rm -f fmt02$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fmt02_OBJECTS) $(fmt02_LDADD) $(LIBS) -fs01$(EXEEXT): $(fs01_OBJECTS) $(fs01_DEPENDENCIES) $(EXTRA_fs01_DEPENDENCIES) - @rm -f fs01$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fs01_OBJECTS) $(fs01_LDADD) $(LIBS) - -fs02$(EXEEXT): $(fs02_OBJECTS) $(fs02_DEPENDENCIES) $(EXTRA_fs02_DEPENDENCIES) - @rm -f fs02$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fs02_OBJECTS) $(fs02_LDADD) $(LIBS) - -fs03$(EXEEXT): $(fs03_OBJECTS) $(fs03_DEPENDENCIES) $(EXTRA_fs03_DEPENDENCIES) - @rm -f fs03$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fs03_OBJECTS) $(fs03_LDADD) $(LIBS) - -glob01$(EXEEXT): $(glob01_OBJECTS) $(glob01_DEPENDENCIES) $(EXTRA_glob01_DEPENDENCIES) - @rm -f glob01$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(glob01_OBJECTS) $(glob01_LDADD) $(LIBS) - hl01$(EXEEXT): $(hl01_OBJECTS) $(hl01_DEPENDENCIES) $(EXTRA_hl01_DEPENDENCIES) @rm -f hl01$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(hl01_OBJECTS) $(hl01_LDADD) $(LIBS) @@ -830,18 +759,6 @@ mbwc02$(EXEEXT): $(mbwc02_OBJECTS) $(mbwc02_DEPENDENCIES) $(EXTRA_mbwc02_DEPENDE @rm -f mbwc02$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mbwc02_OBJECTS) $(mbwc02_LDADD) $(LIBS) -nwad01$(EXEEXT): $(nwad01_OBJECTS) $(nwad01_DEPENDENCIES) $(EXTRA_nwad01_DEPENDENCIES) - @rm -f nwad01$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(nwad01_OBJECTS) $(nwad01_LDADD) $(LIBS) - -nwif01$(EXEEXT): $(nwif01_OBJECTS) $(nwif01_DEPENDENCIES) $(EXTRA_nwif01_DEPENDENCIES) - @rm -f nwif01$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(nwif01_OBJECTS) $(nwif01_LDADD) $(LIBS) - -nwif02$(EXEEXT): $(nwif02_OBJECTS) $(nwif02_DEPENDENCIES) $(EXTRA_nwif02_DEPENDENCIES) - @rm -f nwif02$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(nwif02_OBJECTS) $(nwif02_LDADD) $(LIBS) - oht$(EXEEXT): $(oht_OBJECTS) $(oht_DEPENDENCIES) $(EXTRA_oht_DEPENDENCIES) @rm -f oht$(EXEEXT) $(AM_V_CCLD)$(LINK) $(oht_OBJECTS) $(oht_LDADD) $(LIBS) @@ -850,10 +767,6 @@ path01$(EXEEXT): $(path01_OBJECTS) $(path01_DEPENDENCIES) $(EXTRA_path01_DEPENDE @rm -f path01$(EXEEXT) $(AM_V_CCLD)$(LINK) $(path01_OBJECTS) $(path01_LDADD) $(LIBS) -pio$(EXEEXT): $(pio_OBJECTS) $(pio_DEPENDENCIES) $(EXTRA_pio_DEPENDENCIES) - @rm -f pio$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pio_OBJECTS) $(pio_LDADD) $(LIBS) - pma$(EXEEXT): $(pma_OBJECTS) $(pma_DEPENDENCIES) $(EXTRA_pma_DEPENDENCIES) @rm -f pma$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pma_OBJECTS) $(pma_LDADD) $(LIBS) @@ -898,10 +811,6 @@ str02$(EXEEXT): $(str02_OBJECTS) $(str02_DEPENDENCIES) $(EXTRA_str02_DEPENDENCIE @rm -f str02$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(str02_OBJECTS) $(str02_LDADD) $(LIBS) -task01$(EXEEXT): $(task01_OBJECTS) $(task01_DEPENDENCIES) $(EXTRA_task01_DEPENDENCIES) - @rm -f task01$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(task01_OBJECTS) $(task01_LDADD) $(LIBS) - time$(EXEEXT): $(time_OBJECTS) $(time_DEPENDENCIES) $(EXTRA_time_DEPENDENCIES) @rm -f time$(EXEEXT) $(AM_V_CCLD)$(LINK) $(time_OBJECTS) $(time_LDADD) $(LIBS) @@ -929,16 +838,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bh01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bh02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chr01.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dll.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fma.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt02.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs01.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs02.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs03.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glob01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hl01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htb01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htb02.Po@am__quote@ @@ -948,12 +852,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbwc01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbwc02.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwad01.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwif01.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwif02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oht.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path01.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pma.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rbt01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rbt02.Po@am__quote@ @@ -965,7 +865,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sp02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str02.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tre01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uri01.Po@am__quote@ diff --git a/qse/samples/cmn/chr01.c b/qse/samples/cmn/chr01.c index e035fd79..f678af8a 100644 --- a/qse/samples/cmn/chr01.c +++ b/qse/samples/cmn/chr01.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include diff --git a/qse/samples/cmn/dll.c b/qse/samples/cmn/dll.c index 84e739b2..3fc127d5 100644 --- a/qse/samples/cmn/dll.c +++ b/qse/samples/cmn/dll.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #define R(f) \ diff --git a/qse/samples/cmn/env01.c b/qse/samples/cmn/env01.c index 020d6211..2c7ef6ca 100644 --- a/qse/samples/cmn/env01.c +++ b/qse/samples/cmn/env01.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #define R(f) \ do { \ diff --git a/qse/samples/cmn/fma.c b/qse/samples/cmn/fma.c index a46bfc5f..c19d26e4 100644 --- a/qse/samples/cmn/fma.c +++ b/qse/samples/cmn/fma.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #define R(f) \ do { \ diff --git a/qse/samples/cmn/fmt01.c b/qse/samples/cmn/fmt01.c index 47a883e5..339bf63d 100644 --- a/qse/samples/cmn/fmt01.c +++ b/qse/samples/cmn/fmt01.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/fmt02.c b/qse/samples/cmn/fmt02.c index 2daa658b..4f69c264 100644 --- a/qse/samples/cmn/fmt02.c +++ b/qse/samples/cmn/fmt02.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/hl01.cpp b/qse/samples/cmn/hl01.cpp index 6e27a186..e82e5f17 100644 --- a/qse/samples/cmn/hl01.cpp +++ b/qse/samples/cmn/hl01.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include class T diff --git a/qse/samples/cmn/htb01.c b/qse/samples/cmn/htb01.c index 7fcbed35..1ca66b19 100644 --- a/qse/samples/cmn/htb01.c +++ b/qse/samples/cmn/htb01.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #define R(f) \ do { \ diff --git a/qse/samples/cmn/htb02.cpp b/qse/samples/cmn/htb02.cpp index b4f99ef0..3fe1f649 100644 --- a/qse/samples/cmn/htb02.cpp +++ b/qse/samples/cmn/htb02.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/qse/samples/cmn/ipad01.c b/qse/samples/cmn/ipad01.c index 8853aeb8..5199726c 100644 --- a/qse/samples/cmn/ipad01.c +++ b/qse/samples/cmn/ipad01.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/lda.c b/qse/samples/cmn/lda.c index 49cb5ef0..37fcce41 100644 --- a/qse/samples/cmn/lda.c +++ b/qse/samples/cmn/lda.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/qse/samples/cmn/main01.c b/qse/samples/cmn/main01.c index 523fd63c..642c2561 100644 --- a/qse/samples/cmn/main01.c +++ b/qse/samples/cmn/main01.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include diff --git a/qse/samples/cmn/main02.c b/qse/samples/cmn/main02.c index c5f35b9c..60998c9f 100644 --- a/qse/samples/cmn/main02.c +++ b/qse/samples/cmn/main02.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include diff --git a/qse/samples/cmn/mbwc01.c b/qse/samples/cmn/mbwc01.c index eda25249..b2725d92 100644 --- a/qse/samples/cmn/mbwc01.c +++ b/qse/samples/cmn/mbwc01.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/qse/samples/cmn/mbwc02.c b/qse/samples/cmn/mbwc02.c index a65b0a4f..b1426979 100644 --- a/qse/samples/cmn/mbwc02.c +++ b/qse/samples/cmn/mbwc02.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/qse/samples/cmn/oht.c b/qse/samples/cmn/oht.c index 2e1fbae3..6bdba11c 100644 --- a/qse/samples/cmn/oht.c +++ b/qse/samples/cmn/oht.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #define R(f) \ diff --git a/qse/samples/cmn/path01.c b/qse/samples/cmn/path01.c index 48461b9c..47cc7982 100644 --- a/qse/samples/cmn/path01.c +++ b/qse/samples/cmn/path01.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/pma.c b/qse/samples/cmn/pma.c index 09de2dd6..ef253609 100644 --- a/qse/samples/cmn/pma.c +++ b/qse/samples/cmn/pma.c @@ -1,6 +1,6 @@ #include #include -#include +#include #define R(f) \ do { \ diff --git a/qse/samples/cmn/rbt01.c b/qse/samples/cmn/rbt01.c index 753cbde1..36a8475f 100644 --- a/qse/samples/cmn/rbt01.c +++ b/qse/samples/cmn/rbt01.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/qse/samples/cmn/rbt03.cpp b/qse/samples/cmn/rbt03.cpp index 3395f04f..4bb2fb67 100644 --- a/qse/samples/cmn/rbt03.cpp +++ b/qse/samples/cmn/rbt03.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/qse/samples/cmn/rex01.c b/qse/samples/cmn/rex01.c index dd08f469..c3b454d1 100644 --- a/qse/samples/cmn/rex01.c +++ b/qse/samples/cmn/rex01.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/sll.c b/qse/samples/cmn/sll.c index ee37cee0..996d0eea 100644 --- a/qse/samples/cmn/sll.c +++ b/qse/samples/cmn/sll.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #define R(f) \ diff --git a/qse/samples/cmn/slmb01.c b/qse/samples/cmn/slmb01.c index 20146915..4df166fd 100644 --- a/qse/samples/cmn/slmb01.c +++ b/qse/samples/cmn/slmb01.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/qse/samples/cmn/str01.c b/qse/samples/cmn/str01.c index c2b326d8..41ec24ea 100644 --- a/qse/samples/cmn/str01.c +++ b/qse/samples/cmn/str01.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include diff --git a/qse/samples/cmn/str02.cpp b/qse/samples/cmn/str02.cpp index 2ffaf937..94cb6bb3 100644 --- a/qse/samples/cmn/str02.cpp +++ b/qse/samples/cmn/str02.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/qse/samples/cmn/time.c b/qse/samples/cmn/time.c index 28ba25af..73697641 100644 --- a/qse/samples/cmn/time.c +++ b/qse/samples/cmn/time.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include diff --git a/qse/samples/cmn/tre01.c b/qse/samples/cmn/tre01.c index 84cf283d..c9be0178 100644 --- a/qse/samples/cmn/tre01.c +++ b/qse/samples/cmn/tre01.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/uri01.c b/qse/samples/cmn/uri01.c index 5ba11626..ac13de4a 100644 --- a/qse/samples/cmn/uri01.c +++ b/qse/samples/cmn/uri01.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/xma.c b/qse/samples/cmn/xma.c index 58668450..e2039d9f 100644 --- a/qse/samples/cmn/xma.c +++ b/qse/samples/cmn/xma.c @@ -1,6 +1,6 @@ #include #include -#include +#include #define R(f) \ do { \ diff --git a/qse/samples/http/Makefile.am b/qse/samples/http/Makefile.am index eb04cb25..5e6c0d32 100644 --- a/qse/samples/http/Makefile.am +++ b/qse/samples/http/Makefile.am @@ -1,11 +1,11 @@ -AUTOMAKE_OPTIONS = nostdinc +AiUTOMAKE_OPTIONS = nostdinc AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(includedir) -bin_PROGRAMS = httpd01 httpd02 upxd01 +bin_PROGRAMS = httpd01 AM_LDFLAGS = -L../../lib/cmn -L../../lib/http LDADD = -lqsehttp -lqsecmn $(PTHREAD_LIBS) $(SOCKET_LIBS) $(SENDFILE_LIBS) @@ -17,8 +17,5 @@ endif endif httpd01_SOURCES = httpd01.c -httpd02_SOURCES = httpd02.c -upxd01_SOURCES = upxd01.c httpd01_LDADD = $(LDADD) $(SSL_LIBS) -httpd02_LDADD = $(LDADD) $(SSL_LIBS) diff --git a/qse/samples/http/Makefile.in b/qse/samples/http/Makefile.in index 7458a255..3ecf739a 100644 --- a/qse/samples/http/Makefile.in +++ b/qse/samples/http/Makefile.in @@ -78,7 +78,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = httpd01$(EXEEXT) httpd02$(EXEEXT) upxd01$(EXEEXT) +bin_PROGRAMS = httpd01$(EXEEXT) @WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS) subdir = samples/http DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -111,14 +111,6 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -am_httpd02_OBJECTS = httpd02.$(OBJEXT) -httpd02_OBJECTS = $(am_httpd02_OBJECTS) -httpd02_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) -am_upxd01_OBJECTS = upxd01.$(OBJEXT) -upxd01_OBJECTS = $(am_upxd01_OBJECTS) -upxd01_LDADD = $(LDADD) -upxd01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -131,7 +123,7 @@ AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEFAULT_INCLUDES = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse depcomp = $(SHELL) $(top_srcdir)/ac/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -153,8 +145,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(httpd01_SOURCES) $(httpd02_SOURCES) $(upxd01_SOURCES) -DIST_SOURCES = $(httpd01_SOURCES) $(httpd02_SOURCES) $(upxd01_SOURCES) +SOURCES = $(httpd01_SOURCES) +DIST_SOURCES = $(httpd01_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -355,7 +347,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = nostdinc +AiUTOMAKE_OPTIONS = nostdinc AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ @@ -365,10 +357,7 @@ AM_LDFLAGS = -L../../lib/cmn -L../../lib/http LDADD = -lqsehttp -lqsecmn $(PTHREAD_LIBS) $(SOCKET_LIBS) \ $(SENDFILE_LIBS) $(am__append_1) httpd01_SOURCES = httpd01.c -httpd02_SOURCES = httpd02.c -upxd01_SOURCES = upxd01.c httpd01_LDADD = $(LDADD) $(SSL_LIBS) -httpd02_LDADD = $(LDADD) $(SSL_LIBS) all: all-am .SUFFIXES: @@ -457,14 +446,6 @@ httpd01$(EXEEXT): $(httpd01_OBJECTS) $(httpd01_DEPENDENCIES) $(EXTRA_httpd01_DEP @rm -f httpd01$(EXEEXT) $(AM_V_CCLD)$(LINK) $(httpd01_OBJECTS) $(httpd01_LDADD) $(LIBS) -httpd02$(EXEEXT): $(httpd02_OBJECTS) $(httpd02_DEPENDENCIES) $(EXTRA_httpd02_DEPENDENCIES) - @rm -f httpd02$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(httpd02_OBJECTS) $(httpd02_LDADD) $(LIBS) - -upxd01$(EXEEXT): $(upxd01_OBJECTS) $(upxd01_DEPENDENCIES) $(EXTRA_upxd01_DEPENDENCIES) - @rm -f upxd01$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(upxd01_OBJECTS) $(upxd01_LDADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -472,8 +453,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpd01.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpd02.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upxd01.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/qse/samples/http/httpd01.c b/qse/samples/http/httpd01.c index 6856d24b..eebbe59f 100644 --- a/qse/samples/http/httpd01.c +++ b/qse/samples/http/httpd01.c @@ -1,6 +1,6 @@ -#include -#include +#include +#include #include #include #include @@ -46,11 +46,11 @@ static int httpd_main (int argc, qse_char_t* argv[]) if (argc <= 1) { - qse_fprintf (QSE_STDERR, QSE_T("Usage: %s ...\n"), argv[0]); + qse_fprintf (QSE_STDERR, QSE_T("Usage: %s binding_address:port ...\n"), argv[0]); goto oops; } - httpd = qse_httpd_openstd (0); + httpd = qse_httpd_openstd (0, QSE_NULL); if (httpd == QSE_NULL) { qse_fprintf (QSE_STDERR, QSE_T("Cannot open httpd\n")); @@ -60,19 +60,17 @@ static int httpd_main (int argc, qse_char_t* argv[]) for (i = 1; i < argc; i++) { qse_httpd_server_t* server; + qse_httpd_server_dope_t dope; - server = qse_httpd_attachserverstd (httpd, argv[i], QSE_NULL, 0); + qse_memset(&dope, 0, QSE_SIZEOF(dope)); + qse_strtonwad (argv[i], &dope.nwad); + server = qse_httpd_attachserverstd (httpd, &dope, 0); if (server == QSE_NULL) { qse_fprintf (QSE_STDERR, QSE_T("Failed to add httpd listener - %s\n"), argv[i]); goto oops; } - - qse_httpd_setserveroptstd (httpd, server, QSE_HTTPD_SERVER_DIRCSS, - QSE_MT("")); - qse_httpd_setserveroptstd (httpd, server, QSE_HTTPD_SERVER_ERRCSS, - QSE_MT("")); } g_httpd = httpd; @@ -81,11 +79,16 @@ static int httpd_main (int argc, qse_char_t* argv[]) signal (SIGPIPE, SIG_IGN); #endif - qse_httpd_setoption (httpd, QSE_HTTPD_CGIERRTONUL); + { - tmout.sec = 10; - tmout.nsec = 0; - ret = qse_httpd_loopstd (httpd, &tmout); + int trait = QSE_HTTPD_CGIERRTONUL; + qse_httpd_setopt (httpd, QSE_HTTPD_TRAIT, &trait); + + qse_inittime (&tmout, 10, 0); + qse_httpd_setopt (httpd, QSE_HTTPD_TMOUT, &tmout); + } + + ret = qse_httpd_loopstd (httpd, QSE_NULL, QSE_NULL); signal (SIGINT, SIG_DFL); #if defined(SIGPIPE) diff --git a/qse/samples/http/httpd02.c b/qse/samples/http/httpd02.c deleted file mode 100644 index 234ff6d5..00000000 --- a/qse/samples/http/httpd02.c +++ /dev/null @@ -1,296 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#if defined(_WIN32) -# include -# include -# include -#elif defined(__OS2__) -# define INCL_DOSPROCESS -# define INCL_DOSEXCEPTIONS -# define INCL_ERRORS -# include -#elif defined(__DOS__) -# include -#else -# include -# include -#endif - - -#if defined(HAVE_SSL) -# include -# include -# include -#endif - -/* --------------------------------------------------------------------- */ - -static qse_httpd_t* g_httpd = QSE_NULL; - -static void sigint (int sig) -{ - if (g_httpd) qse_httpd_stop (g_httpd); -} - -/* --------------------------------------------------------------------- */ - -typedef struct server_xtn_t server_xtn_t; -struct server_xtn_t -{ - int tproxy; - qse_httpd_server_cbstd_t* orgcbstd; -}; - -static int makersrc ( - qse_httpd_t* httpd, qse_httpd_client_t* client, - qse_htre_t* req, qse_httpd_rsrc_t* rsrc) -{ - server_xtn_t* server_xtn; - - server_xtn = qse_httpd_getserverxtnstd (httpd, client->server); - - if (server_xtn->tproxy) - { - if (qse_nwadequal(&client->orgdst_addr, &client->local_addr)) /* both equal and error */ - { - /* TODO: implement a better check that the - * destination is not one of the local addresses */ - - rsrc->type = QSE_HTTPD_RSRC_ERR; - rsrc->u.err.code = 500; - } - else - { - rsrc->type = QSE_HTTPD_RSRC_PROXY; - rsrc->u.proxy.dst = client->orgdst_addr; - rsrc->u.proxy.src = client->remote_addr; - - if (rsrc->u.proxy.src.type == QSE_NWAD_IN4) - rsrc->u.proxy.src.u.in4.port = 0; /* reset the port to 0. */ - else if (rsrc->u.proxy.src.type == QSE_NWAD_IN6) - rsrc->u.proxy.src.u.in6.port = 0; /* reset the port to 0. */ - } - - return 0; - } - else - { - #if 0 - if (server_xtn->orgcbstd->makersrc (httpd, client, req, rsrc) <= -1) return -1; - if (rsrc->type == QSE_HTTPD_RSRC_DIR) - { - /* no directory listing - */ - if (server_xtn->orgcbstd->freersrc) - server_xtn->orgcbstd->freersrc (httpd, client, req, rsrc); - rsrc->type = QSE_HTTPD_RSRC_ERROR; - rsrc->u.error.code = 403; - } - return 0; - #endif - return server_xtn->orgcbstd->makersrc (httpd, client, req, rsrc); - } -} - -static void freersrc ( - qse_httpd_t* httpd, qse_httpd_client_t* client, - qse_htre_t* req, qse_httpd_rsrc_t* rsrc) -{ - server_xtn_t* server_xtn; - - server_xtn = qse_httpd_getserverxtnstd (httpd, client->server); - - if (server_xtn->tproxy) - { - /* nothing to do */ - } - else - { - if (server_xtn->orgcbstd->freersrc) - server_xtn->orgcbstd->freersrc (httpd, client, req, rsrc); - } -} - -/* --------------------------------------------------------------------- */ - -static qse_httpd_server_t* attach_server ( - qse_httpd_t* httpd, qse_char_t* uri, qse_httpd_server_cbstd_t* cbstd) -{ - qse_httpd_server_t* server; - server_xtn_t* server_xtn; - int tproxy = 0; - - static qse_httpd_server_idxstd_t idxstd[] = - { - { QSE_MT("index.cgi") }, - { QSE_MT("index.html") }, - { QSE_NULL } - }; - - if (qse_strzcasecmp (uri, QSE_T("http-tproxy://"), 14) == 0) - { - tproxy = 1; - qse_strcpy (&uri[4], &uri[11]); - } - - server = qse_httpd_attachserverstd ( - httpd, uri, QSE_NULL, QSE_SIZEOF(server_xtn_t)); - if (server == QSE_NULL) return QSE_NULL; - - /* qse_httpd_getserverxtnstd() returns the pointer to - * the extension space requested above, of the size - * QSE_SIZEOF(server_xtn_t) */ - server_xtn = qse_httpd_getserverxtnstd (httpd, server); - server_xtn->tproxy = tproxy; - - /* qse_httpd_getserverxtn() returns the pointer to the - * extension space created by qse_httpd_attachserverstd() - * internally. - */ - /* remember the callback set in qse_httpd_attachserverstd() */ - qse_httpd_getserveroptstd ( - httpd, server, - QSE_HTTPD_SERVER_CBSTD, (void**)&server_xtn->orgcbstd); - /* override it with a new callback for chaining */ - qse_httpd_setserveroptstd ( - httpd, server, - QSE_HTTPD_SERVER_CBSTD, cbstd); - - /* totally override idxstd without remembering the old idxstd */ - qse_httpd_setserveroptstd ( - httpd, server, - QSE_HTTPD_SERVER_IDXSTD, idxstd); - - qse_httpd_setserveroptstd ( - httpd, server, QSE_HTTPD_SERVER_DIRCSS, - QSE_MT("")); - - qse_httpd_setserveroptstd ( - httpd, server, QSE_HTTPD_SERVER_ERRCSS, - QSE_MT("")); - - return server; -} -/* --------------------------------------------------------------------- */ -static int httpd_main (int argc, qse_char_t* argv[]) -{ - qse_httpd_t* httpd = QSE_NULL; - qse_ntime_t tmout; - int ret = -1, i; - static qse_httpd_server_cbstd_t cbstd = { makersrc, freersrc }; - - if (argc <= 1) - { - qse_fprintf (QSE_STDERR, QSE_T("Usage: %s ...\n"), argv[0]); - goto oops; - } - - httpd = qse_httpd_openstd (QSE_SIZEOF(server_xtn_t)); - if (httpd == QSE_NULL) - { - qse_fprintf (QSE_STDERR, QSE_T("Cannot open httpd\n")); - goto oops; - } - - for (i = 1; i < argc; i++) - { - if (attach_server (httpd, argv[i], &cbstd) == QSE_NULL) - { - qse_fprintf (QSE_STDERR, - QSE_T("Failed to add httpd listener - %s\n"), argv[i]); - goto oops; - } - } - - g_httpd = httpd; - signal (SIGINT, sigint); -#if defined(SIGPIPE) - signal (SIGPIPE, SIG_IGN); -#endif - - qse_httpd_setname (httpd, QSE_MT("httpd02/qse 1.0")); - - qse_httpd_setoption (httpd, QSE_HTTPD_CGIERRTONUL); - - tmout.sec = 10; - tmout.nsec = 0; - ret = qse_httpd_loopstd (httpd, &tmout); - - signal (SIGINT, SIG_DFL); -#if defined(SIGPIPE) - signal (SIGPIPE, SIG_DFL); -#endif - g_httpd = QSE_NULL; - - if (ret <= -1) qse_fprintf (QSE_STDERR, QSE_T("Httpd error\n")); - -oops: - if (httpd) qse_httpd_close (httpd); - return ret; -} - -int qse_main (int argc, qse_achar_t* argv[]) -{ - int ret; - -#if defined(_WIN32) - char locale[100]; - UINT codepage; - WSADATA wsadata; - - codepage = GetConsoleOutputCP(); - if (codepage == CP_UTF8) - { - /*SetConsoleOUtputCP (CP_UTF8);*/ - qse_setdflcmgrbyid (QSE_CMGR_UTF8); - } - else - { - sprintf (locale, ".%u", (unsigned int)codepage); - setlocale (LC_ALL, locale); - /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ - } - - - if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0) - { - qse_fprintf (QSE_STDERR, QSE_T("Failed to start up winsock\n")); - return -1; - } - -#else - setlocale (LC_ALL, ""); - /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ -#endif - -#if defined(HAVE_SSL) - SSL_load_error_strings (); - SSL_library_init (); -#endif - - ret = qse_runmain (argc, argv, httpd_main); - -#if defined(HAVE_SSL) - /*ERR_remove_state ();*/ - ENGINE_cleanup (); - ERR_free_strings (); - EVP_cleanup (); - CRYPTO_cleanup_all_ex_data (); -#endif - -#if defined(_WIN32) - WSACleanup (); -#endif - - return ret; -} - diff --git a/qse/samples/http/upxd01.c b/qse/samples/http/upxd01.c deleted file mode 100644 index e23736b7..00000000 --- a/qse/samples/http/upxd01.c +++ /dev/null @@ -1,897 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#if defined(_WIN32) -# include -#else -# include -# include -# include -# include -# include -# include -#endif - -#if defined(HAVE_EPOLL) -# if defined(HAVE_SYS_EPOLL_H) -# include -# endif -#endif - -/* ------------------------------------------------------------------- */ -static qse_upxd_errnum_t syserr_to_errnum (int e) -{ - switch (e) - { - case ENOMEM: - return QSE_UPXD_ENOMEM; - - case EINVAL: - return QSE_UPXD_EINVAL; - - case EACCES: - case ECONNREFUSED: - return QSE_UPXD_EACCES; - - case ENOENT: - return QSE_UPXD_ENOENT; - - case EEXIST: - return QSE_UPXD_EEXIST; - - case EINTR: - return QSE_UPXD_EINTR; - - case EAGAIN: - /*case EWOULDBLOCK:*/ - return QSE_UPXD_EAGAIN; - - default: - return QSE_UPXD_ESYSERR; - } -} - -/* ------------------------------------------------------------------- */ - -static int sockaddr_to_nwad ( - const struct sockaddr_storage* addr, qse_nwad_t* nwad) -{ - int addrsize = -1; - - switch (addr->ss_family) - { - case AF_INET: - { - struct sockaddr_in* in; - in = (struct sockaddr_in*)addr; - addrsize = QSE_SIZEOF(*in); - - memset (nwad, 0, QSE_SIZEOF(*nwad)); - nwad->type = QSE_NWAD_IN4; - nwad->u.in4.addr.value = in->sin_addr.s_addr; - nwad->u.in4.port = in->sin_port; - break; - } - -#if defined(AF_INET6) - case AF_INET6: - { - struct sockaddr_in6* in; - in = (struct sockaddr_in6*)addr; - addrsize = QSE_SIZEOF(*in); - - memset (nwad, 0, QSE_SIZEOF(*nwad)); - nwad->type = QSE_NWAD_IN6; - memcpy (&nwad->u.in6.addr, &in->sin6_addr, QSE_SIZEOF(nwad->u.in6.addr)); - nwad->u.in6.scope = in->sin6_scope_id; - nwad->u.in6.port = in->sin6_port; - break; - } -#endif - } - - return addrsize; -} - -static int nwad_to_sockaddr ( - const qse_nwad_t* nwad, struct sockaddr_storage* addr) -{ - int addrsize = -1; - - switch (nwad->type) - { - case QSE_NWAD_IN4: - { - struct sockaddr_in* in; - - in = (struct sockaddr_in*)addr; - addrsize = QSE_SIZEOF(*in); - memset (in, 0, addrsize); - - in->sin_family = AF_INET; - in->sin_addr.s_addr = nwad->u.in4.addr.value; - in->sin_port = nwad->u.in4.port; - break; - } - - case QSE_NWAD_IN6: - { -#if defined(AF_INET6) - struct sockaddr_in6* in; - - in = (struct sockaddr_in6*)addr; - addrsize = QSE_SIZEOF(*in); - memset (in, 0, addrsize); - - in->sin6_family = AF_INET6; - memcpy (&in->sin6_addr, &nwad->u.in6.addr, QSE_SIZEOF(nwad->u.in6.addr)); - in->sin6_scope_id = nwad->u.in6.scope; - in->sin6_port = nwad->u.in6.port; -#endif - break; - } - } - - return addrsize; -} - -/* ------------------------------------------------------------------- */ - -static int sock_open (qse_upxd_t* upxd, qse_upxd_sock_t* sock) -{ - int fd = -1, flag; - int syserr = 1; - - struct sockaddr_storage addr; - int addrsize; - - addrsize = nwad_to_sockaddr (&sock->bind, &addr); - if (addrsize <= -1) - { - qse_upxd_seterrnum (upxd, QSE_UPXD_ENOIMPL); - syserr = 0; - goto oops; - } - -/* TODO: if AF_INET6 is not defined sockaddr_storage is not available... - * create your own union or somehting similar... */ - - fd = socket (addr.ss_family, SOCK_DGRAM, IPPROTO_UDP); - if (fd <= -1) goto oops; - - flag = fcntl (fd, F_GETFD); - if (flag >= 0) fcntl (fd, F_SETFD, flag | FD_CLOEXEC); - - if (bind (fd, (struct sockaddr*)&addr, addrsize) <= -1) - { -#if defined(IPV6_V6ONLY) - if (errno == EADDRINUSE && addr.ss_family == AF_INET6) - { - int on = 1; - setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)); - if (bind (fd, (struct sockaddr*)&addr, addrsize) <= -1) goto oops; - } - else goto oops; -#else - goto oops; -#endif - } - - if (sock->dev) - { -#if defined(SO_BINDTODEVICE) - struct ifreq ifr; - qse_size_t wsz, msz; - - memset (&ifr, 0, sizeof(ifr)); - -#if defined(QSE_CHAR_IS_MCHAR) - qse_mbscpy (ifr.ifr_name, sock->dev, QSE_COUNTOF(ifr.ifr_name)); -#else - msz = QSE_COUNTOF(ifr.ifr_name); - if (qse_wcstombs (sock->dev, &wsz, ifr.ifr_name, &msz) <= -1) - { - qse_upxd_seterrnum (upxd, QSE_UPXD_EINVAL); - syserr = 0; - goto oops; - } -#endif - if (setsockopt (fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, QSE_SIZEOF(ifr)) <= -1) goto oops; -#endif - } - - flag = fcntl (fd, F_GETFL); - if (flag >= 0) fcntl (fd, F_SETFL, flag | O_NONBLOCK); - - sock->handle.i = fd; - return 0; - -oops: - if (syserr) qse_upxd_seterrnum (upxd, syserr_to_errnum(errno)); - if (fd >= 0) close (fd); - return -1; -} - -static void sock_close (qse_upxd_t* upxd, qse_upxd_sock_t* sock) -{ - close (sock->handle.i); -} - -static qse_ssize_t sock_recv ( - qse_upxd_t* upxd, qse_upxd_sock_t* sock, void* buf, qse_size_t bufsize) -{ - ssize_t ret; - struct sockaddr_storage addr; - socklen_t addrsize; - - addrsize = QSE_SIZEOF(addr); - ret = recvfrom (sock->handle.i, buf, bufsize, 0, (struct sockaddr*)&addr, &addrsize); - if (ret <= -1) qse_upxd_seterrnum (upxd, syserr_to_errnum(errno)); - else - { - if (sockaddr_to_nwad (&addr, &sock->from) <= -1) - { - qse_upxd_seterrnum (upxd, QSE_UPXD_ENOIMPL); - ret = -1; - } - } - - return ret; -} - -static qse_ssize_t sock_send ( - qse_upxd_t* upxd, qse_upxd_sock_t* sock, const void* buf, qse_size_t bufsize) -{ - struct sockaddr_storage addr; - int addrsize; - ssize_t ret; - - addrsize = nwad_to_sockaddr (&sock->to, &addr); - if (addrsize <= -1) - { - qse_upxd_seterrnum (upxd, QSE_UPXD_ENOIMPL); - return -1; - } - - ret = sendto (sock->handle.i, buf, bufsize, - 0, (struct sockaddr*)&addr, addrsize); - if (ret <= -1) qse_upxd_seterrnum (upxd, syserr_to_errnum(errno)); - return ret; -} -/* ------------------------------------------------------------------- */ - -static int session_config ( - qse_upxd_t* upxd, qse_upxd_session_t* session) -{ - /* you can check the source address (session->from). - * you can set the destination address. - * you can set the binding address. - * you can set the binding interface. - */ - qse_strtonwad (QSE_T("127.0.0.1:9991"), &session->config.peer); - qse_strtonwad (QSE_T("0.0.0.0:0"), &session->config.bind); - /*qse_strxcpy (session->config.dev, QSE_COUNTOF(session->config.dev), QSE_T("eth1"));*/ - session->config.dormancy = 10000; - return 0; -} - -static void session_error ( - qse_upxd_t* upxd, qse_upxd_session_t* session) -{ - if (session->server) - { - } - else - { - /* session->local.nwad is not associated with a session. */ - } - - qse_printf (QSE_T("ERROR IN SESSION COMMUNICATION\n")); - -} -/* ------------------------------------------------------------------- */ - -struct mux_ev_t -{ - qse_ubi_t handle; - int reqmask; - qse_upxd_muxcb_t cbfun; - void* cbarg; -}; - -struct mux_t -{ - int fd; - - struct - { - struct epoll_event* ptr; - qse_size_t len; - qse_size_t capa; - } ee; - - struct - { - struct mux_ev_t** ptr; - qse_size_t capa; - } mev; -}; - -#define MUX_EV_ALIGN 64 - -static void* mux_open (qse_upxd_t* upxd) -{ - struct mux_t* mux; - - mux = qse_upxd_allocmem (upxd, QSE_SIZEOF(*mux)); - if (mux == QSE_NULL) return QSE_NULL; - - memset (mux, 0, QSE_SIZEOF(*mux)); - -#if defined(HAVE_EPOLL_CREATE1) && defined(O_CLOEXEC) - mux->fd = epoll_create1 (O_CLOEXEC); -#else - mux->fd = epoll_create (100); -#endif - if (mux->fd <= -1) - { - qse_upxd_freemem (upxd, mux); - qse_upxd_seterrnum (upxd, syserr_to_errnum(errno)); - return QSE_NULL; - } - -#if defined(HAVE_EPOLL_CREATE1) && defined(O_CLOEXEC) - /* nothing else to do */ -#else - { - int flag = fcntl (mux->fd, F_GETFD); - if (flag >= 0) fcntl (mux->fd, F_SETFD, flag | FD_CLOEXEC); - } -#endif - - return mux; -} - -static void mux_close (qse_upxd_t* upxd, void* vmux) -{ - struct mux_t* mux = (struct mux_t*)vmux; - if (mux->ee.ptr) qse_upxd_freemem (upxd, mux->ee.ptr); - if (mux->mev.ptr) - { - qse_size_t i; - for (i = 0; i < mux->mev.capa; i++) - if (mux->mev.ptr[i]) qse_upxd_freemem (upxd, mux->mev.ptr[i]); - qse_upxd_freemem (upxd, mux->mev.ptr); - } - close (mux->fd); - qse_upxd_freemem (upxd, mux); -} - -static int mux_addhnd ( - qse_upxd_t* upxd, void* vmux, qse_ubi_t handle, - qse_upxd_muxcb_t cbfun, void* cbarg) -{ - struct mux_t* mux = (struct mux_t*)vmux; - struct epoll_event ev; - struct mux_ev_t* mev; - - ev.events = EPOLLIN; /* inspect IN and HUP only */ - - if (handle.i >= mux->mev.capa) - { - struct mux_ev_t** tmp; - qse_size_t tmpcapa, i; - - tmpcapa = (((handle.i + MUX_EV_ALIGN) / MUX_EV_ALIGN) * MUX_EV_ALIGN); - - tmp = (struct mux_ev_t**) qse_upxd_reallocmem ( - upxd, mux->mev.ptr, - QSE_SIZEOF(*mux->mev.ptr) * tmpcapa); - if (tmp == QSE_NULL) return -1; - - for (i = mux->mev.capa; i < tmpcapa; i++) tmp[i] = QSE_NULL; - mux->mev.ptr = tmp; - mux->mev.capa = tmpcapa; - } - - if (mux->mev.ptr[handle.i] == QSE_NULL) - { - /* the location of the data passed to epoll_ctl() - * must not change unless i update the info with epoll() - * whenever there is reallocation. so i simply - * make mux-mev.ptr reallocatable but auctual - * data fixed once allocated. */ - mux->mev.ptr[handle.i] = qse_upxd_allocmem ( - upxd, QSE_SIZEOF(*mux->mev.ptr[handle.i])); - if (mux->mev.ptr[handle.i] == QSE_NULL) return -1; - } - - if (mux->ee.len >= mux->ee.capa) - { - struct epoll_event* tmp; - - tmp = qse_upxd_reallocmem ( - upxd, mux->ee.ptr, - QSE_SIZEOF(*mux->ee.ptr) * (mux->ee.capa + 1) * 2); - if (tmp == QSE_NULL) return -1; - - mux->ee.ptr = tmp; - mux->ee.capa = (mux->ee.capa + 1) * 2; - } - - mev = mux->mev.ptr[handle.i]; - mev->handle = handle; - mev->cbfun = cbfun; - mev->cbarg = cbarg; - - ev.data.ptr = mev; - - if (epoll_ctl (mux->fd, EPOLL_CTL_ADD, handle.i, &ev) <= -1) - { - /* don't rollback ee.ptr */ - qse_upxd_seterrnum (upxd, syserr_to_errnum(errno)); - return -1; - } - - mux->ee.len++; - return 0; -} - -static int mux_delhnd (qse_upxd_t* upxd, void* vmux, qse_ubi_t handle) -{ - struct mux_t* mux = (struct mux_t*)vmux; - - if (epoll_ctl (mux->fd, EPOLL_CTL_DEL, handle.i, QSE_NULL) <= -1) - { - qse_upxd_seterrnum (upxd, syserr_to_errnum(errno)); - return -1; - } - - mux->ee.len--; - return 0; -} - -static int mux_poll (qse_upxd_t* upxd, void* vmux, qse_ntime_t timeout) -{ - struct mux_t* mux = (struct mux_t*)vmux; - struct mux_ev_t* mev; - int nfds, i; - - if (mux->ee.len < 0) - { - /* nothing to monitor yet */ - sleep (timeout / 1000); - } - else - { - nfds = epoll_wait (mux->fd, mux->ee.ptr, mux->ee.len, timeout); - if (nfds <= -1) - { - qse_upxd_seterrnum (upxd, syserr_to_errnum(errno)); - return -1; - } - - for (i = 0; i < nfds; i++) - { - mev = mux->ee.ptr[i].data.ptr; - - if (mux->ee.ptr[i].events & (EPOLLIN | EPOLLHUP)) - mev->cbfun (upxd, mux, mev->handle, mev->cbarg); - } - } - - return 0; -} - -/* ------------------------------------------------------------------- */ -static qse_upxd_cbs_t upxd_cbs = -{ - /* socket */ - { sock_open, sock_close, sock_recv, sock_send }, - - /* session */ - { session_config, session_error }, - - /* multiplexer */ - { mux_open, mux_close, mux_addhnd, mux_delhnd, mux_poll } -}; - - -/* ------------------------------------------------------------------- */ - -typedef struct tr_t tr_t; -struct tr_t -{ - unsigned int line; - qse_sio_t* sio; - qse_str_t* t; - unsigned int tl; - qse_char_t last; -}; - -tr_t* tr_open (const qse_char_t* name) -{ - tr_t* tr; - - tr = malloc (QSE_SIZEOF(*tr)); - if (tr == QSE_NULL) return QSE_NULL; - - memset (tr, 0, sizeof(*tr)); - tr->line = 1; - - tr->sio = qse_sio_open (QSE_MMGR_GETDFL(), 0, name, QSE_SIO_READ); - if (tr->sio == QSE_NULL) - { - free (tr); - return QSE_NULL; - } - - tr->t = qse_str_open (QSE_MMGR_GETDFL(), 0, 128); - if (tr->t == QSE_NULL) - { - qse_sio_close (tr->sio); - free (tr); - return QSE_NULL; - } - - return tr; -} - -void tr_close (tr_t* tr) -{ - qse_str_close (tr->t); - qse_sio_close (tr->sio); - free (tr); -} - -qse_char_t* tr_getnext (tr_t* tr) -{ - qse_char_t c; - - qse_str_clear (tr->t); - - if (tr->last) - { - tr->tl = tr->line; - if (qse_str_ccat (tr->t, tr->last) == (qse_ssize_t)-1) return QSE_NULL; - tr->last = 0; - } - else - { - /* skip spaces */ - while (1) - { - if (qse_sio_getc (tr->sio, &c) <= -1) return QSE_NULL; - if (c == QSE_CHAR_EOF) return QSE_NULL; - if (c == QSE_T('\n')) tr->line++; - if (!QSE_ISSPACE(c)) break; - } - - tr->tl = tr->line; - - if (c == QSE_T(';') || c == QSE_T('{') || c == QSE_T('}')) - { - if (qse_str_ccat (tr->t, c) == (qse_ssize_t)-1) return QSE_NULL; - } - else - { - do - { - if (qse_str_ccat (tr->t, c) == (qse_ssize_t)-1) return QSE_NULL; - if (qse_sio_getc (tr->sio, &c) <= -1) return QSE_NULL; - - if (c == QSE_CHAR_EOF) break; - - if (c == QSE_T('\n')) tr->line++; - if (QSE_ISSPACE(c)) break; - else if (c == QSE_T(';') || c == QSE_T('{') || c == QSE_T('}')) - { - tr->last = c; - break; - } - } - while (1); - } - } - - return QSE_STR_PTR(tr->t); -} - -/* ------------------------------------------------------------------- */ - -struct cfg_rule_t -{ - struct - { - qse_ipad_t ipad; - qse_ipad_t mask; - } src; - - int action; /* DROP, FORWARD */ - - struct - { - qse_nwad_t via; - qse_char_t via_dev[64]; - qse_nwad_t to_nwad; - } fwd; -}; - -typedef struct cfg_listen_t cfg_listen_t; -struct cfg_listen_t -{ - qse_nwad_t nwad; - qse_char_t dev[64]; - cfg_rule_t* rule; -}; - -typedef struct cfg_t cfg_t; -struct cfg_t -{ - cfg_listen_t* list; -}; - -cfg_t* cfg_open (void) -{ - cfg_t* cfg; - - cfg = malloc (QSE_SIZEOF(*cfg)); - if (cfg == QSE_NULL) return QSE_NULL; - - return cfg; -} - -void cfg_close (cfg_t*) -{ - free (cfg); -} - -cfg_listen_t* cfg_addlisten (cfg_t* cfg, qse_nwad_t nwad, const qse_char_t* dev) -{ - cfg_listen_t* ptr; - - ptr = malloc (QSE_SIZEOF(*ptr)); - if (ptr == QSE_NULL) return QSE_NULL; - - ptr->nwad = nwad; - qse_strxcpy (ptr->dev, QSE_COUNTOF(ptr->dev), dev); - ptr->rule = QSE_NULL; - - return ptr; -} - -static cfg_t* load_cfg (const qse_char_t* name) -{ - tr_t* tr; - const qse_char_t* t; - cfg_t* cfg; - cfg_listen_t cfglis; - qse_nwad_t nwad; - - cfg = malloc (QSE_SIZEOF(*cfg)); - if (cfg == QSE_NULL) return QSE_NULL; - - tr = tr_open (name); - if (tr == QSE_NULL) goto oops; - - do - { - t = tr_getnext(tr); - if (t == QSE_NULL) break; - - if (qse_strcmp (t, QSE_T("listen")) == 0) - { - tmp = tr_getnext(tr); - if (tmp == QSE_NULL || qse_strtonwad (tmp, &nwad) <= -1) - { - qse_printf (QSE_T("line %u: ipaddr:port expected after 'listen'\n"), (unsigned int)tr->tl); - goto oops; - } - - tmp = tr_getnext (tr); - if (tmp == QSE_NULL) - { - qse_printf (QSE_T("line %u: 'dev' or { expected\n"), (unsigned int)tr->tl); - goto oops; - } - - if (qse_strcmp (tmp, QSE_T("dev")) == 0) - { - tmp = tr_getnext (tr); - if (tmp == QSE_NULL) - { - qse_printf (QSE_T("line %u: device name expected\n"), (unsigned int)tr->tl); - goto oops; - } - - if (cfg_addlisten (cfg, &nwad, tmp) <= -1) - { - qse_printf (QSE_T("line %u: failed to add a new service\n"), (unsigned int)tr->tl); - goto oops; - } - - tmp = tr_getnext (tr); - if (tmp == QSE_NULL) - { - qse_printf (QSE_T("line %u: { expected\n"), (unsigned int)tr->tl); - goto oops; - } - } - - if (qse_strcmp (tmp, QSE_T('{')) != 0) - { - qse_printf (QSE_T("line %u: { expected\n"), (unsigned int)tr->tl); - goto oops; - } - - - while (1) - { - tmp = tr_getnext (tr); - if (tmp == QSE_NULL) - { - qse_printf (QSE_T("line %u: } expected\n"), (unsigned int)tr->tl); - goto oops; - } - - if (qse_strcmp (tmp, QSE_T("}")) == 0) break; - - if (qse_strcmp (tmp, QSE_T("from")) != 0) - { - qse_printf (QSE_T("line %u: 'from' expected\n"), (unsigned int)tr->tl); - } - - tmp = tr_getnext (tr); - - - if (qse_strcmp (action, QSE_T("drop")) == 0) - { - } - else if (qse_strcmp (action, QSE_T("forward")) == 0) - { - } - else - { - } - - tmp = tr_getnext (tr); - if (qse_strcmp (tmp, QSE_T(";")) != 0) - { - } - } - - tmp = tr_getnext (tr); - if (qse_strcmp (tmp, QSE_T("}")) != 0) - { - } - } - else - { - qse_printf (QSE_T("line %u: 'listen' expected\n"), (unsigned int)tr->tl); - goto oops; - } - } - while (1); - - return cfg; - -oops: - if (tr) tr_close (tr); - return QSE_NULL; -} - -static void free_cfg (cfg_t* cfg) -{ -} - - -/* ------------------------------------------- */ - - -static qse_upxd_t* g_upxd = QSE_NULL; - -static void sigint (int sig) -{ - if (g_upxd) qse_upxd_stop (g_upxd); -} - -int upxd_main (int argc, qse_char_t* argv[]) -{ - qse_upxd_t* upxd = QSE_NULL; - cfg_t* cfg = QSE_NULL; - int ret = -1, i; - - if (argc <= 1) - { - qse_fprintf (QSE_STDERR, QSE_T("Usage: %s ...\n"), argv[0]); - goto oops; - } - - cfg = load_cfg (argv[1]); - if (cfg == QSE_NULL) - { - qse_fprintf (QSE_STDERR, QSE_T("Error: Cannot load %s\n"), argv[1]); - goto oops; - } - - upxd = qse_upxd_open (QSE_MMGR_GETDFL(), 0); - if (upxd == QSE_NULL) - { - qse_fprintf (QSE_STDERR, QSE_T("Cannot open upxd\n")); - goto oops; - } - - for (i = 1; i < argc; i++) - { - qse_nwad_t nwad; - if (qse_strtonwad (argv[i], &nwad) <= -1) - { - qse_fprintf (QSE_STDERR, - QSE_T("Wrong server - %s\n"), argv[i]); - goto oops; - } - - if (qse_upxd_addserver (upxd, &nwad, QSE_NULL) == QSE_NULL) - { - qse_fprintf (QSE_STDERR, - QSE_T("Failed to add server - %s\n"), argv[i]); - goto oops; - } - } - - g_upxd = upxd; - signal (SIGINT, sigint); - signal (SIGPIPE, SIG_IGN); - - qse_upxd_setcbs (upxd, &upxd_cbs); - - ret = qse_upxd_loop (upxd, 5000); - - signal (SIGINT, SIG_DFL); - signal (SIGPIPE, SIG_DFL); - g_upxd = QSE_NULL; - - if (ret <= -1) - qse_fprintf (QSE_STDERR, QSE_T("Error - %d\n"), (int)qse_upxd_geterrnum(upxd)); - -oops: - if (upxd) qse_upxd_close (upxd); - if (cfg) free_cfg (cfg); - return ret; -} - -int qse_main (int argc, qse_achar_t* argv[]) -{ -#if defined(_WIN32) - char locale[100]; - UINT codepage = GetConsoleOutputCP(); - if (codepage == CP_UTF8) - { - /*SetConsoleOUtputCP (CP_UTF8);*/ - qse_setdflcmgrbyid (QSE_CMGR_UTF8); - } - else - { - sprintf (locale, ".%u", (unsigned int)codepage); - setlocale (LC_ALL, locale); - /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ - } -#else - setlocale (LC_ALL, ""); - /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ -#endif - - return qse_runmain (argc, argv, upxd_main); -} - diff --git a/qse/samples/sed/sed01.c b/qse/samples/sed/sed01.c index a3fa1c0f..d1bb37c0 100644 --- a/qse/samples/sed/sed01.c +++ b/qse/samples/sed/sed01.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "sed00.h" static int sed_main (int argc, qse_char_t* argv[]) diff --git a/qse/samples/sed/sed02.c b/qse/samples/sed/sed02.c index 5e71364b..1434d36e 100644 --- a/qse/samples/sed/sed02.c +++ b/qse/samples/sed/sed02.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "sed00.h" static int sed_main (int argc, qse_char_t* argv[]) diff --git a/qse/samples/sed/sed03.c b/qse/samples/sed/sed03.c index e6bfe40c..5d1f9364 100644 --- a/qse/samples/sed/sed03.c +++ b/qse/samples/sed/sed03.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "sed00.h" static void trace_exec (qse_sed_t* sed, qse_sed_tracer_op_t op, qse_sed_cmd_t* cmd) diff --git a/qse/samples/si/Makefile.am b/qse/samples/si/Makefile.am index f76bfb4c..cf7a01d2 100644 --- a/qse/samples/si/Makefile.am +++ b/qse/samples/si/Makefile.am @@ -6,14 +6,23 @@ AM_CPPFLAGS = \ -I$(includedir) bin_PROGRAMS = \ + dir01 \ fio01 \ fio02 \ + fs01 \ + fs02 \ + fs03 \ + glob01 \ + nwad01 \ + nwif01 \ + nwif02 \ pio01 \ rwl01 \ sio01 \ sio02 \ - sio03 - + sio03 \ + task01 + AM_LDFLAGS = -L../../lib/si -L../../lib/cmn AM_CFLAGS = $(PTHREAD_CFLAGS) LDADD = -lqsesi -lqsecmn $(PTHREAD_LIBS) @@ -24,11 +33,20 @@ LDADD += $(UNICOWS_LIBS) endif endif +dir01_SOURCES = dir01.c fio01_SOURCES = fio01.c fio02_SOURCES = fio02.c +fs01_SOURCES = fs01.c +fs02_SOURCES = fs02.c +fs03_SOURCES = fs03.c +glob01_SOURCES = glob01.c +nwad01_SOURCES = nwad01.c +nwif01_SOURCES = nwif01.c +nwif02_SOURCES = nwif02.c pio01_SOURCES = pio01.c rwl01_SOURCES = rwl01.c sio01_SOURCES = sio01.c sio02_SOURCES = sio02.c sio03_SOURCES = sio03.c +task01_SOURCES = task01.c diff --git a/qse/samples/si/Makefile.in b/qse/samples/si/Makefile.in index ffb354af..ef4e737f 100644 --- a/qse/samples/si/Makefile.in +++ b/qse/samples/si/Makefile.in @@ -78,8 +78,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = fio01$(EXEEXT) fio02$(EXEEXT) pio01$(EXEEXT) \ - rwl01$(EXEEXT) sio01$(EXEEXT) sio02$(EXEEXT) sio03$(EXEEXT) +bin_PROGRAMS = dir01$(EXEEXT) fio01$(EXEEXT) fio02$(EXEEXT) \ + fs01$(EXEEXT) fs02$(EXEEXT) fs03$(EXEEXT) glob01$(EXEEXT) \ + nwad01$(EXEEXT) nwif01$(EXEEXT) nwif02$(EXEEXT) pio01$(EXEEXT) \ + rwl01$(EXEEXT) sio01$(EXEEXT) sio02$(EXEEXT) sio03$(EXEEXT) \ + task01$(EXEEXT) @WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS) subdir = samples/si DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -101,20 +104,52 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_fio01_OBJECTS = fio01.$(OBJEXT) -fio01_OBJECTS = $(am_fio01_OBJECTS) -fio01_LDADD = $(LDADD) +am_dir01_OBJECTS = dir01.$(OBJEXT) +dir01_OBJECTS = $(am_dir01_OBJECTS) +dir01_LDADD = $(LDADD) am__DEPENDENCIES_1 = @WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -fio01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +dir01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am_fio01_OBJECTS = fio01.$(OBJEXT) +fio01_OBJECTS = $(am_fio01_OBJECTS) +fio01_LDADD = $(LDADD) +fio01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_fio02_OBJECTS = fio02.$(OBJEXT) fio02_OBJECTS = $(am_fio02_OBJECTS) fio02_LDADD = $(LDADD) fio02_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_fs01_OBJECTS = fs01.$(OBJEXT) +fs01_OBJECTS = $(am_fs01_OBJECTS) +fs01_LDADD = $(LDADD) +fs01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_fs02_OBJECTS = fs02.$(OBJEXT) +fs02_OBJECTS = $(am_fs02_OBJECTS) +fs02_LDADD = $(LDADD) +fs02_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_fs03_OBJECTS = fs03.$(OBJEXT) +fs03_OBJECTS = $(am_fs03_OBJECTS) +fs03_LDADD = $(LDADD) +fs03_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_glob01_OBJECTS = glob01.$(OBJEXT) +glob01_OBJECTS = $(am_glob01_OBJECTS) +glob01_LDADD = $(LDADD) +glob01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_nwad01_OBJECTS = nwad01.$(OBJEXT) +nwad01_OBJECTS = $(am_nwad01_OBJECTS) +nwad01_LDADD = $(LDADD) +nwad01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_nwif01_OBJECTS = nwif01.$(OBJEXT) +nwif01_OBJECTS = $(am_nwif01_OBJECTS) +nwif01_LDADD = $(LDADD) +nwif01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_nwif02_OBJECTS = nwif02.$(OBJEXT) +nwif02_OBJECTS = $(am_nwif02_OBJECTS) +nwif02_LDADD = $(LDADD) +nwif02_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_pio01_OBJECTS = pio01.$(OBJEXT) pio01_OBJECTS = $(am_pio01_OBJECTS) pio01_LDADD = $(LDADD) @@ -135,6 +170,10 @@ am_sio03_OBJECTS = sio03.$(OBJEXT) sio03_OBJECTS = $(am_sio03_OBJECTS) sio03_LDADD = $(LDADD) sio03_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am_task01_OBJECTS = task01.$(OBJEXT) +task01_OBJECTS = $(am_task01_OBJECTS) +task01_LDADD = $(LDADD) +task01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -169,12 +208,18 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(fio01_SOURCES) $(fio02_SOURCES) $(pio01_SOURCES) \ - $(rwl01_SOURCES) $(sio01_SOURCES) $(sio02_SOURCES) \ - $(sio03_SOURCES) -DIST_SOURCES = $(fio01_SOURCES) $(fio02_SOURCES) $(pio01_SOURCES) \ - $(rwl01_SOURCES) $(sio01_SOURCES) $(sio02_SOURCES) \ - $(sio03_SOURCES) +SOURCES = $(dir01_SOURCES) $(fio01_SOURCES) $(fio02_SOURCES) \ + $(fs01_SOURCES) $(fs02_SOURCES) $(fs03_SOURCES) \ + $(glob01_SOURCES) $(nwad01_SOURCES) $(nwif01_SOURCES) \ + $(nwif02_SOURCES) $(pio01_SOURCES) $(rwl01_SOURCES) \ + $(sio01_SOURCES) $(sio02_SOURCES) $(sio03_SOURCES) \ + $(task01_SOURCES) +DIST_SOURCES = $(dir01_SOURCES) $(fio01_SOURCES) $(fio02_SOURCES) \ + $(fs01_SOURCES) $(fs02_SOURCES) $(fs03_SOURCES) \ + $(glob01_SOURCES) $(nwad01_SOURCES) $(nwif01_SOURCES) \ + $(nwif02_SOURCES) $(pio01_SOURCES) $(rwl01_SOURCES) \ + $(sio01_SOURCES) $(sio02_SOURCES) $(sio03_SOURCES) \ + $(task01_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -384,13 +429,22 @@ AM_CPPFLAGS = \ AM_LDFLAGS = -L../../lib/si -L../../lib/cmn AM_CFLAGS = $(PTHREAD_CFLAGS) LDADD = -lqsesi -lqsecmn $(PTHREAD_LIBS) $(am__append_1) +dir01_SOURCES = dir01.c fio01_SOURCES = fio01.c fio02_SOURCES = fio02.c +fs01_SOURCES = fs01.c +fs02_SOURCES = fs02.c +fs03_SOURCES = fs03.c +glob01_SOURCES = glob01.c +nwad01_SOURCES = nwad01.c +nwif01_SOURCES = nwif01.c +nwif02_SOURCES = nwif02.c pio01_SOURCES = pio01.c rwl01_SOURCES = rwl01.c sio01_SOURCES = sio01.c sio02_SOURCES = sio02.c sio03_SOURCES = sio03.c +task01_SOURCES = task01.c all: all-am .SUFFIXES: @@ -475,6 +529,10 @@ clean-binPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +dir01$(EXEEXT): $(dir01_OBJECTS) $(dir01_DEPENDENCIES) $(EXTRA_dir01_DEPENDENCIES) + @rm -f dir01$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(dir01_OBJECTS) $(dir01_LDADD) $(LIBS) + fio01$(EXEEXT): $(fio01_OBJECTS) $(fio01_DEPENDENCIES) $(EXTRA_fio01_DEPENDENCIES) @rm -f fio01$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fio01_OBJECTS) $(fio01_LDADD) $(LIBS) @@ -483,6 +541,34 @@ fio02$(EXEEXT): $(fio02_OBJECTS) $(fio02_DEPENDENCIES) $(EXTRA_fio02_DEPENDENCIE @rm -f fio02$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fio02_OBJECTS) $(fio02_LDADD) $(LIBS) +fs01$(EXEEXT): $(fs01_OBJECTS) $(fs01_DEPENDENCIES) $(EXTRA_fs01_DEPENDENCIES) + @rm -f fs01$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(fs01_OBJECTS) $(fs01_LDADD) $(LIBS) + +fs02$(EXEEXT): $(fs02_OBJECTS) $(fs02_DEPENDENCIES) $(EXTRA_fs02_DEPENDENCIES) + @rm -f fs02$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(fs02_OBJECTS) $(fs02_LDADD) $(LIBS) + +fs03$(EXEEXT): $(fs03_OBJECTS) $(fs03_DEPENDENCIES) $(EXTRA_fs03_DEPENDENCIES) + @rm -f fs03$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(fs03_OBJECTS) $(fs03_LDADD) $(LIBS) + +glob01$(EXEEXT): $(glob01_OBJECTS) $(glob01_DEPENDENCIES) $(EXTRA_glob01_DEPENDENCIES) + @rm -f glob01$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(glob01_OBJECTS) $(glob01_LDADD) $(LIBS) + +nwad01$(EXEEXT): $(nwad01_OBJECTS) $(nwad01_DEPENDENCIES) $(EXTRA_nwad01_DEPENDENCIES) + @rm -f nwad01$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(nwad01_OBJECTS) $(nwad01_LDADD) $(LIBS) + +nwif01$(EXEEXT): $(nwif01_OBJECTS) $(nwif01_DEPENDENCIES) $(EXTRA_nwif01_DEPENDENCIES) + @rm -f nwif01$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(nwif01_OBJECTS) $(nwif01_LDADD) $(LIBS) + +nwif02$(EXEEXT): $(nwif02_OBJECTS) $(nwif02_DEPENDENCIES) $(EXTRA_nwif02_DEPENDENCIES) + @rm -f nwif02$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(nwif02_OBJECTS) $(nwif02_LDADD) $(LIBS) + pio01$(EXEEXT): $(pio01_OBJECTS) $(pio01_DEPENDENCIES) $(EXTRA_pio01_DEPENDENCIES) @rm -f pio01$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pio01_OBJECTS) $(pio01_LDADD) $(LIBS) @@ -503,19 +589,32 @@ sio03$(EXEEXT): $(sio03_OBJECTS) $(sio03_DEPENDENCIES) $(EXTRA_sio03_DEPENDENCIE @rm -f sio03$(EXEEXT) $(AM_V_CCLD)$(LINK) $(sio03_OBJECTS) $(sio03_LDADD) $(LIBS) +task01$(EXEEXT): $(task01_OBJECTS) $(task01_DEPENDENCIES) $(EXTRA_task01_DEPENDENCIES) + @rm -f task01$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(task01_OBJECTS) $(task01_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fio01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fio02.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs01.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs02.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fs03.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glob01.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwad01.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwif01.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwif02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rwl01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio01.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio03.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task01.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/qse/samples/cmn/dir01.c b/qse/samples/si/dir01.c similarity index 98% rename from qse/samples/cmn/dir01.c rename to qse/samples/si/dir01.c index 535d6fcc..a04a2759 100644 --- a/qse/samples/cmn/dir01.c +++ b/qse/samples/si/dir01.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #include #include #include diff --git a/qse/samples/si/fio01.c b/qse/samples/si/fio01.c index 7d7b29f5..24dc28f5 100644 --- a/qse/samples/si/fio01.c +++ b/qse/samples/si/fio01.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #include diff --git a/qse/samples/si/fio02.c b/qse/samples/si/fio02.c index 840328ee..5a3ec3f1 100644 --- a/qse/samples/si/fio02.c +++ b/qse/samples/si/fio02.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #define R(f) \ do { \ diff --git a/qse/samples/cmn/fs01.c b/qse/samples/si/fs01.c similarity index 97% rename from qse/samples/cmn/fs01.c rename to qse/samples/si/fs01.c index d53c583a..0c731ad1 100644 --- a/qse/samples/cmn/fs01.c +++ b/qse/samples/si/fs01.c @@ -1,8 +1,9 @@ -#include +#include +#include + #include #include #include -#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/fs02.c b/qse/samples/si/fs02.c similarity index 98% rename from qse/samples/cmn/fs02.c rename to qse/samples/si/fs02.c index ef2ca116..fb5eda3f 100644 --- a/qse/samples/cmn/fs02.c +++ b/qse/samples/si/fs02.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #include #include #include diff --git a/qse/samples/cmn/fs03.c b/qse/samples/si/fs03.c similarity index 98% rename from qse/samples/cmn/fs03.c rename to qse/samples/si/fs03.c index 76ff8128..8c7b3bd6 100644 --- a/qse/samples/cmn/fs03.c +++ b/qse/samples/si/fs03.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #include #include #include diff --git a/qse/samples/cmn/glob01.c b/qse/samples/si/glob01.c similarity index 96% rename from qse/samples/cmn/glob01.c rename to qse/samples/si/glob01.c index 234b5b81..13123e7c 100644 --- a/qse/samples/cmn/glob01.c +++ b/qse/samples/si/glob01.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/qse/samples/cmn/nwad01.c b/qse/samples/si/nwad01.c similarity index 98% rename from qse/samples/cmn/nwad01.c rename to qse/samples/si/nwad01.c index c050fb3a..a3fe7336 100644 --- a/qse/samples/cmn/nwad01.c +++ b/qse/samples/si/nwad01.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #include #if defined(_WIN32) diff --git a/qse/samples/cmn/nwif01.c b/qse/samples/si/nwif01.c similarity index 97% rename from qse/samples/cmn/nwif01.c rename to qse/samples/si/nwif01.c index f1b310db..25ab91de 100644 --- a/qse/samples/cmn/nwif01.c +++ b/qse/samples/si/nwif01.c @@ -1,9 +1,9 @@ -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/qse/samples/cmn/nwif02.c b/qse/samples/si/nwif02.c similarity index 98% rename from qse/samples/cmn/nwif02.c rename to qse/samples/si/nwif02.c index 727c3c26..d841a363 100644 --- a/qse/samples/cmn/nwif02.c +++ b/qse/samples/si/nwif02.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #include #include #include diff --git a/qse/samples/si/pio01.c b/qse/samples/si/pio01.c index 56a371a0..f6c5186a 100644 --- a/qse/samples/si/pio01.c +++ b/qse/samples/si/pio01.c @@ -1,7 +1,7 @@ -#include +#include #include #include -#include +#include #include diff --git a/qse/samples/si/rwl01.c b/qse/samples/si/rwl01.c index fb5fb993..fb5b76bb 100644 --- a/qse/samples/si/rwl01.c +++ b/qse/samples/si/rwl01.c @@ -1,8 +1,8 @@ -#include -#include -#include +#include +#include +#include +#include #include -#include #include diff --git a/qse/samples/si/sio01.c b/qse/samples/si/sio01.c index 3e1cdcc6..bc9fe159 100644 --- a/qse/samples/si/sio01.c +++ b/qse/samples/si/sio01.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/qse/samples/si/sio02.c b/qse/samples/si/sio02.c index 0a3a77ff..14499097 100644 --- a/qse/samples/si/sio02.c +++ b/qse/samples/si/sio02.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/qse/samples/si/sio03.c b/qse/samples/si/sio03.c index 07ea5299..5cb401da 100644 --- a/qse/samples/si/sio03.c +++ b/qse/samples/si/sio03.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/qse/samples/cmn/task01.c b/qse/samples/si/task01.c similarity index 97% rename from qse/samples/cmn/task01.c rename to qse/samples/si/task01.c index a894d74d..f790e984 100644 --- a/qse/samples/cmn/task01.c +++ b/qse/samples/si/task01.c @@ -1,8 +1,8 @@ -#include +#include #include #include #include -#include +#include #include #if defined(_WIN32)