git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into full-month-stats
[stg.git]
/
projects
/
sgauth
/
Makefile
diff --git
a/projects/sgauth/Makefile
b/projects/sgauth/Makefile
index 12c7b9fc69744df74109f7599f457b6c15d98fe0..5565199b95b98e6acd4df37765d97aec1c77cd5d 100644
(file)
--- a/
projects/sgauth/Makefile
+++ b/
projects/sgauth/Makefile
@@
-7,30
+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)
+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 %.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 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,8
+40,8
@@
all: libs $(PROG) ../../Makefile.conf
libs:
$(MAKE) -C $(DIR_LIBSRC)
libs:
$(MAKE) -C $(DIR_LIBSRC)
-$(PROG): $(OBJS)
$(STGLIBS)
- $(C
C
) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
+$(PROG): $(OBJS)
+ $(C
XX
) $^ $(LDFLAGS) -o $(PROG) $(LIBS)
clean:
rm -f deps $(PROG) *.o tags *.*~ .OS
clean:
rm -f deps $(PROG) *.o tags *.*~ .OS
@@
-83,10
+85,10
@@
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 ;\
./make_css.sh
for file in $(SRCS); do\
@>deps ;\
./make_css.sh
for file in $(SRCS); do\
- echo "`$(CC) $(CXXFLAGS)
$(SEARCH_DIRS)
-MM $$file` Makefile" >> deps ;\
-
echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEF
S)' >> deps ;\
+ echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+
printf '%b\n' '\t$$(CC) -c $$< $(CXXFLAG
S)' >> deps ;\
done
done