[Ltp-cvs] ltp/testcases/kernel/security/selinux-testsuite/refpolicy Makefile, 1.19, 1.20

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/refpolicy
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30324/refpolicy

Modified Files:
	Makefile 
Log Message:
Fix ordering of $(filter-out ) as noted by Stephen.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile	25 Jan 2010 11:08:07 -0000	1.19
--- Makefile	3 Feb 2010 10:19:32 -0000	1.20
***************
*** 55,71 ****
  MAKE_TARGETS		:= test_policy.te test_policy.pp
  
- ifneq ($(CHECKPOLICY_VERS),24)
- POLICY_FILES		:= $(filter-out test_bounds.te,$(POLICY_FILES))
- endif
- 
  # This is being done to preserve precedence; test_global.te must come first.
  POLICY_FILES		:= test_global.te \
  			   $(filter-out test_global.te,$(notdir $(wildcard $(TEST_POLICY_DIR)/*.te)))
  
  test_policy.te: $(addprefix $(TEST_POLICY_DIR)/,$(POLICY_FILES))
  	(cd "$(TEST_POLICY_DIR)" && cat $(POLICY_FILES)) > $@
  
  test_policy.pp: test_policy.te
! 	@set -e; if [ -d "$(POLICY_DEVEL_DIR)" ]; then \
  		$(MAKE) -f $(POLICY_DEVEL_DIR)/Makefile test_policy.pp; \
  	else \
--- 55,71 ----
  MAKE_TARGETS		:= test_policy.te test_policy.pp
  
  # This is being done to preserve precedence; test_global.te must come first.
  POLICY_FILES		:= test_global.te \
  			   $(filter-out test_global.te,$(notdir $(wildcard $(TEST_POLICY_DIR)/*.te)))
  
+ ifneq ($(CHECKPOLICY_VERS),24)
+ POLICY_FILES		:= $(filter-out test_bounds.te,$(POLICY_FILES))
+ endif
+ 
  test_policy.te: $(addprefix $(TEST_POLICY_DIR)/,$(POLICY_FILES))
  	(cd "$(TEST_POLICY_DIR)" && cat $(POLICY_FILES)) > $@
  
  test_policy.pp: test_policy.te
! 	set -e; if [ -d "$(POLICY_DEVEL_DIR)" ]; then \
  		$(MAKE) -f $(POLICY_DEVEL_DIR)/Makefile test_policy.pp; \
  	else \