r8400: separate out the mpr code, as it is in the upstream appweb sources

diff --git a/source/lib/appweb/config.mk b/source/lib/appweb/config.mk
index 7d1eca34378a0c794db4b18cc9dd1b5e36be3f9d..1a73d6834ab4bf7c3571b77111a9cafe14e2bb53 100644 (file)
--- a/source/lib/appweb/config.mk
+++ b/source/lib/appweb/config.mk
@@ -1,3 +1,14 @@
+#######################
+# Start SUBSYSTEM MPR
+[SUBSYSTEM::MPR]
+ADD_OBJ_FILES = \
+               lib/appweb/mpr/miniMpr.o \
+               lib/appweb/mpr/var.o
+NOPROTO=YES
+# End SUBSYSTEM MPR
+#######################
+
+
 #######################
 # Start SUBSYSTEM EJS
 [SUBSYSTEM::EJS]
@@ -5,9 +16,8 @@ ADD_OBJ_FILES = \
                lib/appweb/ejs/ejsLib.o  \
                lib/appweb/ejs/ejsLex.o \
                lib/appweb/ejs/ejsParser.o \
-               lib/appweb/ejs/ejsProcs.o \
-               lib/appweb/ejs/miniMpr.o \
-               lib/appweb/ejs/var.o
+               lib/appweb/ejs/ejsProcs.o
+REQUIRED_SUBSYSTEMS = MPR
 NOPROTO=YES
 # End SUBSYSTEM EJS
 #######################

diff --git a/source/lib/appweb/ejs/ejs.h b/source/lib/appweb/ejs/ejs.h
index f1d2bb4c6ef3d9e72900a0ebe3c3aa573afaaccb..5efdb471926d7fc1a5f34ce39d30f45f97f946b5 100644 (file)
--- a/source/lib/appweb/ejs/ejs.h
+++ b/source/lib/appweb/ejs/ejs.h
@@ -44,8 +44,8 @@
 #ifndef _h_EJS
 #define _h_EJS 1
 
-#include       "miniMpr.h"
-#include       "var.h"
+#include       "lib/appweb/mpr/miniMpr.h"
+#include       "lib/appweb/mpr/var.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/source/lib/appweb/esp/esp.h b/source/lib/appweb/esp/esp.h
index ee86e8d3451822570714942f10db724cc1dd0201..e15daf0b4e048e6f9ef0d2e20450153fb344be41 100644 (file)
--- a/source/lib/appweb/esp/esp.h
+++ b/source/lib/appweb/esp/esp.h
@@ -38,8 +38,8 @@
 
 #include       "lib/appweb/ejs/ejs.h"
 #include       "lib/appweb/esp/espEnv.h"
-#include       "lib/appweb/ejs/var.h"
-#include       "lib/appweb/ejs/miniMpr.h"
+#include       "lib/appweb/mpr/var.h"
+#include       "lib/appweb/mpr/miniMpr.h"
 
 /*********************************** Defines **********************************/
 

diff --git a/source/lib/appweb/ejs/miniMpr.c b/source/lib/appweb/mpr/miniMpr.c
similarity index 99%
rename from source/lib/appweb/ejs/miniMpr.c
rename to source/lib/appweb/mpr/miniMpr.c
index 7dda4e7bd7c1bc68bfcd64c9a144c61aee134a36..abeefe1ec8e93419e4010f2792dd0d582bfabfe2 100644 (file)
--- a/source/lib/appweb/ejs/miniMpr.c
+++ b/source/lib/appweb/mpr/miniMpr.c
@@ -29,7 +29,7 @@
  *     @end
  */
 
-#include       "lib/appweb/ejs/miniMpr.h"
+#include       "miniMpr.h"
 
 /************************************ Code ************************************/
 #if !BLD_APPWEB

diff --git a/source/lib/appweb/ejs/miniMpr.h b/source/lib/appweb/mpr/miniMpr.h
similarity index 99%
rename from source/lib/appweb/ejs/miniMpr.h
rename to source/lib/appweb/mpr/miniMpr.h
index d431ebdc1b3be8230d5c59d9114889f2f63e4b04..a0030b25b5dded144cf3b773dc4214474269b89d 100644 (file)
--- a/source/lib/appweb/ejs/miniMpr.h
+++ b/source/lib/appweb/mpr/miniMpr.h
@@ -41,7 +41,7 @@
 
 /* allow this library to use strcpy() */
 #undef strcpy
-       #include        "config.h"
+       #include        "lib/appweb/ejs/config.h"
 
 #if BLD_APPWEB
        /*

diff --git a/source/lib/appweb/ejs/var.c b/source/lib/appweb/mpr/var.c
similarity index 100%
rename from source/lib/appweb/ejs/var.c
rename to source/lib/appweb/mpr/var.c

diff --git a/source/lib/appweb/ejs/var.h b/source/lib/appweb/mpr/var.h
similarity index 100%
rename from source/lib/appweb/ejs/var.h
rename to source/lib/appweb/mpr/var.h