Permalink
Browse files

Merge branch 'headers'

  • Loading branch information...
Alexey Sokolov
Alexey Sokolov committed Sep 28, 2011
2 parents 187a05d + afeab4a commit 2c1ca453538582410e46dc0e5359a16f879f153a
Showing with 471 additions and 470 deletions.
  1. +10 −9 Makefile.in
  2. +2 −2 configure.ac
  3. +2 −2 { → include/znc}/Buffer.h
  4. +3 −3 { → include/znc}/Chan.h
  5. +4 −4 { → include/znc}/Client.h
  6. +2 −2 { → include/znc}/Config.h
  7. +1 −1 { → include/znc}/Csocket.h
  8. +2 −2 { → include/znc}/ExecSock.h
  9. +2 −2 { → include/znc}/FileUtils.h
  10. +2 −2 { → include/znc}/HTTPSock.h
  11. +5 −5 { → include/znc}/IRCNetwork.h
  12. +3 −3 { → include/znc}/IRCSock.h
  13. +2 −2 { → include/znc}/Listener.h
  14. +1 −1 { → include/znc}/MD5.h
  15. +3 −3 { → include/znc}/Modules.h
  16. +2 −2 { → include/znc}/Nick.h
  17. +1 −1 { → include/znc}/SHA256.h
  18. +2 −2 { → include/znc}/Server.h
  19. +2 −2 { → include/znc}/Socket.h
  20. +2 −2 { → include/znc}/Template.h
  21. +4 −4 { → include/znc}/User.h
  22. +2 −2 { → include/znc}/Utils.h
  23. +3 −3 { → include/znc}/WebModules.h
  24. +1 −1 { → include/znc}/ZNCDebug.h
  25. +1 −1 { → include/znc}/ZNCString.h
  26. +3 −3 { → include/znc}/defines.h
  27. +1 −1 { → include/znc}/main.h
  28. +5 −5 { → include/znc}/znc.h
  29. +1 −1 modules/Makefile.in
  30. +6 −6 modules/admin.cpp
  31. +5 −5 modules/adminlog.cpp
  32. +2 −2 modules/autoattach.cpp
  33. +2 −2 modules/autoop.cpp
  34. +4 −4 modules/autoreply.cpp
  35. +3 −3 modules/awaynick.cpp
  36. +4 −4 modules/blockuser.cpp
  37. +6 −6 modules/bouncedcc.cpp
  38. +3 −3 modules/buffextras.cpp
  39. +4 −4 modules/cert.cpp
  40. +4 −4 modules/certauth.cpp
  41. +4 −4 modules/chansaver.cpp
  42. +2 −2 modules/clientnotify.cpp
  43. +3 −3 modules/crypt.cpp
  44. +3 −3 modules/disconkick.cpp
  45. +2 −2 modules/extra/antiidle.cpp
  46. +4 −4 modules/extra/autoaway.cpp
  47. +3 −3 modules/extra/autocycle.cpp
  48. +2 −2 modules/extra/autovoice.cpp
  49. +1 −1 modules/extra/block_motd.cpp
  50. +1 −1 modules/extra/charset.cpp
  51. +3 −3 modules/extra/clearbufferonmsg.cpp
  52. +2 −2 modules/extra/ctcpflood.cpp
  53. +5 −5 modules/extra/dcc.cpp
  54. +2 −2 modules/extra/droproot.cpp
  55. +4 −4 modules/extra/email.cpp
  56. +3 −3 modules/extra/fakeonline.cpp
  57. +4 −4 modules/extra/flooddetach.cpp
  58. +2 −2 modules/extra/imapauth.cpp
  59. +3 −3 modules/extra/listsockets.cpp
  60. +3 −3 modules/extra/motdfile.cpp
  61. +2 −2 modules/extra/notify_connect.cpp
  62. +2 −2 modules/extra/saslauth.cpp
  63. +3 −3 modules/extra/send_raw.cpp
  64. +4 −4 modules/extra/shell.cpp
  65. +1 −1 modules/fail2ban.cpp
  66. +5 −5 modules/identfile.cpp
  67. +4 −4 modules/keepnick.cpp
  68. +2 −2 modules/kickrejoin.cpp
  69. +3 −3 modules/lastseen.cpp
  70. +5 −5 modules/log.cpp
  71. +7 −7 modules/modperl.cpp
  72. +41 −41 modules/modperl/modperl.i
  73. +1 −1 modules/modperl/module.h
  74. +7 −7 modules/modpython.cpp
  75. +43 −43 modules/modpython/modpython.i
  76. +7 −7 modules/modtcl.cpp
  77. +1 −1 modules/nickserv.cpp
  78. +7 −7 modules/notes.cpp
  79. +3 −3 modules/partyline.cpp
  80. +2 −2 modules/perform.cpp
  81. +6 −6 modules/q.cpp
  82. +1 −1 modules/raw.cpp
  83. +3 −3 modules/route_replies.cpp
  84. +4 −4 modules/sample.cpp
  85. +4 −4 modules/savebuff.cpp
  86. +4 −4 modules/schat.cpp
  87. +1 −1 modules/simple_away.cpp
  88. +2 −2 modules/stickychan.cpp
  89. +3 −3 modules/watch.cpp
  90. +10 −10 modules/webadmin.cpp
  91. +1 −1 { → src}/Buffer.cpp
  92. +7 −7 { → src}/Chan.cpp
  93. +8 −8 { → src}/Client.cpp
  94. +9 −9 { → src}/ClientCommand.cpp
  95. +2 −2 { → src}/Config.cpp
  96. +1 −1 { → src}/Csocket.cpp
  97. +4 −4 { → src}/FileUtils.cpp
  98. +4 −4 { → src}/HTTPSock.cpp
  99. +10 −10 { → src}/IRCNetwork.cpp
  100. +7 −7 { → src}/IRCSock.cpp
  101. +2 −2 { → src}/Listener.cpp
  102. +1 −1 { → src}/MD5.cpp
  103. +7 −7 { → src}/Modules.cpp
  104. +4 −4 { → src}/Nick.cpp
  105. +1 −1 { → src}/SHA256.cpp
  106. +1 −1 { → src}/Server.cpp
  107. +4 −4 { → src}/Socket.cpp
  108. +3 −3 { → src}/Template.cpp
  109. +8 −8 { → src}/User.cpp
  110. +4 −4 { → src}/Utils.cpp
  111. +4 −4 { → src}/WebModules.cpp
  112. +1 −1 { → src}/ZNCDebug.cpp
  113. +5 −5 { → src}/ZNCString.cpp
  114. +2 −2 { → src}/main.cpp
  115. +9 −9 { → src}/znc.cpp
  116. +1 −1 znc-config.in
View
@@ -15,7 +15,7 @@ includedir := @includedir@
sbindir := @sbindir@
localstatedir := @localstatedir@
CXX := @CXX@
-CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I.
+CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I$(srcdir)/include -Iinclude
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
LIBZNC := @LIBZNC@
@@ -32,10 +32,11 @@ LIB_SRCS := ZNCString.cpp Csocket.cpp znc.cpp IRCNetwork.cpp User.cpp IRCSock.c
Client.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
FileUtils.cpp HTTPSock.cpp Template.cpp ClientCommand.cpp Socket.cpp SHA256.cpp \
WebModules.cpp Listener.cpp Config.cpp ZNCDebug.cpp
-BIN_SRCS := main.cpp
+LIB_SRCS := $(addprefix src/,$(LIB_SRCS))
+BIN_SRCS := src/main.cpp
LIB_OBJS := $(patsubst %cpp,%o,$(LIB_SRCS))
BIN_OBJS := $(patsubst %cpp,%o,$(BIN_SRCS))
-CLEAN := znc *.o core core.*
+CLEAN := znc src/*.o core core.*
DISTCLEAN := Makefile config.log config.status znc-config znc-buildmod .depend \
modules/.depend modules/Makefile man/Makefile znc.pc znc-uninstalled.pc
@@ -96,10 +97,10 @@ clean:
distclean: clean
rm -rf $(DISTCLEAN)
-%.o: %.cpp Makefile
- @mkdir -p .depend
- $(E) Building $@...
- $(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
+src/%.o: src/%.cpp Makefile
+ @mkdir -p .depend src
+ $(E) Building core object $*...
+ $(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$*.dep
install: znc $(LIBZNC)
mkdir -p $(DESTDIR)$(bindir)
@@ -113,8 +114,8 @@ install: znc $(LIBZNC)
$(INSTALL_PROGRAM) znc $(DESTDIR)$(bindir)
$(INSTALL_SCRIPT) znc-config $(DESTDIR)$(bindir)
$(INSTALL_SCRIPT) znc-buildmod $(DESTDIR)$(bindir)
- $(INSTALL_DATA) $(srcdir)/*.h $(DESTDIR)$(includedir)/znc
- $(INSTALL_DATA) zncconfig.h $(DESTDIR)$(includedir)/znc
+ $(INSTALL_DATA) $(srcdir)/include/znc/*.h $(DESTDIR)$(includedir)/znc
+ $(INSTALL_DATA) include/znc/zncconfig.h $(DESTDIR)$(includedir)/znc
$(INSTALL_DATA) znc.pc $(DESTDIR)$(PKGCONFIGDIR)
@$(MAKE) -C modules install DESTDIR=$(DESTDIR);
if test -n "$(LIBZNC)"; then \
View
@@ -9,9 +9,9 @@ AC_PREREQ([2.62])
dnl Keep the version number in sync with main.h!
AC_INIT([znc], [0.203])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([znc.cpp])
+AC_CONFIG_SRCDIR([src/znc.cpp])
AC_LANG([C++])
-AC_CONFIG_HEADERS([zncconfig.h])
+AC_CONFIG_HEADERS([include/znc/zncconfig.h])
AH_TOP([#ifndef ZNCCONFIG_H
#define ZNCCONFIG_H])
AH_BOTTOM([#endif /* ZNCCONFIG_H */])
@@ -9,8 +9,8 @@
#ifndef _BUFFER_H
#define _BUFFER_H
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
#include <deque>
using std::deque;
@@ -9,9 +9,9 @@
#ifndef _CHAN_H
#define _CHAN_H
-#include "zncconfig.h"
-#include "Nick.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/Nick.h>
+#include <znc/ZNCString.h>
#include <map>
#include <set>
#include <vector>
@@ -9,10 +9,10 @@
#ifndef _CLIENT_H
#define _CLIENT_H
-#include "zncconfig.h"
-#include "Socket.h"
-#include "Utils.h"
-#include "main.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
+#include <znc/Utils.h>
+#include <znc/main.h>
// Forward Declarations
class CZNC;
@@ -9,8 +9,8 @@
#ifndef CONFIG_H
#define CONFIG_H
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
class CFile;
class CConfig;
@@ -34,7 +34,7 @@
#ifndef _HAS_CSOCKET_
#define _HAS_CSOCKET_
-#include "defines.h" // require this as a general rule, most projects have a defines.h or the like
+#include <znc/defines.h> // require this as a general rule, most projects have a defines.h or the like
#include <stdio.h>
#include <unistd.h>
@@ -9,8 +9,8 @@
#ifndef EXEC_SOCK_H
#define EXEC_SOCK_H
-#include "zncconfig.h"
-#include "Socket.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
#include <signal.h>
//! @author imaginos@imaginos.net
@@ -9,8 +9,8 @@
#ifndef _FILEUTILS_H
#define _FILEUTILS_H
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
#include <dirent.h>
#include <map>
#include <stdlib.h>
@@ -9,8 +9,8 @@
#ifndef _HTTPSOCK_H
#define _HTTPSOCK_H
-#include "zncconfig.h"
-#include "Socket.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
class CModule;
@@ -9,11 +9,11 @@
#ifndef _IRCNETWORK_H
#define _IRCNETWORK_H
-#include "zncconfig.h"
-#include "ZNCString.h"
-#include "Buffer.h"
-#include "Nick.h"
-#include "znc.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
+#include <znc/Buffer.h>
+#include <znc/Nick.h>
+#include <znc/znc.h>
class CModules;
class CUser;
@@ -9,9 +9,9 @@
#ifndef _IRCSOCK_H
#define _IRCSOCK_H
-#include "zncconfig.h"
-#include "Socket.h"
-#include "Nick.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
+#include <znc/Nick.h>
// Forward Declarations
class CChan;
@@ -9,8 +9,8 @@
#ifndef _LISTENER_H
#define _LISTENER_H
-#include "zncconfig.h"
-#include "Socket.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
// Forward Declarations
class CRealListener;
@@ -3,7 +3,7 @@
#ifndef _MD5_H
#define _MD5_H
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
#include <string>
using std::string;
@@ -9,9 +9,9 @@
#ifndef _MODULES_H
#define _MODULES_H
-#include "zncconfig.h"
-#include "WebModules.h"
-#include "main.h"
+#include <znc/zncconfig.h>
+#include <znc/WebModules.h>
+#include <znc/main.h>
#include <set>
#include <queue>
@@ -9,8 +9,8 @@
#ifndef _NICK_H
#define _NICK_H
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
#include <set>
#include <vector>
@@ -37,7 +37,7 @@
#define SHA256_DIGEST_SIZE ( 256 / 8)
#define SHA256_BLOCK_SIZE ( 512 / 8)
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
// C99 defines stdint.h which defines a uint32_t and uint8_t type.
// But the other kids didn't want to play with poor little Solaris 9 and so he
@@ -9,8 +9,8 @@
#ifndef _SERVER_H
#define _SERVER_H
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
class CServer {
public:
@@ -9,8 +9,8 @@
#ifndef SOCKET_H
#define SOCKET_H
-#include "zncconfig.h"
-#include "Csocket.h"
+#include <znc/zncconfig.h>
+#include <znc/Csocket.h>
class CModule;
@@ -9,8 +9,8 @@
#ifndef _TEMPLATE_H
#define _TEMPLATE_H
-#include "zncconfig.h"
-#include "Utils.h"
+#include <znc/zncconfig.h>
+#include <znc/Utils.h>
#include <iostream>
using std::ostream;
@@ -9,10 +9,10 @@
#ifndef _USER_H
#define _USER_H
-#include "zncconfig.h"
-#include "Buffer.h"
-#include "Modules.h"
-#include "Nick.h"
+#include <znc/zncconfig.h>
+#include <znc/Buffer.h>
+#include <znc/Modules.h>
+#include <znc/Nick.h>
#include <set>
#include <vector>
@@ -9,8 +9,8 @@
#ifndef _UTILS_H
#define _UTILS_H
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
#include <assert.h>
#include <cstdio>
#include <fcntl.h>
@@ -9,9 +9,9 @@
#ifndef _WEBMODULES_H
#define _WEBMODULES_H
-#include "zncconfig.h"
-#include "Template.h"
-#include "HTTPSock.h"
+#include <znc/zncconfig.h>
+#include <znc/Template.h>
+#include <znc/HTTPSock.h>
class CAuthBase;
class CUser;
@@ -9,7 +9,7 @@
#ifndef ZNCDEBUG_H
#define ZNCDEBUG_H
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
#include <iostream>
using std::cout;
@@ -9,7 +9,7 @@
#ifndef ZNCSTRING_H
#define ZNCSTRING_H
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
#include <map>
#include <set>
#include <string>
@@ -9,12 +9,12 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
// This header file is just for Csocket
-#include "ZNCDebug.h"
-#include "ZNCString.h"
+#include <znc/ZNCDebug.h>
+#include <znc/ZNCString.h>
#define CS_STRING CString
#define _NO_CSOCKET_NS
@@ -9,7 +9,7 @@
#ifndef _MAIN_H
#define _MAIN_H
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
// The following defines are for #if comparison (preprocessor only likes ints)
#define VERSION_MAJOR 0
@@ -9,11 +9,11 @@
#ifndef _ZNC_H
#define _ZNC_H
-#include "zncconfig.h"
-#include "Client.h"
-#include "Modules.h"
-#include "Socket.h"
-#include "Listener.h"
+#include <znc/zncconfig.h>
+#include <znc/Client.h>
+#include <znc/Modules.h>
+#include <znc/Socket.h>
+#include <znc/Listener.h>
#include <map>
using std::map;
View
@@ -17,7 +17,7 @@ sbindir := @sbindir@
localstatedir := @localstatedir@
CXX := @CXX@
# CXXFLAGS are for the main binary, so don't use them here, use MODFLAGS instead
-MODFLAGS := @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/.. -I..
+MODFLAGS := @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/../include -I../include
MODLINK := @MODLINK@
LDFLAGS := @LDFLAGS@
# LIBS are not and should not be used in here.
View
@@ -9,12 +9,12 @@
* by the Free Software Foundation.
*/
-#include "znc.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "IRCSock.h"
+#include <znc/znc.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/Modules.h>
+#include <znc/Chan.h>
+#include <znc/IRCSock.h>
template<std::size_t N>
struct array_size_helper {
Oops, something went wrong.

0 comments on commit 2c1ca45

Please sign in to comment.