makefile: fix group_modules

- make cfg group_include="standard presence"; make all did not make the
presence modules because the excluded list was re-evaluated.
(see SER-415)

Reported-by: Bogdan Pintea <[email protected]>

Makefile

@@ -78,6 +78,15 @@ skip_modules?=
 # Alternatives are txt, html, xhtml, and pdf (see Makefile.doc)
 doc_format?=html
 
+include modules.lst
+
+#if called with group_include, ignore the modules from modules.lst
+ifneq ($(group_include),)
+	include_modules=
+	exclude_modules=
+	modules_configured:=0
+endif
+
 # Module group definitions, default only include the standard group
 # Make backwards compatible, don't set group_include default...
 #group_include?="standard"
@@ -132,8 +141,9 @@ module_group_stable=cpl-c dbtext jabber osp sms
 # not have dependencies
 module_group_experimental=tls oracle iptrtpproxy
 
-# if not set on the cmd. line or the env, exclude the below modules.
-ifneq ($(group_include),)
+# if not set on the cmd. line, env or in the modules.lst (cfg_group_include)
+# exclude the below modules.
+ifneq ($(group_include)$(cfg_group_include),)
 	# For group_include, default all modules are excluded except those in 
 	# include_modules
 	exclude_modules?=
@@ -220,7 +230,6 @@ $(shell rm -rf config.mak)
 endif
 endif
 
-include modules.lst
 
 main_makefile=1
 include Makefile.defs
@@ -337,7 +346,7 @@ endif # ifeq ($(config_mak),1)
 modules.lst:
 	@echo  saving modules list...
 	@echo "# this file is autogenerated by make modules-cfg" >$@
-	@$(call cfg_save_var2,group_include,$@)
+	@echo "cfg_group_include=$(group_include)" >>$@
 	@$(call cfg_save_var2,include_modules,$@)
 	@$(call cfg_save_var2,static_modules,$@)
 	@$(call cfg_save_var2,skip_modules,$@)