Page MenuHomeClusterLabs Projects
Files F4525029

No OneTemporary
Actions

View Options

diff --git a/Makefile.am b/Makefile.am
index ba054065..53c9d268 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,194 +1,196 @@
#
# Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
#
# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
config.guess config.sub missing install-sh \
ltmain.sh compile config.h.in config.h.in~ \
autoscan.log configure.scan test-driver
+include $(top_srcdir)/build-aux/check.mk
+
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SPEC = $(PACKAGE_NAME).spec
DEBCHANGELOG = debian/changelog
DEBPOSTINST = debian/kronosnetd.postinst
TARGZFILE = $(PACKAGE_NAME)-$(VERSION).tar.gz
EXTRA_DIST = build-aux autogen.sh .version \
debian $(DEBCHANGELOG) $(DEBPOSTINST) \
$(SPEC) $(SPEC).in
SUBDIRS = init libtap common libknet kronosnetd
if BUILD_DOCS
SUBDIRS += docs
endif
dist_doc_DATA = \
COPYING.applications \
COPYING.libraries \
COPYRIGHT \
README.licence \
README \
TODO
all-local: $(SPEC) $(DEBCHANGELOG) $(DEBPOSTINST)
clean-local:
rm -f $(SPEC)
distclean-local:
rm -f $(PACKAGE_NAME)-*.tar.*
maintainer-clean-local:
make -f debian/rules clean || true
rm -rf m4 $(DEBCHANGELOG) $(DEBPOSTINST) debian/patches
## make rpm/srpm section.
$(SPEC): $(SPEC).in .version
rm -f $@-t $@
date="$(shell LC_ALL=C date "+%a %b %d %Y")" && \
if [ -f .tarball-version ]; then \
gitver="$(shell cat .tarball-version)" && \
rpmver=$$gitver && \
alphatag="" && \
dirty="" && \
numcomm="0"; \
else \
gitver="$(shell GIT_DIR=$(abs_srcdir)/.git git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
rpmver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
alphatag=`echo $$gitver | sed -e "s/.*-//" -e "s/^g//"` && \
vtag=`echo $$gitver | sed -e "s/-.*//g"` && \
numcomm=`GIT_DIR=$(abs_srcdir)/.git git rev-list $$vtag..HEAD | wc -l` && \
GIT_DIR=$(abs_srcdir)/.git git update-index --refresh > /dev/null 2>&1 || true && \
dirty=`GIT_DIR=$(abs_srcdir)/.git git diff-index --name-only HEAD 2>/dev/null`; \
fi && \
if [ -n "$$dirty" ]; then dirty="dirty"; else dirty=""; fi && \
if [ "$$numcomm" = "0" ]; then \
sed \
-e "s#@version@#$$rpmver#g" \
-e "s#%glo.*alpha.*##g" \
-e "s#%glo.*numcomm.*##g" \
-e "s#@dirty@#$$dirty#g" \
-e "s#@date@#$$date#g" \
$< > $@-t; \
else \
sed \
-e "s#@version@#$$rpmver#g" \
-e "s#@alphatag@#$$alphatag#g" \
-e "s#@numcomm@#$$numcomm#g" \
-e "s#@dirty@#$$dirty#g" \
-e "s#@date@#$$date#g" \
$< > $@-t; \
fi; \
if [ -z "$$dirty" ]; then sed -i -e "s#%glo.*dirty.*##g" $@-t; fi
sed -i -e "s#@defaultadmgroup@#$(DEFAULTADMGROUP)#g" $@-t
chmod a-w $@-t
mv $@-t $@
$(TARGZFILE):
$(MAKE) dist
RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
--define "_specdir $(abs_builddir)" \
--define "_builddir $(abs_builddir)" \
--define "_srcrpmdir $(abs_builddir)" \
--define "_rpmdir $(abs_builddir)"
srpm: clean
$(MAKE) $(SPEC) $(TARGZFILE)
rpmbuild $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
rpm: clean
$(MAKE) $(SPEC) $(TARGZFILE)
rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
## make deb
$(DEBPOSTINST): $(DEBPOSTINST).in config.h
mkdir -p debian
rm -f $@-t $@
sed -e "s#@defaultadmgroup@#$(DEFAULTADMGROUP)#g" $< > $@-t
chmod a-w $@-t
mv $@-t $@
$(DEBCHANGELOG): $(DEBCHANGELOG).in .version
mkdir -p debian
rm -f $@-t $@
date="$(shell LC_ALL=C date -R)" && \
if [ -f .tarball-version ]; then \
gitver="$(shell cat .tarball-version)" && \
debver=$$gitver && \
alphatag="" && \
dirty="" && \
numcomm="0"; \
else \
gitver="$(shell GIT_DIR=$(abs_srcdir)/.git git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
debver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
alphatag=`echo $$gitver | sed -e "s/.*-//" -e "s/^g//"` && \
vtag=`echo $$gitver | sed -e "s/-.*//g"` && \
numcomm=`GIT_DIR=$(abs_srcdir)/.git git rev-list $$vtag..HEAD | wc -l` && \
GIT_DIR=$(abs_srcdir)/.git git update-index --refresh > /dev/null 2>&1 || true && \
dirty=`GIT_DIR=$(abs_srcdir)/.git git diff-index --name-only HEAD 2>/dev/null`; \
fi && \
if [ -n "$$dirty" ]; then dirty="-dirty"; else dirty=""; fi && \
if [ "$$numcomm" = "0" ]; then \
sed \
-e "s#@version@#$$debver#g" \
-e "s#-@alphatag@##g" \
-e "s#.@numcomm@##g" \
-e "s#@dirty@#$$dirty#g" \
-e "s#@date@#$$date#g" \
$< > $@-t; \
else \
sed \
-e "s#@version@#$$debver#g" \
-e "s#@alphatag@#$$alphatag#g" \
-e "s#@numcomm@#$$numcomm#g" \
-e "s#@dirty@#$$dirty#g" \
-e "s#@date@#$$date#g" \
$< > $@-t; \
fi;
chmod a-w $@-t
mv $@-t $@
deb-clean:
make -f debian/rules clean
./configure
debs: deb-clean dist
if [ -f .tarball-version ]; then \
gitver="$(shell cat .tarball-version)"; \
else \
gitver="$(shell git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
gitver=`echo $$gitver | sed -e "s/^v//" -e "s/-g/-/" -e "s/-/./"`; \
fi && \
cp $(TARGZFILE) ../$(PACKAGE_NAME)_$$gitver.orig.tar.gz
dpkg-buildpackage -uc -us
# release/versioning
BUILT_SOURCES = .version
.version:
echo $(VERSION) > $@-t && mv $@-t $@
dist-hook: gen-ChangeLog
echo $(VERSION) > $(distdir)/.tarball-version
gen_start_date = 2000-01-01
.PHONY: gen-ChangeLog
gen-ChangeLog:
if test -d .git; then \
LC_ALL=C $(top_srcdir)/build-aux/gitlog-to-changelog \
--since=$(gen_start_date) > $(distdir)/cl-t; \
rm -f $(distdir)/ChangeLog; \
mv $(distdir)/cl-t $(distdir)/ChangeLog; \
fi
diff --git a/init/Makefile.am b/init/Makefile.am
index 9bcb7d5c..cc48d9b8 100644
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -1,41 +1,43 @@
#
# Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
#
# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/build-aux/check.mk
+
EXTRA_DIST = kronosnetd.in kronosnetd.service.in \
kronosnetd.default
systemdconfdir = $(SYSTEMDDIR)
systemdconf_DATA = kronosnetd.service
initscriptdir = $(INITDDIR)
initscript_SCRIPTS = kronosnetd
%: %.in Makefile
rm -f $@-t $@
cat $< | sed \
-e 's#@''SBINDIR@#$(sbindir)#g' \
-e 's#@''SYSCONFDIR@#$(sysconfdir)#g' \
-e 's#@''INITDDIR@#$(INITDDIR)#g' \
-e 's#@''LOCALSTATEDIR@#$(localstatedir)#g' \
> $@-t
mv $@-t $@
install-exec-local:
$(INSTALL) -d $(DESTDIR)/$(INITDEFAULTDIR)
$(INSTALL) -m 644 $(srcdir)/kronosnetd.default $(DESTDIR)/$(INITDEFAULTDIR)/kronosnetd
uninstall-local:
rm -f $(DESTDIR)/$(INITDEFAULTDIR)/kronosnetd
rmdir $(DESTDIR)/$(INITDEFAULTDIR) || :;
all-local: $(initscript_SCRIPTS) $(systemdconf_DATA)
clean-local:
rm -rf $(initscript_SCRIPTS) $(systemdconf_DATA)
diff --git a/kronosnetd/Makefile.am b/kronosnetd/Makefile.am
index ce513e0f..fae66925 100644
--- a/kronosnetd/Makefile.am
+++ b/kronosnetd/Makefile.am
@@ -1,86 +1,88 @@
#
# Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
#
# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in kronostnetd.logrotate
+include $(top_srcdir)/build-aux/check.mk
+
EXTRA_DIST = kronosnetd.logrotate.in
noinst_HEADERS = \
cfg.h \
etherfilter.h \
logging.h \
vty.h \
vty_auth.h \
vty_cli.h \
vty_cli_cmds.h \
vty_utils.h
sbin_PROGRAMS = kronosnetd \
knet-keygen
kronosnetd_SOURCES = \
cfg.c \
etherfilter.c \
main.c \
logging.c \
../common/netutils.c \
vty.c \
vty_auth.c \
vty_cli.c \
vty_cli_cmds.c \
vty_utils.c
kronosnetd_CPPFLAGS = \
-I$(top_srcdir)/libtap \
-I$(top_srcdir)/libknet \
-I$(top_srcdir)/common
kronosnetd_CFLAGS = $(libqb_CFLAGS)
kronosnetd_LDADD = \
$(top_builddir)/libknet/libknet.la \
$(top_builddir)/libtap/libtap.la \
$(libqb_LIBS)
knet_keygen_SOURCES = keygen.c
knet_keygen_CPPFLAGS = -I$(top_srcdir)/libknet
dist_man_MANS = kronosnetd.8 knet-keygen.8
install-exec-local:
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/down.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/post-down.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/pre-up.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/up.d
$(INSTALL) -d $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/cryptokeys.d
$(INSTALL) -d -m 0755 $(DESTDIR)/$(sysconfdir)/logrotate.d
$(INSTALL) -m 644 kronosnetd.logrotate $(DESTDIR)/$(sysconfdir)/logrotate.d/kronosnetd
$(INSTALL) -d -m 0755 $(DESTDIR)/$(sysconfdir)/pam.d
if [ -a $(sysconfdir)/pam.d/password-auth ]; then \
cd $(DESTDIR)/$(sysconfdir)/pam.d && \
rm -f kronosnetd && \
$(LN_S) password-auth kronosnetd; \
else \
cd $(DESTDIR)/$(sysconfdir)/pam.d && \
rm -f kronosnetd && \
$(LN_S) passwd kronosnetd; \
fi
uninstall-local:
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/cryptokeys.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/down.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/post-down.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/pre-up.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR)/up.d || :;
rmdir $(DESTDIR)/$(DEFAULT_CONFIG_DIR) || :;
rm -f $(DESTDIR)/$(sysconfdir)/logrotate.d/kronosnetd
rmdir $(DESTDIR)/$(sysconfdir)/logrotate.d || :;
rm -f $(DESTDIR)/$(sysconfdir)/pam.d/kronosnetd || :;
rmdir $(DESTDIR)/$(sysconfdir)/pam.d || :;
diff --git a/libknet/Makefile.am b/libknet/Makefile.am
index 863499dc..9381a0a1 100644
--- a/libknet/Makefile.am
+++ b/libknet/Makefile.am
@@ -1,65 +1,67 @@
#
# Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
#
# Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
# Federico Simoncelli <fsimon@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/build-aux/check.mk
+
EXTRA_DIST = libknet.versions
SUBDIRS = . tests
libversion = 0:0:0
sources = \
common.c \
crypto.c \
handle.c \
host.c \
listener.c \
link.c \
logging.c \
nsscrypto.c \
threads_common.c \
threads_dsthandler.c \
threads_heartbeat.c \
threads_pmtud.c \
threads_send_recv.c
include_HEADERS = libknet.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libknet.pc
noinst_HEADERS = \
common.h \
crypto.h \
host.h \
internals.h \
link.h \
listener.h \
logging.h \
nsscrypto.h \
onwire.h \
threads_common.h \
threads_dsthandler.h \
threads_heartbeat.h \
threads_pmtud.h \
threads_send_recv.h
lib_LTLIBRARIES = libknet.la
libknet_la_SOURCES = $(sources)
libknet_la_CFLAGS = $(nss_CFLAGS)
EXTRA_libknet_la_DEPENDENCIES = libknet.versions
libknet_la_LIBS = -version-info $(libversion)
libknet_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libknet.versions
libknet_la_LIBADD = $(nss_LIBS) -lrt -lpthread -lm
diff --git a/libtap/Makefile.am b/libtap/Makefile.am
index 04a59292..978432e5 100644
--- a/libtap/Makefile.am
+++ b/libtap/Makefile.am
@@ -1,45 +1,45 @@
#
# Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
#
# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = libtap_exported_sym tap_updown_bad tap_updown_good
-
include $(top_srcdir)/build-aux/check.mk
+EXTRA_DIST = libtap_exported_sym tap_updown_bad tap_updown_good
+
sources = libtap.c
libversion = 0:0:0
# override global LIBS that pulls in lots of craft we don't need here
LIBS = -lpthread
include_HEADERS = libtap.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libtap.pc
lib_LTLIBRARIES = libtap.la
libtap_la_SOURCES = $(sources)
libtap_la_LDFLAGS = -Wl,-version-script,$(srcdir)/libtap_exported_sym \
--export-dynamic \
-version-number $(libversion)
TESTS = $(check_PROGRAMS)
noinst_PROGRAMS = $(check_PROGRAMS)
check_PROGRAMS = tap_test
tap_test_SOURCES = $(sources)
tap_test_CPPFLAGS = -DTEST \
-DABSBUILDDIR=\"$(abs_builddir)\"

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 26, 5:24 PM (16 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1959242
Default Alt Text
(12 KB)

Event Timeline