Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / sgauth / Makefile

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index 47488cc2c94421e1fd120e21bc00573902443500..d6c844e0d9e55b3d4410fa4ac0218a1a8aff3f18 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -7,32 +7,32 @@ 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 =  conffiles \
+           ia \
+           crypto \
+           common

 
 

-LIBS += $(LIB_THREAD) \
-       -lexpat
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)

 
 ifeq ($(OS),linux)
 
 ifeq ($(OS),linux)

-LIBS += -ldl

 else
 LIBS += -lintl \
         -lc
 endif
 
 else
 LIBS += -lintl \
         -lc
 endif
 

-SEARCH_DIRS = -I $(DIR_INCLUDE)
+SEARCH_DIRS = -I ../../include

 
 OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 
 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)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += $(STGLIBS_LIBS)

 
 .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


@@ -40,8 +40,8 @@ all: libs $(PROG) ../../Makefile.conf
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 
 libs:
        $(MAKE) -C $(DIR_LIBSRC)
 

-$(PROG): $(OBJS) $(STGLIBS) 
-       $(CC) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
+$(PROG): $(OBJS)
+       $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)

 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS
 
 clean:
        rm -f deps $(PROG) *.o tags *.*~ .OS


@@ -58,13 +58,18 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
 install: install-bin install-data
 
 install-bin:

-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin
+ifeq ($(DEBUG), yes)
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+       install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+else
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin

        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)

+endif

        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        # Install etc
        $(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


@@ -74,7 +79,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)


@@ -86,12 +91,17 @@ endif
 endif
 
 deps:  $(SRCS) ../../Makefile.conf sgauth.css
 endif
 
 deps:  $(SRCS) ../../Makefile.conf sgauth.css

-       $(MAKE) -C $(DIR_LIBSRC) includes
+       $(MAKE) -C $(DIR_LIBSRC)

        @>deps ;\
        @>deps ;\

-       ./make_css.sh
+       ./make_css.sh ;\

        for file in $(SRCS); do\
        for file in $(SRCS); do\

-         echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
+         echo "$$file" | grep ".c$$" > /dev/null;\
+         if [ $$? -eq 0 ];\
+         then\
+           echo "`$(CC) $(CFLAGS) -MM $$file` Makefile" >> deps ;\
+           printf '%b\n' '\t$$(CC) $(CFLAGS) -c $$<' >> deps ;\
+         else\
+           echo "`$(CXX) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+           printf '%b\n' '\t$$(CXX) $(CXXFLAGS) -c $$<' >> deps ;\
+         fi;\

        done
        done

-
-