diff --git a/allmakefiles.sh b/allmakefiles.sh index ae36f970a41..db7406dfab7 100755 --- 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=" diff --git a/modules/plugin/Makefile.in b/modules/plugin/Makefile.in index e3c294f8e01..17492b3e5b2 100644 --- 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 diff --git a/modules/plugin/base/public/Makefile.in b/modules/plugin/base/public/Makefile.in index 45ff7778895..b22397a2649 100644 --- 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@ diff --git a/modules/plugin/base/public/makefile.win b/modules/plugin/base/public/makefile.win index 2a8e7a09b85..a34f1e5f1c7 100644 --- a/modules/plugin/base/public/makefile.win +++ b/modules/plugin/base/public/makefile.win @@ -17,7 +17,7 @@ -DEPTH = ..\..\.. +DEPTH = ..\..\..\.. MODULE = plugin diff --git a/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in index a82fd4d795b..712e35eb842 100644 --- 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@ diff --git a/modules/plugin/base/src/makefile.win b/modules/plugin/base/src/makefile.win index 43c59fbc648..aed906bd3a9 100644 --- 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> diff --git a/modules/plugin/makefile.win b/modules/plugin/makefile.win index fce3bf937b6..3fdb1903db7 100644 --- 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 #//------------------------------------------------------------------------ #// diff --git a/modules/plugin/samples/SanePlugin/Makefile.in b/modules/plugin/samples/SanePlugin/Makefile.in index 922e23b440c..c03572355cc 100644 --- a/modules/plugin/samples/SanePlugin/Makefile.in +++ b/modules/plugin/samples/SanePlugin/Makefile.in @@ -15,7 +15,7 @@ ## Rusty Lynch ############################################################################ -DEPTH = ../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/modules/plugin/samples/default/os2/Makefile.in b/modules/plugin/samples/default/os2/Makefile.in index 71f1a9c6e50..93de5920cc1 100644 --- 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@ diff --git a/modules/plugin/samples/default/unix/Makefile.in b/modules/plugin/samples/default/unix/Makefile.in index 0d18d6db6ef..06d30717f50 100644 --- 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@ diff --git a/modules/plugin/samples/default/windows/makefile.win b/modules/plugin/samples/default/windows/makefile.win index 7b79e2aa12b..73e0a58cc2b 100644 --- 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> diff --git a/modules/plugin/samples/simple/Makefile.in b/modules/plugin/samples/simple/Makefile.in index 2ffb5d108f5..b467d9de8d3 100644 --- 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@ diff --git a/modules/plugin/samples/simple/makefile.win b/modules/plugin/samples/simple/makefile.win index cca12ce5266..064113158b5 100644 --- 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 = \ diff --git a/modules/plugin/samples/testevents/Makefile.in b/modules/plugin/samples/testevents/Makefile.in index 2922f019476..fe9195fc36e 100644 --- a/modules/plugin/samples/testevents/Makefile.in +++ b/modules/plugin/samples/testevents/Makefile.in @@ -20,7 +20,7 @@ # Mark Hammond # -DEPTH = ../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/modules/plugin/samples/testevents/makefile.win b/modules/plugin/samples/testevents/makefile.win index 71feda387f7..9c345b6339a 100644 --- 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 = \