Move tariffUsers from users section to tariffs.tariffUsage and fix

[stg.git] / projects / sgconf_xml / Makefile

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index 752f05a5f6c4a43a419c499c76f3675481e29bd5..2453ef5c971dff322306f9ad924b951d706d14b6 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -10,9 +10,9 @@ SRCS = ./main.cpp \
        ./parser.cpp
 
 LIBS =  -lstgconffiles \
+        -lstgsrvconf \
         -lstgcrypto \
-        -lstgcommon \
-        -lstgsrvconf
+        -lstgcommon
 
 LIBS += -lexpat \
        $(LIB_THREAD)
@@ -41,7 +41,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 CXXFLAGS += -Wall
 LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
 
-vpath %.so $(DIR_LIB)
+vpath %.a $(DIR_LIB)
 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf
@@ -50,7 +50,7 @@ libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 $(PROG): $(OBJS) $(STGLIBS)
-       $(CC) $^ $(LIBS) $(LDFLAGS) -o $(PROG)
+       $(CXX) $^ $(LIBS) $(LDFLAGS) -o $(PROG)
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS