Produce debug output only if SMUX_DEBUG is defined

[stg.git] / projects / sgauth / Makefile

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index 7f597b95936022be55d92f0ae8ea74688d0f0512..cf2e2c5339bf7176b95287ed4adf7a5bd6cc1972 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -7,13 +7,13 @@ include ../../Makefile.conf
 PROG = sgauth
 
 SRCS = ./main.cpp \
 PROG = sgauth
 
 SRCS = ./main.cpp \

+       ./settings_impl.cpp \

        ./web.cpp
 
        ./web.cpp
 

-STGLIBS =  -lconffiles \
-           -lstg_crypto \
-           -lstg_common \
-           -lia_auth_c \
-           -lcommon_settings
+STGLIBS =  -lstgconffiles \
+           -lstgia \
+           -lstgcrypto \
+           -lstgcommon

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


@@ -30,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)
 
 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
 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf


@@ -39,7 +39,7 @@ libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 $(PROG): $(OBJS) $(STGLIBS) 
        $(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
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS


@@ -56,13 +56,12 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
 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
        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
        install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/sgauth.conf
 
 uninstall: uninstall-bin uninstall-data


@@ -72,7 +71,7 @@ uninstall-bin:
 
 uninstall-data:
        # Uninstall etc
 
 uninstall-data:
        # Uninstall etc

-       rm -f $(PREFIX)/etc/stargazer/sgauth.conf
+       rm -f $(PREFIX)/etc/sgauth.conf

 
 
 ifneq ($(MAKECMDGOALS),distclean)
 
 
 ifneq ($(MAKECMDGOALS),distclean)