Ticket 37. The timeout variable added, if(stgTime > timeout && timeout

[stg.git] / projects / sgauthstress / Makefile

diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile
index 174c31a2376bd318c12bb9a39725cee4faa9d8ec..74c09b62a08b711bde41f022edb24e9f13582fd8 100644 (file)
--- a/projects/sgauthstress/Makefile
+++ b/projects/sgauthstress/Makefile
@@ -8,22 +8,20 @@ SRCS = main.cpp \
        user.cpp \
        proto.cpp
 
        user.cpp \
        proto.cpp
 

-STGLIBS = crypto \
-          common \
-          dotconfpp \
-         locker
+STGLIBS = dotconfpp \
+          crypto \
+          common

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

-LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)

 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \
 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \

-        -lc \
-       -liconv
+        -lc

 endif
 
 SEARCH_DIRS = -I ../../include
 endif
 
 SEARCH_DIRS = -I ../../include


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

-plugins: libs 
+plugins: libs

        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS)
        $(MAKE) -C $(DIR_PLUGINS)
 
 $(PROG): $(OBJS)


@@ -66,6 +64,13 @@ deps:        $(SRCS) ../../Makefile.conf
        $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\
        $(MAKE) -C $(DIR_LIBSRC)
        @>deps ;\
        for file in $(SRCS); do\

-         echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile ../../Makefile.conf" >> 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
        done