changes to support using OJI with raptor.

modules/oji/Makefile

@@ -1,31 +0,0 @@
-#//------------------------------------------------------------------------
-#//
-#// Makefile to build the MODULES/OJI tree
-#//
-#//------------------------------------------------------------------------
-
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
-DEPTH=../..
-
-#//------------------------------------------------------------------------
-#//
-#// Specify any "command" targets. (ie. DIRS, INSTALL_FILES, ...)
-#// (these must come before the common makefiles are included)
-#// 
-#// DIRS          - There are subdirectories to process
-#//
-#//------------------------------------------------------------------------
-DIRS= public src
-
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
-include $(DEPTH)/config/rules.mk
-

modules/oji/Makefile.in

@@ -25,7 +25,11 @@ include $(DEPTH)/config/autoconf.mk
 #// DIRS          - There are subdirectories to process
 #//
 #//------------------------------------------------------------------------
+ifndef NGLAYOUT_PLUGINS
 DIRS= public src
+else
+DIRS= public
+endif
 
 #//------------------------------------------------------------------------
 #//

modules/oji/makefile.win

@@ -20,8 +20,11 @@ DEPTH=..\..
 #// DIRS          - There are subdirectories to process
 #//
 #//------------------------------------------------------------------------
+!if !defined(NGLAYOUT_PLUGINS)
 DIRS= public src
-
+!else
+DIRS= public
+!endif
 #//------------------------------------------------------------------------
 #//
 #// Include the common makefile rules