From 832404e949f17bed2f011cd16307399441c3a941 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Fri, 10 Dec 2004 17:47:52 +0000 Subject: [PATCH] Don't build plugin samples until after xpcom is available. Shouldn't affect the default build. git-svn-id: svn://10.0.0.236/trunk@166568 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/Makefile.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mozilla/modules/plugin/Makefile.in b/mozilla/modules/plugin/Makefile.in index d9441ebaaed..50be6e65a4e 100644 --- a/mozilla/modules/plugin/Makefile.in +++ b/mozilla/modules/plugin/Makefile.in @@ -50,43 +50,43 @@ ifdef MOZ_PLUGINS DIRS += base/src ifneq (,$(filter gtk gtk2 xlib ,$(MOZ_WIDGET_TOOLKIT))) -DIRS += samples/unixprinting +TOOL_DIRS += samples/unixprinting endif # These subdirs rely on GTK libraries and header files, it is not # buildable on other non-GTK unix builds ifdef MOZ_ENABLE_GTK -DIRS += samples/default/unix +TOOL_DIRS += samples/default/unix ifdef ENABLE_TESTS -DIRS += samples/simple +TOOL_DIRS += samples/simple endif endif ifdef MOZ_ENABLE_GTK2 -DIRS += samples/default/unix +TOOL_DIRS += samples/default/unix endif ifeq ($(OS_ARCH),WINNT) -DIRS += samples/default/windows +TOOL_DIRS += samples/default/windows endif ifeq ($(OS_ARCH),OS2) -DIRS += samples/default/os2 +TOOL_DIRS += samples/default/os2 ifdef ENABLE_TESTS -DIRS += tools/tester/common tools/tester/os2 +TOOL_DIRS += tools/tester/common tools/tester/os2 endif endif ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -DIRS += samples/default/mac +TOOL_DIRS += samples/default/mac endif ifdef ENABLE_TESTS ifneq (,$(filter WINNT Darwin Linux,$(OS_ARCH))) -DIRS += tools/sdk +TOOL_DIRS += tools/sdk endif endif