nnd/selinux-refpolicy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: generate temporary documentation files in separate directory

Browse Source 
Use a separate directory for files generated my 'make conf', so the clean targets from Rules.* do not remove them.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
This commit is contained in:
Christian Göttsche 2020-04-06 12:22:05 +02:00
parent 41963e7116
commit 82a8b7bfb7
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile
View File

@ -122,11 +122,13 @@ polxml := $(docs)/policy.xml
tunxml := $(docs)/global_tunables.xml tunxml := $(docs)/global_tunables.xml
boolxml := $(docs)/global_booleans.xml boolxml := $(docs)/global_booleans.xml
htmldir := $(docs)/html htmldir := $(docs)/html
doctmpdir := $(docs)/tmp
else else
polxml := $(LOCAL_ROOT)/doc/policy.xml polxml := $(LOCAL_ROOT)/doc/policy.xml
tunxml := $(LOCAL_ROOT)/doc/global_tunables.xml tunxml := $(LOCAL_ROOT)/doc/global_tunables.xml
boolxml := $(LOCAL_ROOT)/doc/global_booleans.xml boolxml := $(LOCAL_ROOT)/doc/global_booleans.xml
htmldir := $(LOCAL_ROOT)/doc/html htmldir := $(LOCAL_ROOT)/doc/html
doctmpdir := $(LOCAL_ROOT)/doc/tmp
endif endif
# config file paths # config file paths
@ -270,8 +272,8 @@ generated_fc := $(basename $(foreach dir,$(all_layers),$(wildcard $(dir)/*.fc.in
# when a generated file is already generated # when a generated file is already generated
detected_mods := $(sort $(foreach dir,$(all_layers),$(wildcard $(dir)/*.te)) $(generated_te)) detected_mods := $(sort $(foreach dir,$(all_layers),$(wildcard $(dir)/*.te)) $(generated_te))
modxml := $(addprefix $(tmpdir)/, $(detected_mods:.te=.xml)) modxml := $(addprefix $(doctmpdir)/, $(detected_mods:.te=.xml))
layerxml := $(sort $(addprefix $(tmpdir)/, $(notdir $(addsuffix .xml,$(all_layers))))) layerxml := $(sort $(addprefix $(doctmpdir)/, $(notdir $(addsuffix .xml,$(all_layers)))))
layer_names := $(sort $(notdir $(all_layers))) layer_names := $(sort $(notdir $(all_layers)))
all_metaxml = $(call detect-metaxml, $(layer_names)) all_metaxml = $(call detect-metaxml, $(layer_names))
@ -406,22 +408,22 @@ conf.intermediate: $(polxml)
# #
# Documentation generation # Documentation generation
# #
iftemplates: $(tmpdir)/iftemplates iftemplates: $(doctmpdir)/iftemplates
$(tmpdir)/iftemplates: $(doctmpdir)/iftemplates:
@echo "Generating interface templates into $(tmpdir)/iftemplates" @echo "Generating interface templates into $(doctmpdir)/iftemplates"
@test -d $(tmpdir)/iftemplates || mkdir -p $(tmpdir)/iftemplates @test -d $(doctmpdir)/iftemplates || mkdir -p $(doctmpdir)/iftemplates
$(verbose) $(gentemplates) -g -s $(moddir) -t $(tmpdir)/iftemplates $(verbose) $(gentemplates) -g -s $(moddir) -t $(doctmpdir)/iftemplates
ifdef LOCAL_ROOT ifdef LOCAL_ROOT
$(verbose) $(gentemplates) -g -s $(local_moddir) -t $(tmpdir)/iftemplates $(verbose) $(gentemplates) -g -s $(local_moddir) -t $(doctmpdir)/iftemplates
endif endif
@touch $(tmpdir)/iftemplates @touch $(doctmpdir)/iftemplates
$(layerxml): %.xml: $(tmpdir)/iftemplates $(all_metaxml) $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods)) $(subst .te,.if, $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods))) $(layerxml): %.xml: $(doctmpdir)/iftemplates $(all_metaxml) $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods)) $(subst .te,.if, $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods)))
@test -d $(tmpdir) || mkdir -p $(tmpdir) @test -d $(doctmpdir) || mkdir -p $(doctmpdir)
$(verbose) cat $(filter %/$(notdir $*)/$(metaxml), $(all_metaxml)) > $@ $(verbose) cat $(filter %/$(notdir $*)/$(metaxml), $(all_metaxml)) > $@
$(verbose) for i in $(basename $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods))); do $(genxml) -w -T $(tmpdir)/iftemplates -m $$i >> $@; done $(verbose) for i in $(basename $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods))); do $(genxml) -w -T $(doctmpdir)/iftemplates -m $$i >> $@; done
ifdef LOCAL_ROOT ifdef LOCAL_ROOT
$(verbose) for i in $(basename $(filter $(addprefix $(local_moddir)/, $(notdir $*))%, $(detected_mods))); do $(genxml) -w -T $(tmpdir)/iftemplates -m $$i >> $@; done $(verbose) for i in $(basename $(filter $(addprefix $(local_moddir)/, $(notdir $*))%, $(detected_mods))); do $(genxml) -w -T $(doctmpdir)/iftemplates -m $$i >> $@; done
endif endif
$(tunxml): $(globaltun) $(tunxml): $(globaltun)
@ -433,11 +435,11 @@ $(boolxml): $(globalbool)
$(polxml): $(layerxml) $(tunxml) $(boolxml) $(polxml): $(layerxml) $(tunxml) $(boolxml)
@echo "Creating $(@F)" @echo "Creating $(@F)"
@test -d $(dir $(polxml)) || mkdir -p $(dir $(polxml)) @test -d $(dir $(polxml)) || mkdir -p $(dir $(polxml))
@test -d $(tmpdir) || mkdir -p $(tmpdir) @test -d $(doctmpdir) || mkdir -p $(doctmpdir)
$(verbose) echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>' > $@ $(verbose) echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>' > $@
$(verbose) echo '<!DOCTYPE policy SYSTEM "$(notdir $(xmldtd))">' >> $@ $(verbose) echo '<!DOCTYPE policy SYSTEM "$(notdir $(xmldtd))">' >> $@
$(verbose) echo '<policy>' >> $@ $(verbose) echo '<policy>' >> $@
$(verbose) for i in $(basename $(notdir $(layerxml))); do echo "<layer name=\"$$i\">" >> $@; cat $(tmpdir)/$$i.xml >> $@; echo "</layer>" >> $@; done $(verbose) for i in $(basename $(notdir $(layerxml))); do echo "<layer name=\"$$i\">" >> $@; cat $(doctmpdir)/$$i.xml >> $@; echo "</layer>" >> $@; done
$(verbose) cat $(tunxml) $(boolxml) >> $@ $(verbose) cat $(tunxml) $(boolxml) >> $@
$(verbose) echo '</policy>' >> $@ $(verbose) echo '</policy>' >> $@
$(verbose) if test -x $(XMLLINT) && test -f $(xmldtd); then \ $(verbose) if test -x $(XMLLINT) && test -f $(xmldtd); then \
@ -628,8 +630,7 @@ resetlabels:
# #
bare: clean bare: clean
$(verbose) rm -f $(polxml) $(verbose) rm -f $(polxml)
$(verbose) rm -f $(layerxml) $(verbose) rm -fR $(doctmpdir)
$(verbose) rm -f $(modxml)
$(verbose) rm -f $(tunxml) $(verbose) rm -f $(tunxml)
$(verbose) rm -f $(boolxml) $(verbose) rm -f $(boolxml)
$(verbose) rm -f $(mod_conf) $(verbose) rm -f $(mod_conf)