From 122328f95b1c1f3839fae69b7cb1297666afa506 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Sat, 3 Jun 2017 14:28:46 +0200 Subject: [PATCH] doc/select_list: updated makefile with the list of files exporting selects --- doc/tutorials/select_list/Makefile | 87 ++++++++++++++++-------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/doc/tutorials/select_list/Makefile b/doc/tutorials/select_list/Makefile index 2b658f6241e..7a0f93de376 100644 --- a/doc/tutorials/select_list/Makefile +++ b/doc/tutorials/select_list/Makefile @@ -1,15 +1,15 @@ -COREPATH=../.. +COREPATH=../../../src #include $(COREPATH)/Makefile.defs -CFG2TXT=../scripts/cdefs2doc/dump_selects.pl -CFG2DOCBOOK=../scripts/cdefs2doc/dump_selects.pl +CFG2TXT=../../scripts/cdefs2doc/dump_selects.pl +CFG2DOCBOOK=../../scripts/cdefs2doc/dump_selects.pl # extra generators options # use select_core.c to resolve possible chained select -CFG2TXT_EXTRA_OPTS=--core $(COREPATH)/select_core.c -CFG2DOCBOOK_EXTRA_OPTS=--core $(COREPATH)/select_core.c +CFG2TXT_EXTRA_OPTS=--core $(COREPATH)/core/select_core.c +CFG2DOCBOOK_EXTRA_OPTS=--core $(COREPATH)/core/select_core.c # output directory for generated txt files txt_output_dir=. @@ -17,31 +17,26 @@ txt_output_dir=. docbook_output_dir=docbook # list of files containing selects defs in the following format: -# : +# : # can be easily updated by adding the output of: # make diff-list (which obeys grp_exclude and file_exclude) # or completely regenerated by replacing files_list with the output of: # make gen-files-list files_list= \ - $(COREPATH)/select_core.c:core \ + $(COREPATH)/core/select_core.c:core \ + $(COREPATH)/modules/avp/avp.c:avp \ + $(COREPATH)/modules/cnxcc/cnxcc_mod.c:cnxcc \ + $(COREPATH)/modules/db2_ops/db2_ops.c:db2_ops \ + $(COREPATH)/modules/nathelper/nathelper.c:nathelper \ + $(COREPATH)/modules/textopsx/textopsx.c:textopsx \ + $(COREPATH)/modules/timer/timer.c:timer \ $(COREPATH)/modules/tls/tls_select.c:tls \ $(COREPATH)/modules/tm/select.c:tm \ - $(COREPATH)/modules/xmlrpc/xmlrpc.c:xmlrpc \ - $(COREPATH)/modules_s/avp/avp.c:avp \ - $(COREPATH)/modules_s/db_ops/db_ops.c:db_ops \ - $(COREPATH)/modules_s/eval/eval.c:eval \ - $(COREPATH)/modules_s/nathelper/nathelper.c:nathelper \ - $(COREPATH)/modules_s/rr/rr_mod.c:rr \ - $(COREPATH)/modules_s/textops/textops.c:textops \ - $(COREPATH)/modules_s/timer/timer.c:timer + $(COREPATH)/modules/xmlrpc/xmlrpc.c:xmlrpc - - -# list of excluded groups grp_exclude=pa iptrtpproxy # list of file prefixes to exclude (full path needed) -file_exclude= $(COREPATH)/modules_s/tls/ \ - $(COREPATH)/modules/iptrtpproxy/ +file_exclude= $(COREPATH)/obsolete/ # special per file group overrides # format= grp_filename=... ,where filename does not contain the extension @@ -66,14 +61,21 @@ gcc=gcc #-I$(COREPATH)/lib -I$(COREPATH) -I/usr/include/libxml2 # defines used by gcc -c_defs=-D__CPU_i386 -D__OS_linux -DSER_VER=2099099 -DPKG_MALLOC -DSHM_MEM \ - -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP \ - -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ - -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DCC_GCC_LIKE_ASM \ - -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ - -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ - -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DUSE_SCTP -DNAME='\"ser\"' \ - -DVERSION='\"2.99.99-pre3\"' -DARCH='\"i386\"' -DOS_QUOTED='\"linux\"' +c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ + -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' \ + -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 \ + -DCFG_DIR='\"/usr/local/etc/kamailio/\"' \ + -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ + -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ + -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ + -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ + -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ + -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ + -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \ + -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL \ + -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM \ + -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT \ + -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT # common makefile vars used in defs @@ -96,9 +98,9 @@ get_prereq=$(firstword $(subst :, ,$(1))) # get grp from file:grp (get_grp(file:grp) => grp) get_listed_grp=$(word 2, $(subst :, ,$(1))) -# get base file name from file:grp: get_bname(file:grp) +# get base file name from file:grp: get_bname(file:grp) # => basename(file) without extension (e.g. get_bname(foo/bar.c:x) => bar) -# +# get_bname=$(basename $(notdir $(call get_prereq,$(1)))) #get grp from file:grp, using the overrides @@ -166,7 +168,7 @@ INCLUDES:= # evaluate them $$(eval $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) # override COREPATH (we know better) -COREPATH=../.. +COREPATH=../../../src # save the result in a per group e_idefs_ var $$(eval e_idefs_$$(call get_grp,$(1)):=$$(DEFS) $$(INCLUDES)) @@ -295,14 +297,21 @@ $(docbook_output_dir)/select_list.xml: Makefile \ @echo '' >>$@ @echo ' Select List' >>$@ - @echo ' ' >>$@ - @echo ' '$(repo_ver)'' >>$@ - @echo ' '`date -R`'' >>$@ - @echo ' ' >>$@ - @echo " Automatically generated by:">>$@ - @echo " $(MAKE) -C doc/select_list $(MAKECMDGOALS)" >>$@ - @echo ' ' >>$@ - @echo ' ' >>$@ + @echo ' ' >>$@ + @echo ' kamailio.org' >>$@ + @echo ' ' >>$@ + @echo ' ' >>$@ + @echo ' Kamailio' >>$@ + @echo ' Development Team' >>$@ + @echo ' https://www.kamailio.org' >>$@ + @echo '
sr-dev@lists.kamailio.org
' >>$@ + @echo '
' >>$@ + @echo '
' >>$@ + @echo ' ' >>$@ + @echo ' 2008-2017' >>$@ + @echo ' Kamailio Project' >>$@ + @echo ' ' >>$@ + @echo '
' >>$@ @echo ' ' >>$@ @$(foreach f,$(flist),\ echo '