X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..89a688a2876a7922dc2824769b91cab8bba00c4b:/projects/sgauth/Makefile

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index 47488cc2..cf2e2c53 100644
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -7,19 +7,17 @@ include ../../Makefile.conf
 PROG = sgauth
 
 SRCS = ./main.cpp \
+       ./settings_impl.cpp \
        ./web.cpp
 
-STGLIBS =  -lconffiles \
-           -lstg_crypto \
-           -lstg_common \
-           -lia_auth_c \
-           -lcommon_settings
+STGLIBS =  -lstgconffiles \
+           -lstgia \
+           -lstgcrypto \
+           -lstgcommon
 
-LIBS += $(LIB_THREAD) \
-	-lexpat
+LIBS += $(LIB_THREAD)
 
 ifeq ($(OS),linux)
-LIBS += -ldl
 else
 LIBS += -lintl \
         -lc
@@ -32,7 +30,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
@@ -41,7 +39,7 @@ libs:
 	$(MAKE) -C $(DIR_LIBSRC)
 
 $(PROG): $(OBJS) $(STGLIBS) 
-	$(CC) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
+	$(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:
 	rm -f deps $(PROG) *.o tags *.*~ .OS
@@ -58,13 +56,12 @@ distclean: clean
 install: install-bin install-data
 
 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:
 	# Install etc
-	mkdir -m $(DATA_MODE) -p $(PREFIX)/etc
+	mkdir -m $(DIR_MODE) -p $(PREFIX)/etc
 	install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/sgauth.conf
 
 uninstall: uninstall-bin uninstall-data
@@ -74,7 +71,7 @@ uninstall-bin:
 
 uninstall-data:
 	# Uninstall etc
-	rm -f $(PREFIX)/etc/stargazer/sgauth.conf
+	rm -f $(PREFIX)/etc/sgauth.conf
 
 
 ifneq ($(MAKECMDGOALS),distclean)
@@ -93,5 +90,3 @@ deps:	$(SRCS) ../../Makefile.conf sgauth.css
 	  echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
 	  echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
 	done
-
-