git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix passing params to OnDisconnect in rscriptd.
[stg.git]
/
projects
/
sgauthstress
/
Makefile
diff --git
a/projects/sgauthstress/Makefile
b/projects/sgauthstress/Makefile
index a90e9b6da34173300e2f5b67e70cb656c2d4063a..74c09b62a08b711bde41f022edb24e9f13582fd8 100644
(file)
--- a/
projects/sgauthstress/Makefile
+++ b/
projects/sgauthstress/Makefile
@@
-2,16
+2,20
@@
include ../../Makefile.conf
PROG = sgauthstress
PROG = sgauthstress
-SRCS = ./main.cpp \
- ./settings.cpp \
- ./store_loader.cpp
+SRCS = main.cpp \
+ settings.cpp \
+ store_loader.cpp \
+ user.cpp \
+ proto.cpp
-STGLIBS = -lstgcrypto \
- -lstgcommon \
- -ldotconfpp \
- -lstgia
+STGLIBS = dotconfpp \
+ crypto \
+ common
-LIBS += $(LIB_THREAD)
+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)
LIBS += -ldl
ifeq ($(OS),linux)
LIBS += -ldl
@@
-20,14
+24,13
@@
LIBS += -lintl \
-lc
endif
-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 += -Wl,-E $(STGLIBS_LIBS)
.PHONY: all clean distclean libs plugins
all: libs plugins $(PROG) ../../Makefile.conf
.PHONY: all clean distclean libs plugins
all: libs plugins $(PROG) ../../Makefile.conf
@@
-35,11
+38,11
@@
all: libs plugins $(PROG) ../../Makefile.conf
libs:
$(MAKE) -C $(DIR_LIBSRC)
libs:
$(MAKE) -C $(DIR_LIBSRC)
-plugins: libs
+plugins: libs
$(MAKE) -C $(DIR_PLUGINS)
$(MAKE) -C $(DIR_PLUGINS)
-$(PROG): $(OBJS)
libs
- $(CXX) $
(OBJS) $(LDFLAGS) $(LIBS) $(STG
LIBS) -o $(PROG)
+$(PROG): $(OBJS)
+ $(CXX) $
^ $(LDFLAGS) $(
LIBS) -o $(PROG)
clean:
rm -f deps $(PROG) *.o *.*~
clean:
rm -f deps $(PROG) *.o *.*~
@@
-58,9
+61,16
@@
endif
endif
deps: $(SRCS) ../../Makefile.conf
endif
deps: $(SRCS) ../../Makefile.conf
- $(MAKE) -C $(DIR_LIBSRC)
includes
+ $(MAKE) -C $(DIR_LIBSRC)
@>deps ;\
for file in $(SRCS); do\
@>deps ;\
for file in $(SRCS); do\
- echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile ../../Makefile.conf" >> 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