# Version: $Id$
#
+$(if $(wildcard Make.inc),,$(error Missing 'Make.inc' Run './configure [options]' and retry))
+
include Make.inc
-.PHONY: all clean install
+MFLAGS += --no-print-directory
+
+# The version of GNU Make is too old, don't use it (.FEATURES variable was
+# wad added in 3.81)
+ifndef .FEATURES
+$(error The build system requires GNU Make 3.81 or later.)
+endif
-SUBDIRS = $(LTDL_SUBDIRS) src raddb scripts doc
-WHAT_TO_MAKE = all
+export DESTDIR := $(R)
-all:
- @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+# And over-ride all of the other magic.
+include scripts/boiler.mk
-clean:
- @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- @rm -f *~
+#
+# To work around OpenSSL issues with travis.
+#
+.PHONY:
+raddb/test.conf:
+ @echo 'security {' >> $@
+ @echo ' allow_vulnerable_openssl = yes' >> $@
+ @echo '}' >> $@
+ @echo '$$INCLUDE radiusd.conf' >> $@
-.PHONY: tests
-tests:
+#
+# Run "radiusd -C", looking for errors.
+#
+# Only redirect STDOUT, which should contain details of why the test failed.
+# Don't molest STDERR as this may be used to receive output from a debugger.
+$(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd | build.raddb
+ @$(MAKE) -C raddb/certs
+ @printf "radiusd -C... "
+ @if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -D ./share -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
+ @rm -f raddb/test.conf; \
+ cat $(BUILD_DIR)/tests/radiusd.config.log; \
+ echo "fail"; \
+ exit 1; \
+ fi
+ @rm -f raddb/test.conf
+ @echo "ok"
+ @touch $@
+
+test: ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.keywords $(BUILD_DIR)/tests/radiusd-c | build.raddb
@$(MAKE) -C src/tests tests
+# Tests specifically for Travis. We do a LOT more than just
+# the above tests
+ifneq "$(findstring travis,${prefix})" ""
+travis-test: raddb/test.conf test
+ @./build/make/jlibtool --mode=execute ./build/bin/radiusd -xxxv -n test
+ @rm -f raddb/test.conf
+ @$(MAKE) install
+ @perl -p -i -e 's/allow_vulnerable_openssl = no/allow_vulnerable_openssl = yes/' ${raddbdir}/radiusd.conf
+ @${sbindir}/radiusd -XC
+ @$(MAKE) deb
+endif
+
#
# The $(R) is a magic variable not defined anywhere in this source.
# It's purpose is to allow an admin to create an installation 'tar'
# we make sure DESTDIR is defined.
#
export DESTDIR := $(R)
-install:
- $(INSTALL) -d -m 755 $(R)$(sbindir)
- $(INSTALL) -d -m 755 $(R)$(bindir)
- $(INSTALL) -d -m 755 $(R)$(raddbdir)
- $(INSTALL) -d -m 755 $(R)$(mandir)
- $(INSTALL) -d -m 755 $(R)$(RUNDIR)
- $(INSTALL) -d -m 700 $(R)$(logdir)
- $(INSTALL) -d -m 700 $(R)$(radacctdir)
- $(INSTALL) -d -m 755 $(R)$(datadir)
- $(INSTALL) -d -m 755 $(R)$(dictdir)
- for i in 1 5 8; do \
- $(INSTALL) -d -m 755 $(R)$(mandir)/man$$i; \
- for p in man/man$$i/*.$$i; do \
- $(INSTALL) -m 644 $$p $(R)$(mandir)/man$$i; \
- done \
- done
- @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- @echo "Installing dictionary files in $(R)$(dictdir)"; \
- cd share; \
- for i in dictionary*; do \
- $(INSTALL) -m 644 $$i $(R)$(dictdir); \
- done
- $(LIBTOOL) --finish $(R)$(libdir)
-
-common:
- @for dir in $(SUBDIRS); do \
- echo "Making $(WHAT_TO_MAKE) in $$dir..."; \
- $(MAKE) $(MFLAGS) -C $$dir $(WHAT_TO_MAKE) || exit $$?; \
- done
+
+.PHONY: install.bindir
+install.bindir:
+ @[ -d $(R)$(bindir) ] || $(INSTALL) -d -m 755 $(R)$(bindir)
+
+.PHONY: install.sbindir
+install.sbindir:
+ @[ -d $(R)$(sbindir) ] || $(INSTALL) -d -m 755 $(R)$(sbindir)
+
+.PHONY: install.dirs
+install.dirs: install.bindir install.sbindir
+ @$(INSTALL) -d -m 755 $(R)$(mandir)
+ @$(INSTALL) -d -m 755 $(R)$(RUNDIR)
+ @$(INSTALL) -d -m 700 $(R)$(logdir)
+ @$(INSTALL) -d -m 700 $(R)$(radacctdir)
+ @$(INSTALL) -d -m 755 $(R)$(datadir)
+ @$(INSTALL) -d -m 755 $(R)$(dictdir)
+
+DICTIONARIES := $(wildcard share/dictionary*)
+install.share: $(addprefix $(R)$(dictdir)/,$(notdir $(DICTIONARIES)))
+
+$(R)$(dictdir)/%: share/%
+ @echo INSTALL $(notdir $<)
+ @$(INSTALL) -m 644 $< $@
+
+MANFILES := $(wildcard man/man*/*.?)
+install.man: $(subst man/,$(R)$(mandir)/,$(MANFILES))
+
+$(R)$(mandir)/%: man/%
+ @echo INSTALL $(notdir $<)
+ @$(INSTALL) -m 644 $< $@
+
+install: install.dirs install.share install.man
+
+ifneq ($(RADMIN),)
+ifneq ($(RGROUP),)
+.PHONY: install-chown
+install-chown:
+ chown -R $(RADMIN) $(R)$(raddbdir)
+ chgrp -R $(RGROUP) $(R)$(raddbdir)
+ chmod u=rwx,g=rx,o= `find $(R)$(raddbdir) -type d -print`
+ chmod u=rw,g=r,o= `find $(R)$(raddbdir) -type f -print`
+ chown -R $(RADMIN) $(R)$(logdir)
+ chgrp -R $(RGROUP) $(R)$(logdir)
+ find $(R)$(logdir) -type d -exec chmod u=rwx,g=rwx,o= {} \;
+ find $(R)$(logdir) -type d -exec chmod g+s {} \;
+ find $(R)$(logdir) -type f -exec chmod u=rw,g=rw,o= {} \;
+ chown -R $(RADMIN) $(R)$(RUNDIR)
+ chgrp -R $(RGROUP) $(R)$(RUNDIR)
+ find $(R)$(RUNDIR) -type d -exec chmod u=rwx,g=rwx,o= {} \;
+ find $(R)$(RUNDIR) -type d -exec chmod g+s {} \;
+ find $(R)$(RUNDIR) -type f -exec chmod u=rw,g=rw,o= {} \;
+endif
+endif
distclean: clean
- rm -f config.cache config.log config.status libtool \
+ @-find src/modules -regex .\*/config[.][^.]*\$$ -delete
+ @-find src/modules -name autom4te.cache -exec rm -rf '{}' \;
+ @rm -rf config.cache config.log config.status libtool \
src/include/radpaths.h src/include/stamp-h \
libltdl/config.log libltdl/config.status \
- libltdl/libtool
- -find . ! -name configure.in -name \*.in -print | \
+ libltdl/libtool autom4te.cache build
+ @-find . ! -name configure.ac -name \*.in -print | \
sed 's/\.in$$//' | \
while read file; do rm -f $$file; done
- -find src/modules -name config.mak | \
- while read file; do rm -f $$file; done
- -find src/modules -name config.h | \
- while read file; do rm -f $$file; done
######################################################################
#
# Automatic remaking rules suggested by info:autoconf#Automatic_Remaking
#
######################################################################
-reconfig: configure src/include/autoconf.h.in
+#
+# Do these checks ONLY if we're re-building the "configure"
+# scripts, and ONLY the "configure" scripts. If we leave
+# these rules enabled by default, then they're run too often.
+#
+ifeq "$(MAKECMDGOALS)" "reconfig"
+
+CONFIGURE_AC_FILES := $(shell find . -name configure.ac -print)
+CONFIGURE_FILES := $(patsubst %.ac,%,$(CONFIGURE_AC_FILES))
+
+#
+# The GNU tools make autoconf=="missing autoconf", which then returns
+# 0, even when autoconf doesn't exist. This check is to ensure that
+# we run AUTOCONF only when it exists.
+#
+AUTOCONF_EXISTS := $(shell autoconf --version 2>/dev/null)
+
+ifeq "$(AUTOCONF_EXISTS)" ""
+$(error You need to install autoconf to re-build the "configure" scripts)
+endif
-configure: configure.in aclocal.m4
- $(AUTOCONF)
+# Configure files depend on "in" files, and on the top-level macro files
+# If there are headers, run auto-header, too.
+src/%configure: src/%configure.ac acinclude.m4 aclocal.m4 $(wildcard $(dir $@)m4/*m4) | src/freeradius-devel
+ @echo AUTOCONF $(dir $@)
+ cd $(dir $@) && $(AUTOCONF) -I $(top_builddir) -I $(top_builddir)/m4 -I $(top_builddir)/$(dir $@)m4
+ @if grep AC_CONFIG_HEADERS $@ >/dev/null; then\
+ echo AUTOHEADER $@ \
+ cd $(dir $@) && $(AUTOHEADER); \
+ fi
-# autoheader might not change autoconf.h.in, so touch a stamp file
-src/include/autoconf.h.in: src/include/stamp-h.in
-src/include/stamp-h.in: configure.in
- $(AUTOHEADER)
- echo timestamp > src/include/stamp-h.in
+# "%configure" doesn't match "configure"
+configure: configure.ac $(wildcard ac*.m4) $(wildcard m4/*.m4)
+ @echo AUTOCONF $@
+ @$(AUTOCONF)
-src/include/autoconf.h: src/include/stamp-h
-src/include/stamp-h: src/include/autoconf.h.in config.status
- ./config.status
+src/include/autoconf.h.in: configure.ac
+ @echo AUTOHEADER $@
+ @$(AUTOHEADER)
+
+reconfig: $(CONFIGURE_FILES) src/include/autoconf.h.in
config.status: configure
./config.status --recheck
-configure.in:
+# target is "configure"
+endif
+
+# If we've already run configure, then add rules which cause the
+# module-specific "all.mk" files to depend on the mk.in files, and on
+# the configure script.
+#
+ifneq "$(wildcard config.log)" ""
+CONFIGURE_ARGS := $(shell head -10 config.log | grep '^ \$$' | sed 's/^....//;s:.*configure ::')
+
+src/%all.mk: src/%all.mk.in src/%configure
+ @echo CONFIGURE $(dir $@)
+ @rm -f ./config.cache $(dir $<)/config.cache
+ @cd $(dir $<) && ./configure $(CONFIGURE_ARGS)
+endif
.PHONY: check-includes
check-includes:
scripts/min-includes.pl `find . -name "*.c" -print`
+.PHONY: TAGS
TAGS:
- etags `find src -type f -name '*.[ch]' -print`
+ etags `find src -type f -name '*.[ch]' -print` > $@
+
+#
+# Make test certificates.
+#
+.PHONY: certs
+certs:
+ @$(MAKE) -C raddb/certs
######################################################################
#
# BEFORE running this command!
#
######################################################################
-freeradius-server-$(RADIUSD_VERSION): CVS
- @CVSROOT=`cat CVS/Root`; \
- cvs -d $$CVSROOT checkout -P -d freeradius-server-$(RADIUSD_VERSION) radiusd
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz: .git
+ git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v3.0.x | gzip > $@
-freeradius-server-$(RADIUSD_VERSION).tar.gz: freeradius-server-$(RADIUSD_VERSION)
- @tar --exclude=CVS -zcf $@ $<
-
-freeradius-server-$(RADIUSD_VERSION).tar.gz.sig: freeradius-server-$(RADIUSD_VERSION).tar.gz
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz
gpg --default-key aland@freeradius.org -b $<
-freeradius-server-$(RADIUSD_VERSION).tar.bz2: freeradius-server-$(RADIUSD_VERSION)
- @tar --exclude=CVS -jcf $@ $<
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2: .git
+ git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v3.0.x | bzip2 > $@
-freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION).tar.bz2
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
gpg --default-key aland@freeradius.org -b $<
# high-level targets
.PHONY: dist-check
dist-check: redhat/freeradius.spec suse/freeradius.spec debian/changelog
- @if [ `grep ^Version: redhat/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+ @if [ `grep ^Version: redhat/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION_STRING)" ]; then \
+ cat redhat/freeradius.spec | sed 's/^Version: .*/Version: $(RADIUSD_VERSION_STRING)/' > redhat/.foo; \
+ mv redhat/.foo redhat/freeradius.spec; \
echo redhat/freeradius.spec 'Version' needs to be updated; \
exit 1; \
fi
- @if [ `grep ^Version: suse/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+ @if [ `grep ^Version: suse/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION_STRING)" ]; then \
+ cat suse/freeradius.spec | sed 's/^Version: .*/Version: $(RADIUSD_VERSION_STRING)/' > suse/.foo; \
+ mv suse/.foo suse/freeradius.spec; \
echo suse/freeradius.spec 'Version' needs to be updated; \
exit 1; \
fi
- @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/-0).*//;s/-1).*//;'` != "$(RADIUSD_VERSION)" ]; then \
+ @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/-0).*//;s/-1).*//;s/\+.*//'` != "$(RADIUSD_VERSION_STRING)" ]; then \
echo debian/changelog needs to be updated; \
exit 1; \
fi
-dist: dist-check freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.bz2
+dist: dist-check freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
-dist-sign: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
+dist-sign: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig
-dist-publish: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2 freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
- scp $^ freeradius.org@freeradius.org:public_ftp
+dist-publish: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2 freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig
+ scp $^ freeradius.org@ftp.freeradius.org:public_ftp
#
# Note that we do NOT do the tagging here! We just print out what
# to do!
#
-dist-tag: freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.bz2
- @echo "cd freeradius-server-$(RADIUSD_VERSION) && cvs tag release_`echo $(RADIUSD_VERSION) | tr .- __` && cd .."
+dist-tag: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
+ @echo "git tag release_`echo $(RADIUSD_VERSION_STRING) | tr .- __`"
#
# Build a debian package
.PHONY: deb
deb:
fakeroot dpkg-buildpackage -b -uc
+
+# Developer checks
+.PHONY: warnings
+warnings:
+ @(make clean all 2>&1) | egrep -v '^/|deprecated|^In file included|: In function| from |^HEADER|^CC|^LINK' > warnings.txt
+ @wc -l warnings.txt
+
+#
+# Ensure we're using tabs in the configuration files,
+# and remove trailing whitespace in source files.
+#
+.PHONY: whitespace
+whitespace:
+ @for x in $$(git ls-files raddb/ src/); do unexpand $$x > $$x.bak; cp $$x.bak $$x; rm -f $$x.bak;done
+ @perl -p -i -e 'trim' $$(git ls-files src/)
projects / freeradius.git / blobdiff