Fixed compilation issues.

diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in
index dd1e124a32a1e01407d872605a4d490476ed7785..efb5d984e4a6cdb2ca947339a2a0c215b2b0cd12 100644 (file)
--- a/projects/stargazer/plugins/Makefile.in
+++ b/projects/stargazer/plugins/Makefile.in
@@ -13,8 +13,8 @@ STGLIBS_PATHS = $(addprefix -L ../../../../../stglibs/,$(addsuffix .lib,$(STGLIB
 
 STGLIBS_LIBS = $(addprefix -lstg,$(STGLIBS))
 
 
 STGLIBS_LIBS = $(addprefix -lstg,$(STGLIBS))
 

-CXXFLAGS += -fPIC $(STGLIBS_INCS)
-CFLAGS += -fPIC $(STGLIBS_INCS)
+CXXFLAGS += -fPIC $(DEFS) $(SEARCH_DIRS) $(STGLIBS_INCS)
+CFLAGS += -fPIC $(DEFS) $(SEARCH_DIRS) $(STGLIBS_INCS)

 
 ifneq ($(OS),darwin)
 LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg
 
 ifneq ($(OS),darwin)
 LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg

diff --git a/projects/stargazer/plugins/configuration/sgconfig/Makefile b/projects/stargazer/plugins/configuration/sgconfig/Makefile
index 40a5c534c9e933a5b44eb1c11628eff82642e011..2e5c8c60195d5c76e7e23c9f07b8322228b9cb63 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/Makefile
+++ b/projects/stargazer/plugins/configuration/sgconfig/Makefile
@@ -15,7 +15,6 @@ SRCS = ./stgconfig.cpp \
        ./parser_users.cpp \
        ./parser_message.cpp \
        ./parser_auth_by.cpp \
        ./parser_users.cpp \
        ./parser_message.cpp \
        ./parser_auth_by.cpp \

-       ./parser_user_info.cpp \

        ./parser_server_info.cpp
 
 LIBS += -lexpat \
        ./parser_server_info.cpp
 
 LIBS += -lexpat \

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index d1d25026f68c34a452602d014e85425f6be3b8fc..567c537ae7f6a5aaef04ef641ff1ff77da829db6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -19,6 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

+#include "configproto.h"

 
 #include "conn.h"
 
 
 #include "conn.h"
 


@@ -27,7 +28,6 @@
 #include "parser_tariffs.h"
 #include "parser_users.h"
 #include "parser_message.h"
 #include "parser_tariffs.h"
 #include "parser_users.h"
 #include "parser_message.h"

-#include "parser_user_info.h"

 #include "parser_auth_by.h"
 
 #include "stg/common.h"
 #include "parser_auth_by.h"
 
 #include "stg/common.h"


@@ -230,8 +230,6 @@ void CONFIGPROTO::RegisterParsers()
     SP::SEND_MESSAGE::FACTORY::Register(m_registry, *m_users);
 
     SP::AUTH_BY::FACTORY::Register(m_registry, *m_users);
     SP::SEND_MESSAGE::FACTORY::Register(m_registry, *m_users);
 
     SP::AUTH_BY::FACTORY::Register(m_registry, *m_users);

-
-    SP::USER_INFO::FACTORY::Register(m_registry, *m_users);

 }
 
 int CONFIGPROTO::MaxFD() const
 }
 
 int CONFIGPROTO::MaxFD() const