Cleaned it up and eliminated the pointless #!gmake.

This commit is contained in:
briano%netscape.com 1999-09-02 00:30:07 +00:00
Родитель 275512cc1a
Коммит 64f859af0e
15 изменённых файлов: 238 добавлений и 271 удалений

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,16 +13,15 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ..
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = xmlparse xmltok # xmlwf
include $(topsrcdir)/config/config.mk
DIRS = xmlparse xmltok
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,36 +13,28 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH=../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = expat_s
MODULE = expat
LIBRARY_NAME = expat_s
ifdef MOZ_STRIP_NOT_EXPORTED
DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
endif
CSRCS = \
hashtable.c \
xmlparse.c \
$(NULL)
CSRCS = \
hashtable.c \
xmlparse.c \
$(NULL)
EXPORTS = xmlparse.h
EXPORTS = \
xmlparse.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
MODULE=expat
LOCAL_INCLUDES = -I$(srcdir)/../xmltok
MKSHLIB :=
LOCAL_INCLUDES = -I$(srcdir)/../xmltok
# We want only the static lib, not the shared lib
override NO_SHARED_LIB=1
@ -51,3 +42,7 @@ override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
ifdef MOZ_STRIP_NOT_EXPORTED
DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
endif

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,31 +13,22 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH=../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = xmltok_s
MODULE = expat
LIBRARY_NAME = xmltok_s
ifdef MOZ_STRIP_NOT_EXPORTED
DEFINES += -DXMLTOKAPI="__attribute__ ((dllexport))"
endif
CSRCS = \
xmltok.c \
xmlrole.c \
$(NULL)
EXPORTS = \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
MKSHLIB :=
CSRCS = \
xmltok.c \
xmlrole.c \
$(NULL)
# We want only the static lib, not the shared lib
override NO_SHARED_LIB=1
@ -46,3 +36,7 @@ override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
ifdef MOZ_STRIP_NOT_EXPORTED
DEFINES += -DXMLTOKAPI="__attribute__ ((dllexport))"
endif

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,20 +13,19 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ..
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = src
DIRS = src
ifdef ENABLE_TESTS
DIRS += robot
DIRS += robot
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,96 +13,96 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = .:@srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = raptorhtmlpars
LIBRARY_NAME = raptorhtmlpars
MODULE = htmlparser
DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
REQUIRES = xpcom netlib raptor
CPPSRCS= \
nsDTDUtils.cpp \
nsHTMLTokenizer.cpp \
nsXMLTokenizer.cpp \
nsExpatTokenizer.cpp \
nsElementTable.cpp \
CNavDTD.cpp \
COtherDTD.cpp \
CRtfDTD.cpp \
nsHTMLEntities.cpp \
nsHTMLNullSink.cpp \
nsHTMLTags.cpp \
nsHTMLTokens.cpp \
nsLoggingSink.cpp \
nsParser.cpp \
CParserContext.cpp \
nsParserFactory.cpp \
nsParserNode.cpp \
nsScanner.cpp \
nsToken.cpp \
nsTokenHandler.cpp \
nsHTMLContentSinkStream.cpp \
nsHTMLToTXTSinkStream.cpp \
nsValidDTD.cpp \
nsWellFormedDTD.cpp \
nsViewSourceHTML.cpp \
nsXIFDTD.cpp \
nsExpatDTD.cpp \
$(NULL)
CPPSRCS = \
nsDTDUtils.cpp \
nsHTMLTokenizer.cpp \
nsXMLTokenizer.cpp \
nsExpatTokenizer.cpp \
nsElementTable.cpp \
CNavDTD.cpp \
COtherDTD.cpp \
CRtfDTD.cpp \
nsHTMLEntities.cpp \
nsHTMLNullSink.cpp \
nsHTMLTags.cpp \
nsHTMLTokens.cpp \
nsLoggingSink.cpp \
nsParser.cpp \
CParserContext.cpp \
nsParserFactory.cpp \
nsParserNode.cpp \
nsScanner.cpp \
nsToken.cpp \
nsTokenHandler.cpp \
nsHTMLContentSinkStream.cpp \
nsHTMLToTXTSinkStream.cpp \
nsValidDTD.cpp \
nsWellFormedDTD.cpp \
nsViewSourceHTML.cpp \
nsXIFDTD.cpp \
nsExpatDTD.cpp \
$(NULL)
#
# Disable some DTD debugging code in the parser that
# breaks on some compilers because of some broken
# streams code in prstrm.cpp.
#
ifndef MOZ_DISABLE_DTD_DEBUG
CPPSRCS += nsDTDDebug.cpp prstrm.cpp
CPPSRCS += nsDTDDebug.cpp prstrm.cpp
endif
EXPORTS = \
nshtmlpars.h \
nsIContentSink.h \
nsITokenizer.h \
nsIExpatTokenizer.h \
nsIHTMLContentSink.h \
nsHTMLContentSinkStream.h \
nsIHTMLFragmentContentSink.h \
nsHTMLToTXTSinkStream.h \
nsHTMLEntities.h \
nsHTMLEntityList.h \
nsHTMLTags.h \
nsHTMLTagList.h \
nsHTMLTokens.h \
nsILoggingSink.h \
nsIParserNode.h \
nsIParser.h \
nsParser.h \
nsIDTD.h \
nsIDTDDebug.h \
nsIParserFilter.h \
nsToken.h \
CNavDTD.h \
COtherDTD.h \
nsWellFormedDTD.h \
nsValidDTD.h \
CRtfDTD.h \
nsXIFDTD.h \
nsParserCIID.h \
nsExpatDTD.h \
nsParserError.h \
nsIElementObserver.h \
$(NULL)
EXPORTS = \
nshtmlpars.h \
nsIContentSink.h \
nsITokenizer.h \
nsIExpatTokenizer.h \
nsIHTMLContentSink.h \
nsHTMLContentSinkStream.h \
nsIHTMLFragmentContentSink.h \
nsHTMLToTXTSinkStream.h \
nsHTMLEntities.h \
nsHTMLEntityList.h \
nsHTMLTags.h \
nsHTMLTagList.h \
nsHTMLTokens.h \
nsILoggingSink.h \
nsIParserNode.h \
nsIParser.h \
nsParser.h \
nsIDTD.h \
nsIDTDDebug.h \
nsIParserFilter.h \
nsToken.h \
CNavDTD.h \
COtherDTD.h \
nsWellFormedDTD.h \
nsValidDTD.h \
CRtfDTD.h \
nsXIFDTD.h \
nsParserCIID.h \
nsExpatDTD.h \
nsParserError.h \
nsIElementObserver.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
MODULE=htmlparser
REQUIRES = xpcom netlib raptor
EXTRA_DSO_LDOPTS =\
EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lexpat_s \
-lxmltok_s \
@ -112,5 +111,7 @@ EXTRA_DSO_LDOPTS =\
include $(topsrcdir)/config/rules.mk
INCLUDES += -I.
DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
INCLUDES += -I.

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,16 +13,15 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = logparse
include $(topsrcdir)/config/config.mk
DIRS = logparse
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,19 +13,18 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../../..
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = grabpage
PROGRAM = grabpage
CPPSRCS = \
grabpage.cpp \
$(NULL)
CPPSRCS = grabpage.cpp
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,16 +13,15 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ..
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = xmlparse xmltok # xmlwf
include $(topsrcdir)/config/config.mk
DIRS = xmlparse xmltok
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,36 +13,28 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH=../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = expat_s
MODULE = expat
LIBRARY_NAME = expat_s
ifdef MOZ_STRIP_NOT_EXPORTED
DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
endif
CSRCS = \
hashtable.c \
xmlparse.c \
$(NULL)
CSRCS = \
hashtable.c \
xmlparse.c \
$(NULL)
EXPORTS = xmlparse.h
EXPORTS = \
xmlparse.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
MODULE=expat
LOCAL_INCLUDES = -I$(srcdir)/../xmltok
MKSHLIB :=
LOCAL_INCLUDES = -I$(srcdir)/../xmltok
# We want only the static lib, not the shared lib
override NO_SHARED_LIB=1
@ -51,3 +42,7 @@ override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
ifdef MOZ_STRIP_NOT_EXPORTED
DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
endif

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,20 +13,19 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ..
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = src
DIRS = src
ifdef ENABLE_TESTS
DIRS += robot
DIRS += robot
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,96 +13,96 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = .:@srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = raptorhtmlpars
LIBRARY_NAME = raptorhtmlpars
MODULE = htmlparser
DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
REQUIRES = xpcom netlib raptor
CPPSRCS= \
nsDTDUtils.cpp \
nsHTMLTokenizer.cpp \
nsXMLTokenizer.cpp \
nsExpatTokenizer.cpp \
nsElementTable.cpp \
CNavDTD.cpp \
COtherDTD.cpp \
CRtfDTD.cpp \
nsHTMLEntities.cpp \
nsHTMLNullSink.cpp \
nsHTMLTags.cpp \
nsHTMLTokens.cpp \
nsLoggingSink.cpp \
nsParser.cpp \
CParserContext.cpp \
nsParserFactory.cpp \
nsParserNode.cpp \
nsScanner.cpp \
nsToken.cpp \
nsTokenHandler.cpp \
nsHTMLContentSinkStream.cpp \
nsHTMLToTXTSinkStream.cpp \
nsValidDTD.cpp \
nsWellFormedDTD.cpp \
nsViewSourceHTML.cpp \
nsXIFDTD.cpp \
nsExpatDTD.cpp \
$(NULL)
CPPSRCS = \
nsDTDUtils.cpp \
nsHTMLTokenizer.cpp \
nsXMLTokenizer.cpp \
nsExpatTokenizer.cpp \
nsElementTable.cpp \
CNavDTD.cpp \
COtherDTD.cpp \
CRtfDTD.cpp \
nsHTMLEntities.cpp \
nsHTMLNullSink.cpp \
nsHTMLTags.cpp \
nsHTMLTokens.cpp \
nsLoggingSink.cpp \
nsParser.cpp \
CParserContext.cpp \
nsParserFactory.cpp \
nsParserNode.cpp \
nsScanner.cpp \
nsToken.cpp \
nsTokenHandler.cpp \
nsHTMLContentSinkStream.cpp \
nsHTMLToTXTSinkStream.cpp \
nsValidDTD.cpp \
nsWellFormedDTD.cpp \
nsViewSourceHTML.cpp \
nsXIFDTD.cpp \
nsExpatDTD.cpp \
$(NULL)
#
# Disable some DTD debugging code in the parser that
# breaks on some compilers because of some broken
# streams code in prstrm.cpp.
#
ifndef MOZ_DISABLE_DTD_DEBUG
CPPSRCS += nsDTDDebug.cpp prstrm.cpp
CPPSRCS += nsDTDDebug.cpp prstrm.cpp
endif
EXPORTS = \
nshtmlpars.h \
nsIContentSink.h \
nsITokenizer.h \
nsIExpatTokenizer.h \
nsIHTMLContentSink.h \
nsHTMLContentSinkStream.h \
nsIHTMLFragmentContentSink.h \
nsHTMLToTXTSinkStream.h \
nsHTMLEntities.h \
nsHTMLEntityList.h \
nsHTMLTags.h \
nsHTMLTagList.h \
nsHTMLTokens.h \
nsILoggingSink.h \
nsIParserNode.h \
nsIParser.h \
nsParser.h \
nsIDTD.h \
nsIDTDDebug.h \
nsIParserFilter.h \
nsToken.h \
CNavDTD.h \
COtherDTD.h \
nsWellFormedDTD.h \
nsValidDTD.h \
CRtfDTD.h \
nsXIFDTD.h \
nsParserCIID.h \
nsExpatDTD.h \
nsParserError.h \
nsIElementObserver.h \
$(NULL)
EXPORTS = \
nshtmlpars.h \
nsIContentSink.h \
nsITokenizer.h \
nsIExpatTokenizer.h \
nsIHTMLContentSink.h \
nsHTMLContentSinkStream.h \
nsIHTMLFragmentContentSink.h \
nsHTMLToTXTSinkStream.h \
nsHTMLEntities.h \
nsHTMLEntityList.h \
nsHTMLTags.h \
nsHTMLTagList.h \
nsHTMLTokens.h \
nsILoggingSink.h \
nsIParserNode.h \
nsIParser.h \
nsParser.h \
nsIDTD.h \
nsIDTDDebug.h \
nsIParserFilter.h \
nsToken.h \
CNavDTD.h \
COtherDTD.h \
nsWellFormedDTD.h \
nsValidDTD.h \
CRtfDTD.h \
nsXIFDTD.h \
nsParserCIID.h \
nsExpatDTD.h \
nsParserError.h \
nsIElementObserver.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
MODULE=htmlparser
REQUIRES = xpcom netlib raptor
EXTRA_DSO_LDOPTS =\
EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lexpat_s \
-lxmltok_s \
@ -112,5 +111,7 @@ EXTRA_DSO_LDOPTS =\
include $(topsrcdir)/config/rules.mk
INCLUDES += -I.
DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
INCLUDES += -I.

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,16 +13,15 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = logparse
include $(topsrcdir)/config/config.mk
DIRS = logparse
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,19 +13,18 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../../..
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = grabpage
PROGRAM = grabpage
CPPSRCS = \
grabpage.cpp \
$(NULL)
CPPSRCS = grabpage.cpp
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,16 +13,15 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ..
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
DIRS = public src
DIRS = public src
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,4 +1,3 @@
#!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
@ -14,29 +13,29 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH=../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES += -D_IMPL_NS_UI
MODULE = raptor
EXPORTS = \
nsIView.h \
nsIViewManager.h \
nsIScrollableView.h \
nsViewsCID.h \
nsIViewObserver.h \
nsIClipView.h \
$(NULL)
EXPORTS = \
nsIView.h \
nsIViewManager.h \
nsIScrollableView.h \
nsViewsCID.h \
nsIViewObserver.h \
nsIClipView.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
MODULE = raptor
include $(topsrcdir)/config/config.mk
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_UI