bug 76602, sr=cls, r=edburns. modules/plugin rearranging, in preparation for old

file location cvs removal.
2001-08-10 07:35:54 +00:00 · 2001-08-10 07:35:54 +00:00 · f736866828
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@ -348,11 +348,11 @@ modules/oji/src/Makefile

 MAKEFILES_plugin="
 modules/plugin/Makefile
-modules/plugin/nglsrc/Makefile
-modules/plugin/public/Makefile
-modules/plugin/test/Makefile
-modules/plugin/SanePlugin/Makefile
-modules/plugin/default/unix/Makefile
+modules/plugin/base/src/Makefile
+modules/plugin/base/public/Makefile
+modules/plugin/samples/simple/Makefile
+modules/plugin/samples/SanePlugin/Makefile
+modules/plugin/samples/default/unix/Makefile
 "

 MAKEFILES_access_builtin="
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@ -26,16 +26,16 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS		= public nglsrc 
+DIRS		= base/public base/src 

 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds

 ifdef MOZ_ENABLE_GTK
-DIRS		+= default/unix
+DIRS		+= samples/default/unix

 ifdef ENABLE_TESTS
-DIRS		+= test
+DIRS		+= samples/simple
 endif

 endif
--- a/modules/plugin/base/public/Makefile.in
+++ b/modules/plugin/base/public/Makefile.in
@ -19,7 +19,7 @@
 # Contributor(s): 
 # 

-DEPTH		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
--- a/modules/plugin/base/public/makefile.win
+++ b/modules/plugin/base/public/makefile.win
@ -17,7 +17,7 @@



-DEPTH	= ..\..\..
+DEPTH	= ..\..\..\..

 MODULE	= plugin

--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -19,7 +19,7 @@
 # Contributor(s): 
 #

-DEPTH		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
--- a/modules/plugin/base/src/makefile.win
+++ b/modules/plugin/base/src/makefile.win
@ -19,7 +19,7 @@
 #
 # Contributor(s): 

-DEPTH=..\..\..
+DEPTH=..\..\..\..
 include <$(DEPTH)/config/config.mak>


--- a/modules/plugin/makefile.win
+++ b/modules/plugin/makefile.win
@ -21,7 +21,7 @@ DEPTH=..\..
 #//
 #//------------------------------------------------------------------------

-DIRS= public nglsrc default\windows
+DIRS= base\public base\src samples\default\windows

 #//------------------------------------------------------------------------
 #//
--- a/modules/plugin/samples/SanePlugin/Makefile.in
+++ b/modules/plugin/samples/SanePlugin/Makefile.in
@ -15,7 +15,7 @@
 ##   Rusty Lynch <rusty.lynch@intel.com>
 ############################################################################

-DEPTH		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
--- a/modules/plugin/samples/default/os2/Makefile.in
+++ b/modules/plugin/samples/default/os2/Makefile.in
@ -20,7 +20,7 @@
 #   IBM Corp.
 #

-DEPTH		= ../../../..
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
--- a/modules/plugin/samples/default/unix/Makefile.in
+++ b/modules/plugin/samples/default/unix/Makefile.in
@ -19,7 +19,7 @@
 # Contributor(s): 
 #

-DEPTH		= ../../../..
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
--- a/modules/plugin/samples/default/windows/makefile.win
+++ b/modules/plugin/samples/default/windows/makefile.win
@ -19,7 +19,7 @@
 #
 # Contributor(s): 

-DEPTH=..\..\..\..
+DEPTH=..\..\..\..\..
 include <$(DEPTH)/config/config.mak>


--- a/modules/plugin/samples/simple/Makefile.in
+++ b/modules/plugin/samples/simple/Makefile.in
@ -19,7 +19,7 @@
 # Contributor(s): 
 #

-DEPTH		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
--- a/modules/plugin/samples/simple/makefile.win
+++ b/modules/plugin/samples/simple/makefile.win
@ -24,7 +24,7 @@ MODULE		= npsimple

 LIBRARY_NAME	= npsimple

-DEPTH = ..\..\..
+DEPTH = ..\..\..\..


 XPIDLSRCS = \
--- a/modules/plugin/samples/testevents/Makefile.in
+++ b/modules/plugin/samples/testevents/Makefile.in
@ -20,7 +20,7 @@
 #   Mark Hammond <MarkH@ActiveState.com>
 #

-DEPTH		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
--- a/modules/plugin/samples/testevents/makefile.win
+++ b/modules/plugin/samples/testevents/makefile.win
@ -24,7 +24,7 @@ MODULE		= npevents

 LIBRARY_NAME	= npevents

-DEPTH = ..\..\..
+DEPTH = ..\..\..\..


 XPIDLSRCS = \