Bug 335248 - move the XUL filepicker C++ goop into libxul, r=darin

toolkit/library/libxul-config.mk

@@ -140,6 +140,11 @@ else
 DEFINES += -DMOZ_PLAINTEXT_EDITOR_ONLY
 endif
 
+ifeq (,$(filter beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
+COMPONENT_LIBS += fileview
+DEFINES += -DMOZ_FILEVIEW
+endif
+
 ifdef MOZ_PLACES
 COMPONENT_LIBS += storagecomps
 STATIC_LIBS += morkreader_s

toolkit/library/nsStaticXULComponents.cpp

@@ -171,6 +171,12 @@
 #define SYSTEMPREF_MODULES
 #endif
 
+#ifdef MOZ_FILEVIEW
+#define FILEVIEW_MODULE MODULE(nsFileViewModule)
+#else
+#define FILEVIEW_MODULE
+#endif
+
 #ifdef MOZ_PLACES
 #define PLACES_MODULES \
     MODULE(mozStorageModule)
@@ -229,6 +235,7 @@
     MODULE(nsXPIntlModule)                   \
     MODULE(Apprunner)                        \
     MODULE(CommandLineModule)                \
+    FILEVIEW_MODULE                          \
     PLACES_MODULES                           \
     XULENABLED_MODULES                       \
     MODULE(nsToolkitCompsModule)             \

xpfe/components/Makefile.in

@@ -75,9 +75,6 @@ DIRS += \
         directory \
         resetPref \
         killAll \
-        $(NULL)
-
-TOOL_DIRS = \
         filepicker \
         $(NULL)
 

xpfe/components/filepicker/src/Makefile.in

@@ -50,7 +50,7 @@ SHORT_LIBNAME	= fileview
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsFileViewModule
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY	= 1
 
 PACKAGE_FILE = filepicker.pkg