Turn on guimgr in Unix build

editor/Makefile.in

@@ -25,8 +25,8 @@ include $(DEPTH)/config/autoconf.mk
 DIRS = public
 
 ifdef MOZ_EDITOR
-DIRS += core
-# Add "DIRS += guimgr" after building on all platforms
+DIRS += core guimgr
+
 ifdef ENABLE_TESTS
 DIRS += tests
 endif

editor/guimgr/public/Makefile.in

@@ -26,7 +26,7 @@ DEFINES =
 
 EXPORTS =               \
     nsIEditGuiManager.h \
-    nsIGuiMgrFactory.h  \
+    nsIGuiManagerFactory.h  \
     $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

editor/guimgr/src/Makefile.in

@@ -1,44 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=../../..
-
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME = editguimgr
-
-CPPSRCS =                   \
-	nsEditGuiManager.cpp	\
-	nsEditGuiManagerFactory.cpp \
-    $(NULL)
-
-MODULE = editguimgr
-
-REQUIRES = xpcom
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
-
-include $(topsrcdir)/config/rules.mk
-
-test:
-	@echo OS_ARCH = $(OS_ARCH)