Remove .cvsignore files; replace with .gitignore as needed.

[srvx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8cdf7bb98c21ddaa2b198ec9cf032e6101d5d087..05cd2fd8be00a815afb7426cbea1d25f26edc68d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,32 +3,63 @@ LIBS = @LIBS@ @RX_LIBS@
 
 noinst_PROGRAMS = srvx
 EXTRA_PROGRAMS = checkdb globtest
-noinst_DATA = chanserv.help global.help modcmd.help nickserv.help opserv.help saxdb.help sendmail.help mod-sockcheck.help mod-helpserv.help mod-memoserv.help
+noinst_DATA = \
+       chanserv.help \
+       global.help \
+       modcmd.help \
+       nickserv.help \
+       opserv.help \
+       saxdb.help \
+       sendmail.help \
+       mod-helpserv.help \
+       mod-memoserv.help \
+       mod-sockcheck.help
 EXTRA_DIST = $(noinst_DATA)
-BUILT_SOURCES = arch-version.h
-noinst_HEADERS = arch-version.h
+BUILT_SOURCES = git-version.h
+noinst_HEADERS = git-version.h
 
-if HAS_GNU_ARCH
+if HAS_GIT
 .PHONY: checkversion
-arch-version.h: checkversion
+git-version.h: checkversion
 checkversion:
-       @$(GNU_ARCH) logs -f >/dev/null || exit 0; \
-       TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \
-       echo "#define ARCH_VERSION \"`$(GNU_ARCH) logs -f | tail -n 1`\"" >> $$TMPFILE ; \
-       if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \
+       @( cd $(top_srcdir) && $(GIT) symbolic-ref HEAD ) >/dev/null 2>&1 || exit 0; \
+       TMPFILE=`mktemp git-version.h.XXXXXX` || exit 1 ; \
+       ( \
+         cd $(top_srcdir) ; \
+         GIT_DIR=$${GIT_DIR:-.git} ; \
+         HEAD_NAME=`$(GIT) symbolic-ref HEAD` ; \
+         HEAD_SHA1=`cat $${GIT_DIR}/$${HEAD_NAME}` ; \
+         echo "/* Full revision $${HEAD_SHA1} */" ; \
+         echo "#define GIT_VERSION \"$${HEAD_SHA1%????????????????????????????????}\"" ; \
+       ) >> $$TMPFILE ; \
+       if diff -q git-version.h $$TMPFILE >/dev/null 2>&1 ; then \
            rm $$TMPFILE ; \
         else \
-           echo "Putting new arch version into arch-version.h" ; \
-           rm -f arch-version.h ; \
-           mv $$TMPFILE arch-version.h ; \
+           echo "Putting new git version into git-version.h" ; \
+           rm -f git-version.h ; \
+           mv $$TMPFILE git-version.h ; \
        fi
 endif
 
-EXTRA_srvx_SOURCES = alloc-slab.c alloc-srvx.c proto-bahamut.c proto-common.c proto-p10.c mod-snoop.c mod-memoserv.c mod-helpserv.c mod-sockcheck.c
+EXTRA_srvx_SOURCES = \
+       alloc-slab.c \
+       alloc-srvx.c \
+       config.h.win32 \
+       ioset-epoll.c \
+       ioset-select.c \
+       ioset-win32.c \
+       proto-bahamut.c \
+       proto-common.c \
+       proto-p10.c \
+       mod-snoop.c \
+       mod-memoserv.c \
+       mod-helpserv.c \
+       mod-qserver.c \
+       mod-sockcheck.c
 srvx_LDADD = @MODULE_OBJS@
 srvx_DEPENDENCIES = @MODULE_OBJS@
 srvx_SOURCES = \
-       arch-version.h \
+       git-version.h \
        chanserv.c chanserv.h \
        compat.c compat.h \
        conf.c conf.h \
@@ -40,7 +71,7 @@ srvx_SOURCES = \
        hash.c hash.h \
        heap.c heap.h \
        helpfile.c helpfile.h \
-       ioset.c ioset.h \
+       ioset.c ioset.h ioset-impl.h \
        log.c log.h \
        main.c common.h \
        md5.c md5.h \