include additional modules in build if requested

FreeRADIUS · Sep 3, 2016 · be1e085 · be1e085
1 parent e96fa91
commit be1e085
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -240,14 +240,27 @@ certs:
 ######################################################################
 BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
 
-freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz: .git
-	git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ $(BRANCH) | gzip > $@
+freeradius-server-$(RADIUSD_VERSION_STRING).tar: .git
+	git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ $(BRANCH) > $@
+ifneq "$(EXT_MODULES)" ""
+	rm -rf build/freeradius-server-$(RADIUSD_VERSION_STRING)
+	cd $(BUILD_DIR) && tar -xf ../$@
+	for x in $(subst _ext,,$(EXT_MODULES)); do \
+		cd ${top_srcdir}/$${x}_ext; \
+		git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/$$x/ $(BRANCH) | (cd ${top_srcdir}/$(BUILD_DIR) && tar -xf -); \
+	done
+	cd $(BUILD_DIR) && tar -cf ../$@ freeradius-server-$(RADIUSD_VERSION_STRING)
+endif
+
+
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz: freeradius-server-$(RADIUSD_VERSION_STRING).tar
+	gzip < $^ > %@
 
 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_STRING).tar.bz2: .git
-	git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ $(BRANCH) | bzip2 > $@
+freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2: freeradius-server-$(RADIUSD_VERSION_STRING).tar
+	bzip2 < $^ > %@
 
 freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
 	gpg --default-key aland@freeradius.org -b $<

diff --git a/src/modules/all.mk b/src/modules/all.mk
@@ -8,6 +8,8 @@ CFLAGS += -DIS_MODULE=1
 SUBMAKEFILES := $(wildcard ${top_srcdir}/src/modules/rlm_*/all.mk)
 SUBMAKEFILES += $(wildcard ${top_srcdir}/src/modules/proto_*/all.mk)
 
+EXT_MODULES := $(subst ${top_srcdir}/,,$(wildcard ${top_srcdir}/src/modules/*_ext))
+
 #
 #  If we haven't run configure, ignore the modules which require it.
 #  Otherwise, load in all of the module makefiles, including ones