instead of using macros to drop out non-macro calls during corenetwork

interface generation, use grep to get the macro calls and feed to m4
This commit is contained in:
Chris PeBenito 2005-05-24 15:52:57 +00:00
parent 992aba5f15
commit 6276f10155
2 changed files with 2 additions and 10 deletions

View File

@ -158,7 +158,8 @@ tmp/generated_definitions.conf: $(ALL_MODULES) $(ALL_TE_FILES) $(BASE_MODULE)/co
$(QUIET) for i in $(notdir $(ALL_TE_FILES)); do \
echo "define(\`$$i')" >> $@ ;\
done
$(QUIET) m4 $(M4PARAM) -D interface_pass $(BASE_MODULE)/global.if $(BASE_MODULE)/corenetwork.if $(BASE_MODULE)/corenetwork.te \
$(QUIET) grep -E "^network_(interface|node|port)\(.*\)" $(BASE_MODULE)/corenetwork.te \
| m4 $(M4PARAM) -D interface_pass $(BASE_MODULE)/global.if $(BASE_MODULE)/corenetwork.if - \
| sed -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
tmp/all_interfaces.conf: $(ALL_INTERFACES)

View File

@ -790,15 +790,6 @@ class udp_socket name_bind;
#
########################################
# dont generate anything but macros on this pass
ifdef(`interface_pass',`
define(`allow',`dnl')
define(`type',`dnl')
define(`attribute',`dnl')
define(`portcon',`dnl')
define(`devices_make_device_node',`dnl')
')
########################################
#
# Network Interface generated macros