Fix authorization in plugins

[stg.git] / projects / convertor / Makefile

diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
index c07f698efec322ae0a34cdb880321bccf85ec35e..86ab6ed3dd1b305db53e7980e8d1179f5dfe70ce 100644 (file)
--- a/projects/convertor/Makefile
+++ b/projects/convertor/Makefile
@@ -7,12 +7,12 @@ include ../../Makefile.conf
 PROG = convertor
 
 SRCS = ./main.cpp \
 PROG = convertor
 
 SRCS = ./main.cpp \

-       ./settings.cpp
+       ./settings_impl.cpp

 
 

-STGLIBS =  -lstg_logger \
-           -lstg_common \
+STGLIBS =  -lstglogger \
+           -lstgcommon \

            -ldotconfpp \
            -ldotconfpp \

-          -lstg_crypto
+          -lstgcrypto

 
 LIBS += $(LIB_THREAD)
 
 
 LIBS += $(LIB_THREAD)
 


@@ -29,7 +29,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(DIR_LIB)
 
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(DIR_LIB)
 

-vpath %.so $(DIR_LIB)
+vpath %.a $(DIR_LIB)

 
 .PHONY: all clean distclean libs plugins install uninstall
 all: libs plugins $(PROG) ../../Makefile.conf
 
 .PHONY: all clean distclean libs plugins install uninstall
 all: libs plugins $(PROG) ../../Makefile.conf


@@ -41,7 +41,7 @@ plugins: libs
        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS) $(STGLIBS) 
        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS) $(STGLIBS) 

-       $(CC) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
+       $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)

 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS