[sr-dev] git:andrei/cdefs2doc: doc: {rpc, cfg}_list: fix makefile exclude list

Module: sip-router Branch: andrei/cdefs2doc Commit: 0ddc0cebabe0973dd0a44b4fae51a02a8222d686 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ddc0ce… Author: Andrei Pelinescu-Onciul &lt;andrei(a)iptel.org&gt; Committer: Andrei Pelinescu-Onciul &lt;andrei(a)iptel.org&gt; Date: Thu Feb 18 14:10:08 2010 +0100 doc: {rpc,cfg}_list: fix makefile exclude list - fix makefile exclude groups and files (didn't work for more then one entry) - added default list for make all --- doc/cfg_list/Makefile | 6 ++++-- doc/cfg_list/docbook/cfg_var_list.xml | 2 +- doc/rpc_list/Makefile | 32 +++++++++++++++++++++++++++----- doc/rpc_list/docbook/rpc_list.xml | 4 ++-- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 9283a50..8d83fc3 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -13,6 +13,8 @@ docbook_output_dir=docbook # list of files contanining cfg defs in the following format: # <filename>:<cfg_grp_name> +# can be easily filled/updated by pasting the output of: +# make print-lst |sed -e 's!^ \?../..\(.*\)!$(COREPATH)\1 \\!' files_list=$(COREPATH)/cfg_core.c:core $(COREPATH)/tcp_options.c:tcp \ $(COREPATH)/sctp_options.c:sctp \ $(COREPATH)/modules_s/maxfwd/maxfwd.c:maxfwd \ @@ -45,8 +47,8 @@ endif gcc=gcc -I$(COREPATH)/lib -I/usr/include/libxml2 #filtered files list -flist=$(filter-out $(join $(file_exclude),%),\ - $(filter-out $(join %:,$(grp_exclude)),$(files_list)) ) +flist=$(filter-out $(addsuffix %,$(file_exclude)),\ + $(filter-out $(addprefix %:,$(grp_exclude)),$(files_list)) ) # throws an error if input is not in the format filename:grp check_fname_grp=$(if $(filter-out 2,$(words $(subst :, ,$(1)))),\ diff --git a/doc/cfg_list/docbook/cfg_var_list.xml b/doc/cfg_list/docbook/cfg_var_list.xml index 4da2a56..991e39e 100644 --- a/doc/cfg_list/docbook/cfg_var_list.xml +++ b/doc/cfg_list/docbook/cfg_var_list.xml @@ -5,7 +5,7 @@ <book id="cfg_var_list" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>RPC Exports List</title> <info><revhistory><revision> - <revnumber>sip-router git-a11ee8</revnumber> + <revnumber>sip-router git-8ee1a0</revnumber> <revremark> Automatically generated by: make -C doc/cfg_list all diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index b4e7afd..eb046cc 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -13,9 +13,31 @@ docbook_output_dir=docbook # list of files contanining rpc defs in the following format: # <filename>:<cfg_grp_name> -# one way to quickly fill it up is pasting the output of -# make print-lst|xargs echo -files_list=$(COREPATH)/core_cmd.c:core +# can be easily filled/updated by pasting the output of: +# make print-lst |sed -e 's!^ \?../..\(.*\)!$(COREPATH)\1 \\!' +files_list= $(COREPATH)/core_cmd.c:core \ + $(COREPATH)/modules_s/pdt/pdt.c:pdt \ + $(COREPATH)/modules_s/rls/rpc.c:rls \ + $(COREPATH)/modules_s/pike/rpc.c:pike \ + $(COREPATH)/modules_s/tls/tls_rpc.c:tls \ + $(COREPATH)/modules_s/presence_b2b/rpc.c:presence_b2b \ + $(COREPATH)/modules_s/gflags/gflags.c:gflags \ + $(COREPATH)/modules_s/dispatcher/ds_rpc.c:dispatcher \ + $(COREPATH)/modules_s/prefix_route/pr_rpc.c:prefix_route \ + $(COREPATH)/modules_s/domain/domain_rpc.c:domain \ + $(COREPATH)/modules_s/cpl-c/cpl_rpc.c:cpl-c \ + $(COREPATH)/modules_s/sl/sl_stats.c:sl \ + $(COREPATH)/modules_s/usrloc/ul_rpc.c:usrloc \ + $(COREPATH)/modules_s/pa/rpc.c:pa \ + $(COREPATH)/modules_s/ratelimit/ratelimit.c:ratelimit \ + $(COREPATH)/modules/tm/tm.c:tm \ + $(COREPATH)/modules/tls/tls_rpc.c:tls \ + $(COREPATH)/modules/lcr/lcr_rpc.c:lcr \ + $(COREPATH)/modules/ctl/ctl.c:ctl \ + $(COREPATH)/modules/cfg_rpc/cfg_rpc.c:cfg_rpc \ + $(COREPATH)/modules/db_flatstore/flat_rpc.c:db_flatstore \ + $(COREPATH)/modules/mi_rpc/mi_rpc_mod.c:mi_rpc + # list of excluded groups grp_exclude=pa @@ -44,8 +66,8 @@ endif gcc=gcc -I$(COREPATH)/lib -I/usr/include/libxml2 #filtered files list -flist=$(filter-out $(join $(file_exclude),%),\ - $(filter-out $(join %:,$(grp_exclude)),$(files_list)) ) +flist=$(filter-out $(addsuffix %,$(file_exclude)),\ + $(filter-out $(addprefix %:,$(grp_exclude)),$(files_list)) ) # throws an error if input is not in the format filename:grp check_fname_grp=$(if $(filter-out 2,$(words $(subst :, ,$(1)))),\ diff --git a/doc/rpc_list/docbook/rpc_list.xml b/doc/rpc_list/docbook/rpc_list.xml index 40a0225..16a1027 100644 --- a/doc/rpc_list/docbook/rpc_list.xml +++ b/doc/rpc_list/docbook/rpc_list.xml @@ -5,12 +5,13 @@ <book id="rpc_list" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>RPC Exports List</title> <info><revhistory><revision> - <revnumber>sip-router git-b6cfcc</revnumber> + <revnumber>sip-router git-8ee1a0</revnumber> <revremark> Automatically generated by: make -C doc/rpc_list all </revremark> </revision></revhistory></info> + <xi:include href="rpc_core.xml"/> <xi:include href="rpc_pdt.xml"/> <xi:include href="rpc_rls.xml"/> <xi:include href="rpc_pike.xml"/> @@ -30,5 +31,4 @@ <xi:include href="rpc_cfg_rpc.xml"/> <xi:include href="rpc_db_flatstore.xml"/> <xi:include href="rpc_mi_rpc.xml"/> - <xi:include href="rpc_core.xml"/> </book>