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 'stg-2.409' into stg-2.409-radius
[stg.git]
/
projects
/
sgauth
/
Makefile
diff --git
a/projects/sgauth/Makefile
b/projects/sgauth/Makefile
index cf2e2c5339bf7176b95287ed4adf7a5bd6cc1972..d6c844e0d9e55b3d4410fa4ac0218a1a8aff3f18 100644
(file)
--- a/
projects/sgauth/Makefile
+++ b/
projects/sgauth/Makefile
@@
-10,12
+10,15
@@
SRCS = ./main.cpp \
./settings_impl.cpp \
./web.cpp
./settings_impl.cpp \
./web.cpp
-STGLIBS =
-lstg
conffiles \
-
-lstg
ia \
-
-lstg
crypto \
-
-lstg
common
+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)))
+
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
ifeq ($(OS),linux)
else
ifeq ($(OS),linux)
else
@@
-23,14
+26,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 %.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,13
@@
distclean: clean
install: install-bin install-data
install-bin:
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)
install -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
+91,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