Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / Makefile

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/Makefile b/projects/stargazer/plugins/configuration/rpcconfig/Makefile
index b2bdabf6418fa8808cf8777356b2c161041cf469..c647f7524d918e1f2772e0ab289c76a876aaf00c 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/Makefile
+++ b/projects/stargazer/plugins/configuration/rpcconfig/Makefile
@@ -15,17 +15,11 @@ SRCS = ./rpcconfig.cpp \
        ./admins_methods.cpp \
        ./messages_methods.cpp
 
-XMLRPC_C_LIBS = $(shell xmlrpc-c-config c++2 abyss-server --libs)
-
-LIBS += $(XMLRPC_C_LIBS) \
-       $(LIB_THREAD)
-
-ifneq ($(OS),linux)
-LIBS += -liconv
-endif
+LIBS += $(XMLRPC_LDFLAGS) \
+       $(LIB_THREAD) \
+       $(LIBICONV)
 
 STGLIBS = common \
-         locker \
          logger \
          scriptexecuter