Ticket 12. The if() construction for StopOnError parameter added in the

[stg.git] / projects / sgauth / Makefile

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index cf2e2c5339bf7176b95287ed4adf7a5bd6cc1972..ef6491194847a7486ceb072b17c7e715bf702ff3 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -10,27 +10,29 @@ SRCS = ./main.cpp \
        ./settings_impl.cpp \
        ./web.cpp
 
        ./settings_impl.cpp \
        ./web.cpp
 

-STGLIBS =  -lstgconffiles \
-           -lstgia \
-           -lstgcrypto \
-           -lstgcommon
+STGLIBS =  conffiles \
+           ia \
+           crypto \
+           common

 
 

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

 
 

-ifeq ($(OS),linux)
-else
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+
+ifneq ($(OS),linux)

 LIBS += -lintl \
 LIBS += -lintl \

-        -lc
+        -lc \
+       -liconv

 endif
 
 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 %.a $(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


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

-$(PROG): $(OBJS) $(STGLIBS) 
+$(PROG): $(OBJS)

        $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:
        $(CXX) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
 
 clean:


@@ -56,7 +58,11 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
 install: install-bin install-data
 
 install-bin:

-       install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+ifeq ($(DEBUG), yes)
+       install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+else
+       install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+endif

        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:


@@ -83,10 +89,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