Bug 484766. Clean up MathML directory structure. r=karlt,ted

--HG--
extra : rebase_source : 1c88ebe3a41dee12a982442ad2e711aa287ed55f

content/mathml/content/src/Makefile.in

@@ -76,6 +76,12 @@ EXPORTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+EXPORT_RESOURCE_CONTENT = \
+		$(srcdir)/mathml.dtd \
+		$(NULL)
+libs::
+	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd
+
 INCLUDES += 	\
 		-I$(srcdir)/../../../shared/public \
 		-I$(srcdir)/../../../base/src \

layout/Makefile.in

@@ -60,8 +60,7 @@ endif
 
 ifdef MOZ_MATHML
 PARALLEL_DIRS += \
-  mathml/content/src \
-  mathml/base/src \
+  mathml \
   $(NULL)
 endif
 

layout/base/Makefile.in

@@ -184,8 +184,7 @@ LOCAL_INCLUDES += \
 
 ifdef MOZ_MATHML
 LOCAL_INCLUDES += \
-        -I$(srcdir)/../mathml/content/src \
-        -I$(srcdir)/../mathml/base/src
+        -I$(srcdir)/../mathml
 endif
 
 ifdef MOZ_SVG

layout/build/Makefile.in

@@ -194,8 +194,7 @@ endif
 
 ifdef MOZ_MATHML
 SHARED_LIBRARY_LIBS += \
-		../mathml/content/src/$(LIB_PREFIX)gkmathmlcon_s.$(LIB_SUFFIX) \
-		../mathml/base/src/$(LIB_PREFIX)gkmathmlbase_s.$(LIB_SUFFIX) \
+		../mathml/$(LIB_PREFIX)gkmathml_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/mathml/content/src/$(LIB_PREFIX)gkcontentmathml_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
@@ -314,7 +313,7 @@ LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   $(NULL)
 
 ifdef MOZ_MATHML
-LOCAL_INCLUDES	+= -I$(srcdir)/../mathml/content/src
+LOCAL_INCLUDES	+= -I$(srcdir)/../mathml
 endif
 
 ifdef MOZ_SVG

layout/mathml/Makefile.in

@@ -37,7 +37,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH=../../../..
+DEPTH=../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -45,7 +45,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = layout
-LIBRARY_NAME = gkmathmlbase_s
+LIBRARY_NAME = gkmathml_s
 LIBXUL_LIBRARY	= 1
 
 REQUIRES	= xpcom \
@@ -67,20 +67,21 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 LOCAL_INCLUDES = \
-	-I$(srcdir)/../../../style \
-	-I$(srcdir)/../../../base \
-	-I$(srcdir)/../../../generic \
-	-I$(srcdir)/../../../tables \
-	-I$(srcdir)/../../content/src \
+	-I$(srcdir)/../style \
+	-I$(srcdir)/../base \
+	-I$(srcdir)/../generic \
+	-I$(srcdir)/../tables \
+	-I$(srcdir)/content/src \
 	-I$(topsrcdir)/content/base/src \
 	-I$(topsrcdir)/content/mathml/content/src \
-	-I$(srcdir)/../../../xul/base/src \
+	-I$(srcdir)/../xul/base/src \
 	$(NULL)
 
 CPPSRCS =         nsMathMLChar.cpp		        \
                   nsMathMLFrame.cpp		\
                   nsMathMLContainerFrame.cpp		\
                   nsMathMLForeignFrameWrapper.cpp		\
+                  nsMathMLOperators.cpp \
                   nsMathMLTokenFrame.cpp		\
                   nsMathMLmoFrame.cpp			\
                   nsMathMLmrowFrame.cpp		        \
@@ -111,6 +112,9 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+libs::
+	$(INSTALL) $(srcdir)/mathml.css $(DIST)/bin/res
+
 font_properties = \
 	mathfontUnicode.properties \
 	mathfontSTIXNonUnicode.properties \

layout/mathml/content/src/Makefile.in

@@ -1,80 +0,0 @@
-#!gmake
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla MathML Project.
-#
-# The Initial Developer of the Original Code is
-# Heriot-Watt University, Edinburgh.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   David J. Fiddes <D.J.Fiddes@hw.ac.uk>
-#   Roger B. Sidje <rbs@maths.uq.edu.au>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE	= layout
-LIBRARY_NAME = gkmathmlcon_s
-LIBXUL_LIBRARY	= 1
-
-REQUIRES	= xpcom \
-		  string \
-		  necko \
-		  gfx \
-		  $(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-CPPSRCS =				\
-        nsMathMLOperators.cpp \
-	$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-EXPORT_RESOURCE_CONTENT = \
-		$(srcdir)/mathml.dtd \
-		$(NULL)
-libs::
-	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd
-	$(INSTALL) $(srcdir)/mathml.css $(DIST)/bin/res
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_CONTENT) $(DESTDIR)$(mozappdir)/res/dtd
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/mathml.css $(DESTDIR)$(mozappdir)/res
-
-DEFINES += -D_IMPL_NS_LAYOUT

toolkit/toolkit-makefiles.sh

@@ -979,8 +979,7 @@ fi
 if [ "$MOZ_MATHML" ]; then
   add_makefiles "
     intl/uconv/ucvmath/Makefile
-    layout/mathml/base/src/Makefile
-    layout/mathml/content/src/Makefile
+    layout/mathml/Makefile
   "
 fi