pkg/kamailio/deb: fix build rule for modules

(cherry picked from commit 2115943)
kamailio · Jun 3, 2016 · f4b8590 · f4b8590
1 parent 45060ef
commit f4b8590
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 12 deletions.
diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules
@@ -59,12 +59,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
 
-
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -83,6 +82,13 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_BUILD_template
+	# package all the modules in EXTRA_GROUPS in separate packages
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) every-module group_include="k$(grp)"
+	)
+endef
+
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -135,6 +141,7 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
+	$(call PACKAGE_EXTRA_BUILD_template)
 	touch build-stamp
 
 clean:

diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules
@@ -59,12 +59,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
 
-
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -83,6 +82,13 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_BUILD_template
+	# package all the modules in EXTRA_GROUPS in separate packages
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) every-module group_include="k$(grp)"
+	)
+endef
+
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -135,6 +141,7 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
+	$(call PACKAGE_EXTRA_BUILD_template)
 	touch build-stamp
 
 clean:

diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules
@@ -58,12 +58,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
 
-
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -82,6 +81,13 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_BUILD_template
+	# package all the modules in EXTRA_GROUPS in separate packages
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) every-module group_include="k$(grp)"
+	)
+endef
+
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -134,6 +140,7 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
+	$(call PACKAGE_EXTRA_BUILD_template)
 	touch build-stamp
 
 clean:

diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules
@@ -56,12 +56,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
 
-
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -80,6 +79,13 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_BUILD_template
+	# package all the modules in EXTRA_GROUPS in separate packages
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) every-module group_include="k$(grp)"
+	)
+endef
+
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -132,6 +138,7 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
+	$(call PACKAGE_EXTRA_BUILD_template)
 	touch build-stamp
 
 clean:

diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules
@@ -59,12 +59,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
 
-
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -83,6 +82,13 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_BUILD_template
+	# package all the modules in EXTRA_GROUPS in separate packages
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) every-module group_include="k$(grp)"
+	)
+endef
+
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -135,6 +141,7 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
+	$(call PACKAGE_EXTRA_BUILD_template)
 	touch build-stamp
 
 clean:

diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules
@@ -58,12 +58,11 @@ mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
 
 define PACKAGE_GRP_BUILD_template
 	# package all the modules in PACKAGE_GROUPS in separate packages
-	$(foreach grp,$(PACKAGE_GROUPS EXTRA_GROUPS),\
+	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) every-module group_include="k$(grp)"
 	)
 endef
 
-
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -82,6 +81,13 @@ define PACKAGE_GRP_INSTALL_template
 	)
 endef
 
+define PACKAGE_EXTRA_BUILD_template
+	# package all the modules in EXTRA_GROUPS in separate packages
+	$(foreach grp,$(EXTRA_GROUPS),\
+		$(MAKE) every-module group_include="k$(grp)"
+	)
+endef
+
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
 		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
@@ -134,6 +140,7 @@ build-stamp: configure-stamp
 	$(MAKE) all
 	# make groups
 	$(call PACKAGE_GRP_BUILD_template)
+	$(call PACKAGE_EXTRA_BUILD_template)
 	touch build-stamp
 
 clean: