X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..512f2e6baf82bb22e05ee583741ca4209480e783:/projects/sgconf/Makefile?ds=sidebyside

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index f9f0042b..02f8d7b8 100644
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -9,10 +9,10 @@ PROG = sgconf
 SRCS = ./main.cpp \
        ./common_sg.cpp
 
-STGLIBS =  -lconffiles \
-           -lstg_common \
-	   -lstg_crypto \
-           -lsrvconf
+STGLIBS =  -lstgconffiles \
+           -lstgsrvconf \
+           -lstgcommon \
+	   -lstgcrypto
 
 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) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
+	$(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
 
 clean:
 	rm -f deps $(PROG) *.o tags *.*~ .OS
@@ -63,22 +63,17 @@ clean:
 distclean: clean
 	rm -f ../../Makefile.conf
 
-install: install-bin install-data
+install: install-bin
 
 install-bin:
-	mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin
 	install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
 	$(MAKE) -C $(DIR_LIBSRC) install
 
-install-data:
-
-uninstall: uninstall-bin uninstall-data
+uninstall: uninstall-bin
 
 uninstall-bin:
 	rm -f $(PREFIX)/usr/sbin/$(PROG)
 
-uninstall-data:
-
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)