From abe068d00ecc304c855886f5e511b563b352dd0a Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 21 Sep 2013 01:41:17 +0300 Subject: [PATCH 1/1] Fixes in paths. --- stglibs/srvconf.lib/Makefile | 19 ++++++++++--------- stglibs/srvconf.lib/parsers/auth_by.cpp | 2 +- stglibs/srvconf.lib/parsers/auth_by.h | 2 +- stglibs/srvconf.lib/parsers/check_user.cpp | 2 +- stglibs/srvconf.lib/parsers/check_user.h | 2 +- stglibs/srvconf.lib/parsers/chg_user.cpp | 2 +- stglibs/srvconf.lib/parsers/chg_user.h | 2 +- stglibs/srvconf.lib/parsers/get_user.cpp | 2 +- stglibs/srvconf.lib/parsers/get_user.h | 4 ++-- stglibs/srvconf.lib/parsers/get_users.cpp | 2 +- stglibs/srvconf.lib/parsers/get_users.h | 4 ++-- stglibs/srvconf.lib/parsers/property.cpp | 2 +- stglibs/srvconf.lib/parsers/send_message.cpp | 2 +- stglibs/srvconf.lib/parsers/send_message.h | 2 +- stglibs/srvconf.lib/parsers/server_info.cpp | 2 +- stglibs/srvconf.lib/parsers/server_info.h | 4 ++-- stglibs/srvconf.lib/servconf.cpp | 15 ++++++++------- 17 files changed, 36 insertions(+), 34 deletions(-) diff --git a/stglibs/srvconf.lib/Makefile b/stglibs/srvconf.lib/Makefile index aaf3e117..d3fdb284 100644 --- a/stglibs/srvconf.lib/Makefile +++ b/stglibs/srvconf.lib/Makefile @@ -8,17 +8,18 @@ STGLIBS = -lstgcommon \ -lstgcrypto LIBS = -lexpat -SRCS = netunit.cpp \ - property_parsers.cpp \ - parser_auth_by.cpp \ - parser_server_info.cpp \ - parser_check_user.cpp \ - parser_get_user.cpp \ - parser_get_users.cpp \ - parser_chg_user.cpp \ - parser_send_message.cpp \ +SRCS = parsers/property.cpp \ + parsers/auth_by.cpp \ + parsers/server_info.cpp \ + parsers/check_user.cpp \ + parsers/get_user.cpp \ + parsers/get_users.cpp \ + parsers/chg_user.cpp \ + parsers/send_message.cpp \ + netunit.cpp \ servconf.cpp + INCS = servconf.h \ netunit.h diff --git a/stglibs/srvconf.lib/parsers/auth_by.cpp b/stglibs/srvconf.lib/parsers/auth_by.cpp index 34e490ca..99e3c021 100644 --- a/stglibs/srvconf.lib/parsers/auth_by.cpp +++ b/stglibs/srvconf.lib/parsers/auth_by.cpp @@ -18,7 +18,7 @@ * Author : Maxim Mamontov */ -#include "parser_auth_by.h" +#include "auth_by.h" #include diff --git a/stglibs/srvconf.lib/parsers/auth_by.h b/stglibs/srvconf.lib/parsers/auth_by.h index c4757cf9..a4bab9dd 100644 --- a/stglibs/srvconf.lib/parsers/auth_by.h +++ b/stglibs/srvconf.lib/parsers/auth_by.h @@ -21,7 +21,7 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__ #define __STG_STGLIBS_SRVCONF_PARSER_AUTH_BY_H__ -#include "parser.h" +#include "base.h" #include "stg/servconf_types.h" diff --git a/stglibs/srvconf.lib/parsers/check_user.cpp b/stglibs/srvconf.lib/parsers/check_user.cpp index 0cb37522..8bf81e24 100644 --- a/stglibs/srvconf.lib/parsers/check_user.cpp +++ b/stglibs/srvconf.lib/parsers/check_user.cpp @@ -19,7 +19,7 @@ * Author : Maxim Mamontov */ -#include "parser_check_user.h" +#include "check_user.h" #include diff --git a/stglibs/srvconf.lib/parsers/check_user.h b/stglibs/srvconf.lib/parsers/check_user.h index 95658c38..25740f02 100644 --- a/stglibs/srvconf.lib/parsers/check_user.h +++ b/stglibs/srvconf.lib/parsers/check_user.h @@ -22,7 +22,7 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__ #define __STG_STGLIBS_SRVCONF_PARSER_CHECK_USER_H__ -#include "parser.h" +#include "base.h" #include "stg/servconf_types.h" diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp index b5f4eb73..a7d35925 100644 --- a/stglibs/srvconf.lib/parsers/chg_user.cpp +++ b/stglibs/srvconf.lib/parsers/chg_user.cpp @@ -19,7 +19,7 @@ * Author : Maxim Mamontov */ -#include "parser_chg_user.h" +#include "chg_user.h" #include diff --git a/stglibs/srvconf.lib/parsers/chg_user.h b/stglibs/srvconf.lib/parsers/chg_user.h index 63c528d0..424866bc 100644 --- a/stglibs/srvconf.lib/parsers/chg_user.h +++ b/stglibs/srvconf.lib/parsers/chg_user.h @@ -22,7 +22,7 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__ #define __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__ -#include "parser.h" +#include "base.h" #include "stg/servconf_types.h" diff --git a/stglibs/srvconf.lib/parsers/get_user.cpp b/stglibs/srvconf.lib/parsers/get_user.cpp index 2c398914..71e6cba6 100644 --- a/stglibs/srvconf.lib/parsers/get_user.cpp +++ b/stglibs/srvconf.lib/parsers/get_user.cpp @@ -19,7 +19,7 @@ * Author : Maxim Mamontov */ -#include "parser_get_user.h" +#include "get_user.h" #include "stg/common.h" diff --git a/stglibs/srvconf.lib/parsers/get_user.h b/stglibs/srvconf.lib/parsers/get_user.h index c8c371d7..190b5784 100644 --- a/stglibs/srvconf.lib/parsers/get_user.h +++ b/stglibs/srvconf.lib/parsers/get_user.h @@ -22,8 +22,8 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__ #define __STG_STGLIBS_SRVCONF_PARSER_GET_USER_H__ -#include "parser.h" -#include "property_parsers.h" +#include "base.h" +#include "property.h" #include "stg/servconf_types.h" diff --git a/stglibs/srvconf.lib/parsers/get_users.cpp b/stglibs/srvconf.lib/parsers/get_users.cpp index ecc2917c..cf62f357 100644 --- a/stglibs/srvconf.lib/parsers/get_users.cpp +++ b/stglibs/srvconf.lib/parsers/get_users.cpp @@ -19,7 +19,7 @@ * Author : Maxim Mamontov */ -#include "parser_get_users.h" +#include "get_users.h" #include diff --git a/stglibs/srvconf.lib/parsers/get_users.h b/stglibs/srvconf.lib/parsers/get_users.h index ea9966ee..ac648a27 100644 --- a/stglibs/srvconf.lib/parsers/get_users.h +++ b/stglibs/srvconf.lib/parsers/get_users.h @@ -23,8 +23,8 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__ #define __STG_STGLIBS_SRVCONF_PARSER_GET_USERS_H__ -#include "parser.h" -#include "parser_get_user.h" +#include "base.h" +#include "get_user.h" #include "stg/servconf_types.h" diff --git a/stglibs/srvconf.lib/parsers/property.cpp b/stglibs/srvconf.lib/parsers/property.cpp index 5d4577dc..8a78fe76 100644 --- a/stglibs/srvconf.lib/parsers/property.cpp +++ b/stglibs/srvconf.lib/parsers/property.cpp @@ -18,7 +18,7 @@ * Author : Maxim Mamontov */ -#include "property_parsers.h" +#include "property.h" #include diff --git a/stglibs/srvconf.lib/parsers/send_message.cpp b/stglibs/srvconf.lib/parsers/send_message.cpp index 318cc8eb..c3a91789 100644 --- a/stglibs/srvconf.lib/parsers/send_message.cpp +++ b/stglibs/srvconf.lib/parsers/send_message.cpp @@ -19,7 +19,7 @@ * Author : Maxim Mamontov */ -#include "parser_send_message.h" +#include "send_message.h" #include diff --git a/stglibs/srvconf.lib/parsers/send_message.h b/stglibs/srvconf.lib/parsers/send_message.h index 27903bc0..7e4ded22 100644 --- a/stglibs/srvconf.lib/parsers/send_message.h +++ b/stglibs/srvconf.lib/parsers/send_message.h @@ -22,7 +22,7 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_SEND_MESSAGE_H__ #define __STG_STGLIBS_SRVCONF_PARSER_SEND_MESSAGE_H__ -#include "parser.h" +#include "base.h" #include "stg/servconf_types.h" diff --git a/stglibs/srvconf.lib/parsers/server_info.cpp b/stglibs/srvconf.lib/parsers/server_info.cpp index d4c610e0..1b637858 100644 --- a/stglibs/srvconf.lib/parsers/server_info.cpp +++ b/stglibs/srvconf.lib/parsers/server_info.cpp @@ -19,7 +19,7 @@ * Author : Maxim Mamontov */ -#include "parser_server_info.h" +#include "server_info.h" #include "stg/common.h" diff --git a/stglibs/srvconf.lib/parsers/server_info.h b/stglibs/srvconf.lib/parsers/server_info.h index 9ac23ee8..7bcbbba4 100644 --- a/stglibs/srvconf.lib/parsers/server_info.h +++ b/stglibs/srvconf.lib/parsers/server_info.h @@ -22,8 +22,8 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__ #define __STG_STGLIBS_SRVCONF_PARSER_SERVER_INFO_H__ -#include "parser.h" -#include "property_parsers.h" +#include "base.h" +#include "property.h" #include "stg/servconf_types.h" diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index 3684dd54..325ee5f2 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -21,13 +21,14 @@ #include "stg/servconf.h" #include "netunit.h" -#include "parser_auth_by.h" -#include "parser_server_info.h" -#include "parser_check_user.h" -#include "parser_get_users.h" -#include "parser_get_user.h" -#include "parser_chg_user.h" -#include "parser_send_message.h" +#include "parsers/auth_by.h" +#include "parsers/server_info.h" +#include "parsers/check_user.h" +#include "parsers/get_users.h" +#include "parsers/get_user.h" +#include "parsers/chg_user.h" +#include "parsers/send_message.h" +#include "parsers/base.h" #include "stg/common.h" -- 2.44.2