Permalink
Browse files

pull from specified remote git repos for non-core projects

  • Loading branch information...
1 parent 6f6dc2e commit d957a6c100517c973a3a2ce0c4682074f3be9ab9 @ezuce-admin ezuce-admin committed Oct 1, 2011
Showing with 72 additions and 61 deletions.
  1. +7 −7 Makefile.in
  2. +1 −0 configure.ac
  3. +46 −0 mak/app.mk.in
  4. +16 −19 mak/build.mk.in
  5. +2 −35 mak/modules.mk.in
View
@@ -35,8 +35,8 @@ after = $(shell echo $(space)$2$(space) | awk -F : '{if (match($$0,/ $1 /)) {pri
..._sipx_expanded = $(foreach T,$(..._sipx_list),$(subst $(PROJ),$(T),$*))
..._lib_list = $(call after,$(PROJ),$(lib))
..._lib_expanded = $(foreach T,$(..._lib_list),$(subst $(PROJ),$(T),$*))
-..._lang_list = $(call after,$(PROJ),$(lang))
-..._lang_expanded = $(foreach T,$(..._lang_list),$(subst $(PROJ),$(T),$*))
+..._app_list = $(call after,$(PROJ),$(app))
+..._app_expanded = $(foreach T,$(..._app_list),$(subst $(PROJ),$(T),$*))
default-first-target : help;
@@ -46,11 +46,11 @@ sipx.% :
lib.% :
$(MAKE) $(foreach P,$(lib),$(P).$*)
-lang.% :
- $(MAKE) $(foreach P,$(lang),$(P).$*)
+app.% :
+ $(MAKE) $(foreach P,$(app),$(P).$*)
help.{sipx,lib}.list=list all sipx components
-lang.list lib.list sipx.list : %.list :
+app.list lib.list sipx.list : %.list :
@echo $($*)
include $(sort $(wildcard mak/*.mk))
@@ -63,11 +63,11 @@ help.*{1|2}*... = Perform all targets would normally follow the given target in
packages.
%... :
- $(MAKE) $(..._sipx_expanded) $(..._lib_expanded) $(..._lang_expanded)
+ $(MAKE) $(..._sipx_expanded) $(..._lib_expanded) $(..._app_expanded)
help-values.{1} = Any sipXecs package. For all sipXecs packages use 'sipx'. Complete list of sipXecs packages : $(sipx)
help-values.{2} = Any dependency package. For all dependencies use 'lib'. Complete list of dependencies : $(lib)
-help-values.{6} = Any language package. For all langages use 'lang'. Complete list of languages : $(lang)
+help-values.{6} = Any sipXecs application. For all app use 'app'. Complete list of app : $(app)
.PHONY: help
help:
View
@@ -26,6 +26,7 @@ m4_sinclude([custom/custom.m4])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([mak/00-modules.mk:mak/modules.mk.in])
+AC_CONFIG_FILES([mak/01-app.mk:mak/app.mk.in])
AC_CONFIG_FILES([mak/05-build.mk:mak/build.mk.in])
AC_CONFIG_FILES([mak/20-list-dependencies.mk:mak/list-dependencies.mk.in])
View
@@ -0,0 +1,46 @@
+app = \
+ $(sf) \
+ $(lang) \
+ $(telecats)
+
+sf = \
+ sipXaastra \
+ sipXcisco \
+ sipXclearone \
+ sipXcounterpath \
+ sipXgtek \
+ sipXhitachi \
+ sipXipdialog \
+ sipXisphone \
+ sipXkarel \
+ sipXnortel \
+ sipXlg-nortel \
+ sipXmitel \
+ sipXsnom \
+ sipXunidata \
+ sipXgrandstream \
+ sipXexample
+
+lang = \
+ sipXlang-abitibi-fr_CA \
+ sipXlang-ch \
+ sipXlang-cs \
+ sipXlang-de \
+ sipXlang-en_GB \
+ sipXlang-es \
+ sipXlang-fr_CA \
+ sipXlang-fr \
+ sipXlang-it \
+ sipXlang-ja \
+ sipXlang-es_MX \
+ sipXlang-nl \
+ sipXlang-pl \
+ sipXlang-pt_BR \
+ sipXlang-zh
+
+telecats = \
+ sipXcustomCallerId
+
+# Repositories
+$(foreach R,$(lang),$(eval $(R)_REPO = git@github.com:dhubler/$(R).git))
+$(foreach R,$(telecats),$(eval $(R)_REPO = git@github.com:niekvlessert/$(R).git))
View
@@ -3,36 +3,33 @@
#
OPTIONS = @OPTIONS@
-help.sipx=Build all sipx components including autoreconf, configure, all and install targets
+help.sipx=Build all sipx components including targets autoreconf, configure, all and install targets
build sipx :
$(MAKE) $(foreach P,$(sipx),$(P))
-help.lang=Build all language components including autoreconf, configure, all and install targets
-lang :
- $(MAKE) $(foreach P,$(lang),$(P))
+help.app=Build all sipx apps including targets autoreconf, configure, all and install targets
+app :
+ $(MAKE) $(foreach P,$(app),$(P))
-$(foreach T,$(sipx) $(lang),$(T)) : % : %.build;
-$(foreach T,$(sipx) $(lang),$(T)...) : %... : %.build...;
-$(foreach T,$(sipx) $(lang),$(T).build) : %.build : %.autoreconf %.configure %.all-install ;
+$(foreach T,$(sipx) $(app),$(T)) : % : %.build;
+$(foreach T,$(sipx) $(app),$(T)...) : %... : %.build...;
+$(foreach T,$(sipx) $(app),$(T).build) : %.build : %.autoreconf %.configure %.all-install ;
help.{1|6}.all-install=Run 'make all install' in each target
-$(foreach T,$(sipx) $(lang),$(T).all-install) : %.all-install : %.all %.install ;
+$(foreach T,$(sipx) $(app),$(T).all-install) : %.all-install : %.all %.install ;
# Targets for sipx and lib. Uses pattern %.xyz so libs can implement their own
# implementation that will override the patterned one. i.e. freeswitch.autoreconf
# This also means all targets in all other make files cannot create a target that
# ends in autoreconf, configure or dist.
help.{1|2|6}.autoreconf=Run autoreconf on each project
-%.autoreconf : %.download
+%.autoreconf : $(SRC)/%
cd $(SRC)/$(PROJ); \
autoreconf -if
-# Needs to support switching branches
-%.download :
- if ! test -d $(SRC)/$*; then \
- git clone git://github.com/dhubler/$*.git $(SRC)/$*.clone; \
- mv $(SRC)/$*.clone $(SRC)/$*; \
- fi
+# TODO: Needs to support switching branches automatically
+$(foreach P,$(sipx) $(app) $(lib),$(SRC)/$(P)) : $(SRC)/% :
+ cd $(SRC); git clone $($*_REPO)
help.{1|2|6}.configure = Run configure on each project
%.configure :
@@ -46,11 +43,11 @@ help.{1|2|6}.dist = Build archive, typically compressed tar
# Targets for sipx only.
MAKE_COMMANDS = check install clean dist
$(foreach C,$(MAKE_COMMANDS) all,$(eval help.{1}.$(C)=Run make $(C) on each project))
-$(foreach P,$(sipx) $(lang),$(P).install) :; $(MAKE) -C $(PROJ) install
-$(foreach P,$(sipx) $(lang),$(P).clean) :; $(MAKE) -C $(PROJ) clean
-$(foreach P,$(sipx) $(lang),$(P).check) :; $(MAKE) -C $(PROJ) check
+$(foreach P,$(sipx) $(app),$(P).install) :; $(MAKE) -C $(PROJ) install
+$(foreach P,$(sipx) $(app),$(P).clean) :; $(MAKE) -C $(PROJ) clean
+$(foreach P,$(sipx) $(app),$(P).check) :; $(MAKE) -C $(PROJ) check
# projects do not all have an "all" target, they probably should, until then, use
# no-target default
-$(foreach C,all,$(foreach T,$(sipx) $(lang),$(T).all)) :
+$(foreach C,all,$(foreach T,$(sipx) $(app),$(T).all)) :
$(MAKE) -C $(PROJ)
View
@@ -42,42 +42,9 @@ sipx = \
sipXsupervisor \
sipXopenacd \
sipXecs \
- sipXaastra \
- sipXcisco \
- sipXclearone \
- sipXcounterpath \
- sipXgtek \
- sipXhitachi \
- sipXipdialog \
- sipXisphone \
- sipXkarel \
- sipXnortel \
- sipXlg-nortel \
- sipXmitel \
sipXpolycom \
- sipXsnom \
- sipXunidata \
- sipXgrandstream \
sipXpreflight \
- sipXviewer \
- sipXexample
-
-lang = \
- sipXlang-abitibi-fr_CA \
- sipXlang-ch \
- sipXlang-cs \
- sipXlang-de \
- sipXlang-en_GB \
- sipXlang-es \
- sipXlang-fr_CA \
- sipXlang-fr \
- sipXlang-it \
- sipXlang-ja \
- sipXlang-es_MX \
- sipXlang-nl \
- sipXlang-pl \
- sipXlang-pt_BR \
- sipXlang-zh
+ sipXviewer
lib_common = \
rubygem-file-tail \
@@ -117,4 +84,4 @@ lib_centos_6 = \
lib = $(lib_$(DISTRO_OS)_$(DISTRO_VER))
-all = $(lib) $(sipx) $(lang)
+all = $(lib) $(sipx) $(app)

0 comments on commit d957a6c

Please sign in to comment.