PERFORCE change 95727 for review

[Todd Miller]

http://perforce.freebsd.org/chv.cgi?CH=95727

Change 95727 by millert at millert_g5tower on 2006/04/20 21:49:11

	checkpolicy 1.30
	Obtained from: SELinux

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#5 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#5 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.8#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.c#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/genpolusers.c#2 delete
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.c#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.h#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/dismod.c#1 add
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/dispol.c#1 add

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#5 (text+ko) ====

@@ -1,20 +1,19 @@
-all:
-	cd sedarwin && gnumake
-	cd libsepol/src && gnumake
-	cd libselinux && gnumake
-	cd programs && gnumake
-	cd policy && gnumake
+SUBDIR= sedarwin \
+	libsecompat \
+	libsepol \
+	libselinux \
+	libsemanage \
+	programs \
+	policy
+
+.PHONY: $(SUBDIR) all install clean
+
+all: $(SUBDIR)
 
-clean:
-	cd sedarwin && gnumake clean
-	cd libsepol/src && gnumake clean
-	cd libselinux && gnumake clean
-	cd programs && gnumake clean
-	cd policy && gnumake clean
+$(SUBDIR):
+	$(MAKE) -w -C $@ 
 
-install:
-	cd sedarwin && gnumake install
-	cd libsepol/src && gnumake install
-	cd libselinux && gnumake install
-	cd programs && gnumake install
-	cd policy && gnumake install
+install clean:
+	for dir in $(SUBDIR); do \
+		$(MAKE) -w -C $$dir $@; \
+	done

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#5 (text+ko) ====

@@ -1,24 +1,24 @@
-include ../../Makeconfig
-
 SUBDIR= checkpolicy \
-	loadpolicy \
+	genhomedircon \
+	load_policy \
 	newrole \
-	relabel_gui
+	setfiles \
+	setsebool \
+	semodule \
+	semodule_expand \
+	semodule_link \
+	semodule_package \
+	relabel_gui \
+	restorecon
+
+.PHONY: $(SUBDIR) all install clean
 
-all:
-	cd checkpolicy ; gnumake
-	cd loadpolicy ; gnumake
-	cd newrole ; gnumake
-	cd relabel_gui ; gnumake
+all: $(SUBDIR)
 
-clean:
-	cd checkpolicy ; gnumake clean
-	cd loadpolicy ; gnumake clean
-	cd newrole ; gnumake clean
-	cd relabel_gui ; gnumake clean
+$(SUBDIR):
+	$(MAKE) -w -C $@
 
-install:
-	cd checkpolicy ; gnumake install
-	cd loadpolicy ; gnumake install
-	cd newrole ; gnumake install
-	cd relabel_gui ; gnumake install
+install clean:
+	for dir in $(SUBDIR); do \
+		$(MAKE) -w -C $$dir $@; \
+	done