stg-2.409 pre-merge.

[stg.git] / projects / sgauth / Makefile

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index f5988e230773c287feb3d3275e0d65e0bc58d006..d6c844e0d9e55b3d4410fa4ac0218a1a8aff3f18 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -18,12 +18,12 @@ STGLIBS =  conffiles \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
 
-ifneq ($(OS),linux)
+ifeq ($(OS),linux)
+else
 LIBS += -lintl \
-        -lc \
-       -liconv
+        -lc
 endif
 
 SEARCH_DIRS = -I ../../include
@@ -32,7 +32,7 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
 
 CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
 CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
-LDFLAGS += -Wl,-E $(STGLIBS_LIBS)
+LDFLAGS += $(STGLIBS_LIBS)
 
 .PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
 all: libs $(PROG) ../../Makefile.conf
@@ -58,7 +58,13 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
+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)
+endif
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
@@ -87,8 +93,15 @@ endif
 deps:  $(SRCS) ../../Makefile.conf sgauth.css
        $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
-       ./make_css.sh
+       ./make_css.sh ;\
        for file in $(SRCS); do\
-         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
-         echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> 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