From 4a3c11f7536095e89b9dac0759641188e5c5dedb Mon Sep 17 00:00:00 2001 From: "peterv%propagandism.org" Date: Tue, 4 May 2004 07:53:15 +0000 Subject: [PATCH] Fix for bug 235747 (Move parser stuff into mozilla/parser). r=cls, sr=jst. git-svn-id: svn://10.0.0.236/trunk@155906 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/parser/Makefile.in | 47 +++++++++++++++++++ mozilla/parser/expat/Makefile.in | 4 +- mozilla/parser/expat/lib/Makefile.in | 6 +-- mozilla/parser/htmlparser/Makefile.in | 2 +- mozilla/parser/htmlparser/public/Makefile.in | 2 +- mozilla/parser/htmlparser/robot/Makefile.in | 2 +- .../parser/htmlparser/robot/test/Makefile.in | 2 +- mozilla/parser/htmlparser/src/Makefile.in | 3 +- mozilla/parser/htmlparser/tests/Makefile.in | 2 +- .../htmlparser/tests/grabpage/Makefile.in | 2 +- .../parser/htmlparser/tests/html/Makefile.in | 2 +- .../htmlparser/tests/logparse/Makefile.in | 2 +- .../htmlparser/tests/outsinks/Makefile.in | 2 +- 13 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 mozilla/parser/Makefile.in diff --git a/mozilla/parser/Makefile.in b/mozilla/parser/Makefile.in new file mode 100644 index 00000000000..3ca0d0019e4 --- /dev/null +++ b/mozilla/parser/Makefile.in @@ -0,0 +1,47 @@ +# ***** 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.org code. +# +# The Initial Developer of the Original Code is +# Peter Van der Beken. +# Portions created by the Initial Developer are Copyright (C) 2004 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Peter Van der Beken +# +# Alternatively, the contents of this file may be used under the terms of +# either 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 + +DIRS = expat htmlparser + +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/parser/expat/Makefile.in b/mozilla/parser/expat/Makefile.in index ad55090f079..7ec81acacef 100644 --- a/mozilla/parser/expat/Makefile.in +++ b/mozilla/parser/expat/Makefile.in @@ -19,7 +19,7 @@ # Contributor(s): # -DEPTH = .. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -27,6 +27,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = expat -DIRS = xmlparse xmltok +DIRS = lib include $(topsrcdir)/config/rules.mk diff --git a/mozilla/parser/expat/lib/Makefile.in b/mozilla/parser/expat/lib/Makefile.in index 45b7da85232..633b5ff63c7 100644 --- a/mozilla/parser/expat/lib/Makefile.in +++ b/mozilla/parser/expat/lib/Makefile.in @@ -34,7 +34,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -46,12 +46,12 @@ LIBRARY_NAME = expat_s CSRCS = \ xmlparse.c \ + xmlrole.c \ + xmltok.c \ $(NULL) EXPORTS = xmlparse.h -LOCAL_INCLUDES = -I$(srcdir)/../xmltok - # We want only the static lib, not the shared lib FORCE_STATIC_LIB = 1 diff --git a/mozilla/parser/htmlparser/Makefile.in b/mozilla/parser/htmlparser/Makefile.in index b17c6586c2f..4cc4141d924 100644 --- a/mozilla/parser/htmlparser/Makefile.in +++ b/mozilla/parser/htmlparser/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = .. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/public/Makefile.in b/mozilla/parser/htmlparser/public/Makefile.in index 9fca68d449e..67456cb32b0 100644 --- a/mozilla/parser/htmlparser/public/Makefile.in +++ b/mozilla/parser/htmlparser/public/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in index 8ec90e432d6..bcaf576aefe 100644 --- a/mozilla/parser/htmlparser/robot/Makefile.in +++ b/mozilla/parser/htmlparser/robot/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in index bdc6359b229..dfaf25d532b 100644 --- a/mozilla/parser/htmlparser/robot/test/Makefile.in +++ b/mozilla/parser/htmlparser/robot/test/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index 0b473baf8d2..5e1a89efe76 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/parser/htmlparser/src/Makefile.in @@ -34,7 +34,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -67,7 +67,6 @@ REQUIRES = xpcom \ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/$(LIB_PREFIX)expat_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)xmltok_s.$(LIB_SUFFIX) \ $(NULL) ifdef MOZ_PERF_METRICS diff --git a/mozilla/parser/htmlparser/tests/Makefile.in b/mozilla/parser/htmlparser/tests/Makefile.in index 019f9a0d2a2..db02253a76a 100644 --- a/mozilla/parser/htmlparser/tests/Makefile.in +++ b/mozilla/parser/htmlparser/tests/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/tests/grabpage/Makefile.in b/mozilla/parser/htmlparser/tests/grabpage/Makefile.in index fa91d3307d4..9f142b6881a 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/Makefile.in +++ b/mozilla/parser/htmlparser/tests/grabpage/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/tests/html/Makefile.in b/mozilla/parser/htmlparser/tests/html/Makefile.in index f9247fdd5ba..90f2a6f799c 100644 --- a/mozilla/parser/htmlparser/tests/html/Makefile.in +++ b/mozilla/parser/htmlparser/tests/html/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/tests/logparse/Makefile.in b/mozilla/parser/htmlparser/tests/logparse/Makefile.in index 012372e17ff..e367f4e7a6e 100644 --- a/mozilla/parser/htmlparser/tests/logparse/Makefile.in +++ b/mozilla/parser/htmlparser/tests/logparse/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in index 81d55db3a38..89c34bbf9f3 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in +++ b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@