projects
/
srvx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix possible crash on user deletion
[srvx.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index cdf6ae818dce7a44319a9f3aca288ab297251157..4c20c6fb4844d8be78c27f028046f6c74af9fd0a 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-17,18
+17,23
@@
noinst_DATA = \
mod-memoserv.help \
mod-qserver.help \
mod-snoop.help \
mod-memoserv.help \
mod-qserver.help \
mod-snoop.help \
- mod-sockcheck.help
+ mod-sockcheck.help \
+ mod-hostserv.help
EXTRA_DIST = $(noinst_DATA)
EXTRA_DIST = $(noinst_DATA)
-if HAS_GIT
BUILT_SOURCES = git-version.c
.PHONY: checkversion
git-version.c: checkversion
BUILT_SOURCES = git-version.c
.PHONY: checkversion
git-version.c: checkversion
+
+if HAS_GIT
checkversion:
checkversion:
- @GIT_VERSION=`$(GIT)
describe
`; \
+ @GIT_VERSION=`$(GIT)
log -n 1 --pretty="format:%h"
`; \
[ "z$$GIT_VERSION" != "z" ] || exit 0; \
TMPFILE=`mktemp git-version.c.XXXXXX` || exit 1 ; \
[ "z$$GIT_VERSION" != "z" ] || exit 0; \
TMPFILE=`mktemp git-version.c.XXXXXX` || exit 1 ; \
- echo "const char git_version[] = \"$${GIT_VERSION}\";" >> $$TMPFILE ; \
+ GIT_LASTCOMMIT=$$GIT_VERSION; \
+ GIT_COMMITCOUNT=`$(GIT) rev-list --all | wc -l | sed "s/[ \t]//g"`; \
+ GIT_REVISION="git-$${GIT_COMMITCOUNT}-$${GIT_LASTCOMMIT}"; \
+ echo "const char git_version[] = \"$${GIT_REVISION}\";" >> $$TMPFILE ; \
if diff -q git-version.c $$TMPFILE >/dev/null 2>&1 ; then \
rm $$TMPFILE ; \
else \
if diff -q git-version.c $$TMPFILE >/dev/null 2>&1 ; then \
rm $$TMPFILE ; \
else \
@@
-36,6
+41,9
@@
checkversion:
rm -f git-version.c ; \
mv $$TMPFILE git-version.c ; \
fi
rm -f git-version.c ; \
mv $$TMPFILE git-version.c ; \
fi
+else
+checkversion:
+ echo "const char git_version[] = \"git-0-0\";" >> git-version.c ;
endif
EXTRA_srvx_SOURCES = \
endif
EXTRA_srvx_SOURCES = \
@@
-59,7
+67,8
@@
EXTRA_srvx_SOURCES = \
mod-memoserv.c \
mod-qserver.c \
mod-snoop.c \
mod-memoserv.c \
mod-qserver.c \
mod-snoop.c \
- mod-sockcheck.c
+ mod-sockcheck.c \
+ mod-hostserv.c
srvx_LDADD = @MODULE_OBJS@
srvx_DEPENDENCIES = @MODULE_OBJS@
srvx_SOURCES = \
srvx_LDADD = @MODULE_OBJS@
srvx_DEPENDENCIES = @MODULE_OBJS@
srvx_SOURCES = \