X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..bc4721533e4041a19b42cb247064f9f42c3f9d5f:/projects/convertor/Makefile?ds=sidebyside diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile index c07f698e..86ab6ed3 100644 --- a/projects/convertor/Makefile +++ b/projects/convertor/Makefile @@ -7,12 +7,12 @@ include ../../Makefile.conf PROG = convertor SRCS = ./main.cpp \ - ./settings.cpp + ./settings_impl.cpp -STGLIBS = -lstg_logger \ - -lstg_common \ +STGLIBS = -lstglogger \ + -lstgcommon \ -ldotconfpp \ - -lstg_crypto + -lstgcrypto 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) -vpath %.so $(DIR_LIB) +vpath %.a $(DIR_LIB) .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) - $(CC) $^ $(LDFLAGS) $(LIBS) -o $(PROG) + $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG) clean: rm -f deps $(PROG) *.o tags *.*~ .OS