From: Jack Lange <jacklange@cs.pitt.edu>
Date: Tue, 3 May 2011 20:09:42 +0000 (-0500)
Subject: moved xed over to new configuration syntax
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=df02461396f080d7f85318832f3974ffefb924ee;p=palacios.git

moved xed over to new configuration syntax
---

diff --git a/palacios/lib/i386/Makefile b/palacios/lib/i386/Makefile
index 593cb48..2579781 100644
--- a/palacios/lib/i386/Makefile
+++ b/palacios/lib/i386/Makefile
@@ -1,4 +1,4 @@
 obj-y := null.o
 
-obj-$(CONFIG_XED) :=	libxed.a \
+obj-$(V3_CONFIG_XED) :=	libxed.a \
 			v3-xed-compat.o 
diff --git a/palacios/lib/i386/v3-xed-compat.c b/palacios/lib/i386/v3-xed-compat.c
index 7a5f62c..6ce5f10 100644
--- a/palacios/lib/i386/v3-xed-compat.c
+++ b/palacios/lib/i386/v3-xed-compat.c
@@ -4,19 +4,19 @@
 /* Standard I/O predefined streams
 */
 static FILE   _streams = {0, 0, 0, 0, 0, NULL, NULL, 0, 0};
-#ifdef CONFIG_BUILT_IN_STDIN
+#ifdef V3_CONFIG_BUILT_IN_STDIN
 FILE  *stdin = (&_streams);
 #endif
 
-#ifdef CONFIG_BUILT_IN_STDOUT
+#ifdef V3_CONFIG_BUILT_IN_STDOUT
 FILE  *stdout = (&_streams);
 #endif
 
-#ifdef CONFIG_BUILT_IN_STDERR
+#ifdef V3_CONFIG_BUILT_IN_STDERR
 FILE  *stderr = (&_streams);
 #endif
 
-#ifdef CONFIG_BUILT_IN_FPRINTF
+#ifdef V3_CONFIG_BUILT_IN_FPRINTF
 int fprintf(FILE *file, char *fmt, ...) {
    // PrintDebug("In fprintf!!\n");
    return 0;
@@ -24,21 +24,21 @@ int fprintf(FILE *file, char *fmt, ...) {
 }
 #endif
 
-#ifdef CONFIG_BUILT_IN_PRINTF
+#ifdef V3_CONFIG_BUILT_IN_PRINTF
 int printf(char *fmt, ...) {
    // PrintDebug("In fprintf!!\n");
    return 0;
 }
 #endif
 
-#ifdef CONFIG_BUILT_IN_FFLUSH
+#ifdef V3_CONFIG_BUILT_IN_FFLUSH
 int fflush(FILE *stream) {
     //PrintDebug("In fflush!!\n");
     return 0;
 }
 #endif
 
-#ifdef CONFIG_BUILT_IN_ABORT
+#ifdef V3_CONFIG_BUILT_IN_ABORT
 void abort(void)
 {
    //PrintDebug("Abort!!\n");
diff --git a/palacios/lib/x86_64/Makefile b/palacios/lib/x86_64/Makefile
index 2d97a1b..8853e97 100644
--- a/palacios/lib/x86_64/Makefile
+++ b/palacios/lib/x86_64/Makefile
@@ -1,4 +1,4 @@
 obj-y := null.o
 
-obj-$(CONFIG_XED) := 	libxed32e.a \
-			v3-xed-compat.o
+obj-$(V3_CONFIG_XED) := 	libxed32e.a \
+				v3-xed-compat.o