Mercurial > illumos > fmac

changeset 7832:3287800317c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed conditional MLS makefile problem
author John Weeks <jweeks@opensolaris.org>
date Fri, 02 May 2008 18:38:32 -0700
parents 2aac04e3eb1f
children e25177d972c7
files usr/src/uts/common/Makefile.files usr/src/uts/common/Makefile.rules
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/Makefile.files	Fri May 02 18:35:17 2008 -0700
+++ b/usr/src/uts/common/Makefile.files	Fri May 02 18:38:32 2008 -0700
@@ -36,6 +36,15 @@
 
 sparc_CORE_OBJS +=
 
+CHECK_FOR_MLS =		if $(EGREP) -s '^\#define.CONFIG_FLASK_MLS'	\
+				$(SRC)/common/fmac/ss/ss_impl.h ; then	\
+				echo "mls.o" ;				\
+			else						\
+				echo "" ;				\
+			fi ;
+
+FMAC_MLS_OBJS =		$(CHECK_FOR_MLS:sh)
+
 COMMON_CORE_OBJS +=		\
 		beep.o		\
 		bitset.o	\
--- a/usr/src/uts/common/Makefile.rules	Fri May 02 18:35:17 2008 -0700
+++ b/usr/src/uts/common/Makefile.rules	Fri May 02 18:38:32 2008 -0700
@@ -178,15 +178,6 @@
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-CHECK_FOR_MLS =		if $(EGREP) -s '^\#define.CONFIG_FLASK_MLS'	\
-				$(SRC)/common/fmac/ss/ss_impl.h ; then	\
-				echo "mls.o" ;				\
-			else						\
-				echo "" ;				\
-			fi ;
-
-FMAC_MLS_OBJS =		$(CHECK_FOR_MLS:sh)
-
 $(OBJS_DIR)/%.o:		$(COMMONBASE)/fmac/ss/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)