From 0f3e84f4154676dc05a09bd0b1ad9d3d43574d48 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Mon, 13 Jan 2003 12:20:16 +0000 Subject: [PATCH] - new library "libngtool", reorganized code and directory structure therefore. --- configure.in | 14 +++++++------- src/Makefile.am | 15 +++++++-------- src/ngircd/Makefile.am | 24 +++++++++++------------- src/tool/Makefile.am | 27 +++++++++++++++++++++++++++ src/{ngircd => tool}/tool.c | 2 +- src/{ngircd => tool}/tool.h | 2 +- 6 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 src/tool/Makefile.am rename src/{ngircd => tool}/tool.c (95%) rename src/{ngircd => tool}/tool.h (92%) diff --git a/configure.in b/configure.in index a82df087..1b4233c1 100644 --- a/configure.in +++ b/configure.in @@ -2,14 +2,13 @@ # ngIRCd -- The Next Generation IRC Daemon # Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # -# $Id: configure.in,v 1.77 2003/01/04 13:07:54 alex Exp $ +# $Id: configure.in,v 1.78 2003/01/13 12:20:16 alex Exp $ # # -- Initialisierung -- @@ -224,6 +223,7 @@ AC_OUTPUT([ \ MacOSX/ngircd.pbproj/Makefile \ src/Makefile \ src/portab/Makefile \ + src/tool/Makefile \ src/ngircd/Makefile \ src/testsuite/Makefile \ man/Makefile \ diff --git a/src/Makefile.am b/src/Makefile.am index bc6f268d..a24e96ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,17 +2,16 @@ # ngIRCd -- The Next Generation IRC Daemon # Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # -# $Id: Makefile.am,v 1.4 2002/09/09 10:00:15 alex Exp $ +# $Id: Makefile.am,v 1.5 2003/01/13 12:20:16 alex Exp $ # -SUBDIRS = portab ngircd testsuite +SUBDIRS = portab tool ngircd testsuite maintainer-clean-local: rm -f Makefile Makefile.in config.h config.h.in stamp-h.in diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am index 62458e40..3336d53a 100644 --- a/src/ngircd/Makefile.am +++ b/src/ngircd/Makefile.am @@ -2,19 +2,18 @@ # ngIRCd -- The Next Generation IRC Daemon # Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # -# $Id: Makefile.am,v 1.35 2003/01/04 10:39:14 alex Exp $ +# $Id: Makefile.am,v 1.36 2003/01/13 12:20:16 alex Exp $ # AUTOMAKE_OPTIONS = ../portab/ansi2knr -INCLUDES = -I$(srcdir)/../portab +INCLUDES = -I$(srcdir)/../portab -I$(srcdir)/../tool LINTARGS = -weak -warnunixlib +unixlib -booltype BOOLEAN @@ -22,17 +21,16 @@ sbin_PROGRAMS = ngircd ngircd_SOURCES = ngircd.c channel.c client.c conf.c conn.c conn-zip.c conn-func.c \ hash.c irc.c irc-channel.c irc-info.c irc-login.c irc-mode.c irc-op.c \ - irc-oper.c irc-server.c irc-write.c lists.c log.c match.c parse.c resolve.c \ - tool.c + irc-oper.c irc-server.c irc-write.c lists.c log.c match.c parse.c resolve.c -ngircd_LDFLAGS = -L../portab +ngircd_LDFLAGS = -L../portab -L../tool -ngircd_LDADD = -lngportab +ngircd_LDADD = -lngportab -lngtool noinst_HEADERS = ngircd.h channel.h client.h conf.h conn.h conn-zip.h conn-func.h \ hash.h irc.h irc-channel.h irc-info.h irc-login.h irc-mode.h irc-op.h \ irc-oper.h irc-server.h irc-write.h lists.h log.h match.h parse.h resolve.h \ - tool.h messages.h defines.h + messages.h defines.h clean-local: rm -f check-version check-help lint.out cvs-version.* diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am new file mode 100644 index 00000000..5f1e97ad --- /dev/null +++ b/src/tool/Makefile.am @@ -0,0 +1,27 @@ +# +# ngIRCd -- The Next Generation IRC Daemon +# Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. +# +# $Id: Makefile.am,v 1.1 2003/01/13 12:20:16 alex Exp $ +# + +AUTOMAKE_OPTIONS = ansi2knr + +INCLUDES = -I$(srcdir)/../portab + +noinst_LIBRARIES = libngtool.a + +libngtool_a_SOURCES = tool.c + +noinst_HEADERS = tool.h + +maintainer-clean-local: + rm -f Makefile Makefile.in + +# -eof- diff --git a/src/ngircd/tool.c b/src/tool/tool.c similarity index 95% rename from src/ngircd/tool.c rename to src/tool/tool.c index 440fcb4b..3b66d7f8 100644 --- a/src/ngircd/tool.c +++ b/src/tool/tool.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: tool.c,v 1.10 2002/12/12 12:24:18 alex Exp $"; +static char UNUSED id[] = "$Id: tool.c,v 1.1 2003/01/13 12:20:16 alex Exp $"; #include "imp.h" #include diff --git a/src/ngircd/tool.h b/src/tool/tool.h similarity index 92% rename from src/ngircd/tool.h rename to src/tool/tool.h index f094eb35..65817779 100644 --- a/src/ngircd/tool.h +++ b/src/tool/tool.h @@ -8,7 +8,7 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: tool.h,v 1.9 2002/12/12 12:23:43 alex Exp $ + * $Id: tool.h,v 1.1 2003/01/13 12:20:16 alex Exp $ * * Tool functions (Header) */ -- 2.39.2