sort to get all attribute declarations above type declarations.

This commit is contained in:
Chris PeBenito 2006-03-21 15:40:01 +00:00
parent ce6c136812
commit 35d0857c76
2 changed files with 2 additions and 2 deletions

View File

@ -166,7 +166,7 @@ $(TMPDIR)/post_te_files.conf: $(M4SUPPORT) $(BASE_POST_TE_FILES)
# extract attributes and put them first. extract post te stuff # extract attributes and put them first. extract post te stuff
# like genfscon and put last. # like genfscon and put last.
$(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf $(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
$(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf > $(TMPDIR)/all_attrs_types.conf $(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | sort > $(TMPDIR)/all_attrs_types.conf
$(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf $(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
# these have to run individually because order matters: # these have to run individually because order matters:
$(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true $(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true

View File

@ -142,7 +142,7 @@ $(TMPDIR)/post_te_files.conf: $(M4SUPPORT) $(POST_TE_FILES)
# extract attributes and put them first. extract post te stuff # extract attributes and put them first. extract post te stuff
# like genfscon and put last. # like genfscon and put last.
$(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf $(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
$(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf > $(TMPDIR)/all_attrs_types.conf $(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | sort > $(TMPDIR)/all_attrs_types.conf
$(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf $(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
# these have to run individually because order matters: # these have to run individually because order matters:
$(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true $(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true