[Oracleasm-commits] jlbec commits r348 - trunk

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-06-30 17:47:32 -0500 (Fri, 30 Jun 2006)
New Revision: 348

Modified:
   trunk/Config.make.in
   trunk/Makefile
   trunk/configure.in
Log:

kapi: Forgot to add the kapi files to make dist.



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2006-06-30 22:02:22 UTC (rev 347)
+++ trunk/Config.make.in	2006-06-30 22:47:32 UTC (rev 348)
@@ -42,9 +42,7 @@
 
 DEFS = @DEFS@
 
-M64 = @M64@
 USERM64 = @USERM64@
-MCMODEL = @MCMODEL@
 
 KERNELDIR = @KERNELDIR@
 KERNELINC = $(KERNELDIR)/include

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-06-30 22:02:22 UTC (rev 347)
+++ trunk/Makefile	2006-06-30 22:47:32 UTC (rev 348)
@@ -16,6 +16,9 @@
 # 
 SUBDIRS = include kernel tools documents vendor
 
+KAPI_COMPAT_FILES =			\
+	kapi-compat/include/i_mutex.h
+
 #
 # Extra (non-source) files to distribute
 #
@@ -27,6 +30,7 @@
 	Preamble.make	\
 	Postamble.make	\
 	aclocal.m4	\
+	kfeature.m4	\
 	mbvendor.m4	\
 	config.guess	\
 	config.sub	\
@@ -36,9 +40,14 @@
 	mkinstalldirs	\
 	svnrev.guess	\
 	Vendor.make	\
-	vendor.guess
+	vendor.guess	\
+	$(KAPI_COMPAT_FILES)
 
+DIST_RULES = dist-subdircreate
 
+dist-subdircreate:
+	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/kapi-compat/include
+	
 
 
 include Vendor.make

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-30 22:02:22 UTC (rev 347)
+++ trunk/configure.in	2006-06-30 22:47:32 UTC (rev 348)
@@ -51,15 +51,9 @@
               force32="$enableval",
               force32="no")
 
-MCMODEL=""
-M64=""
 USERM64=""
 case "$host_cpu" in
-x86_64)
-    MCMODEL="-mcmodel=kernel"
-    ;;
 ppc64|powerpc64|ppc64iseries|ppc64pseries)
-    M64="-m64"
     case "$force32" in
     yes|true|on)
         ;;
@@ -72,8 +66,6 @@
     ;;
 esac
 
-AC_SUBST(MCMODEL)
-AC_SUBST(M64)
 AC_SUBST(USERM64)
 
 AC_CHECK_SIZEOF(unsigned long)