From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 23 Jan 2012 17:16:51 +0000 (+0100)
Subject: Use the new build framework
X-Git-Tag: release_3_0_0_beta0~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e6ee6a45dc4a032b0b093c0307517ccc6db6b89;p=thirdparty%2Ffreeradius-server.git

Use the new build framework

By editing Make.inc, and adding "BOILER=yes" to the end.
It's not automatically enabled, because we don't want it to
break peoples systems.

The result is MUCH faster build times.  "make" from the top
level takes ~0.2s, instead of 7 seconds.
---

diff --git a/Makefile b/Makefile
index 6750ff4abf6..adb4c2d91d4 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,49 @@
 include Make.inc
 MFLAGS += --no-print-directory
 
+# Speed up the build for developers.  This means editing Make.inc,
+# and adding "BOILER = yes" to the bottom.  Once that's done, the
+#
+#
+ifeq "$(BOILER)" "yes"
+
+# Require at least GNU Make 3.81 for the new build system
+# Don't allow 3.80.  Allow any 3.8x.  This will need to be changed
+# in a decade or two when GNU Make 3.90 is released.
+BOILERMAKE=$(subst 3.8,yes,$(subst 3.80,,$(MAKE_VERSION)))
+
+# The version of GNU Make is too old, don't use it.
+ifeq "" "$(findstring yes,$(BOILERMAKE))"
+BOILERMAKE=
+endif
+
+# Static-only builds still require libtool.
+# This is because it does all kinds of preload magic in order
+# to force the linker to put the libraries into the main binary.
+# We don't support that yet, so we miss it...
+ifneq "$(USE_SHARED_LIBS)" "yes"
+BOILERMAKE=
+endif
+endif
+
+# If possible, drastically decrease the build time.
+# The new build system means that 
+ifneq "" "$(BOILERMAKE)"
+
+# Don't use libtool or libltdl.
+# They are a blight upon the face of the earth.
+LIBLTDL		:=
+INCLTDL		:= -DWITH_DLOPEN
+CFLAGS		+= -DWITHOUT_LIBLTDL
+LIBTOOL		:= JLIBTOOL
+LTDL_SUBDIRS	:=
+
+export DESTDIR := $(R)
+
+# And over-ride all of the other magic.
+include scripts/boiler.mk
+
+else
 .PHONY: all clean install
 
 SUBDIRS		= $(LTDL_SUBDIRS) $(wildcard src raddb scripts doc)
@@ -21,6 +64,7 @@ all:
 clean:
 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 	@rm -f *~
+endif
 
 .PHONY: tests
 tests:
@@ -44,6 +88,7 @@ tests:
 # we make sure DESTDIR is defined.
 #
 export DESTDIR := $(R)
+ifeq "$(BOILERMAKE)" ""
 install:
 	$(INSTALL) -d -m 755	$(R)$(sbindir)
 	$(INSTALL) -d -m 755	$(R)$(bindir)
@@ -67,6 +112,7 @@ install:
 		$(INSTALL) -m 644 $$i $(R)$(dictdir); \
 	done
 	$(LIBTOOL) --finish $(R)$(libdir)
+endif
 
 ifneq ($(RADMIN),)
 ifneq ($(RGROUP),)