missing part of backing out 81414, yac

This commit is contained in:
axel%pike.org 2005-11-02 07:36:30 +00:00
parent 6741f4d562
commit 6afbad4840
5 changed files with 13 additions and 13 deletions

View File

@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = base net xml xpath xslt DIRS = base net xml xpath xslt
ifdef TX_EXE ifndef MOZ_XSL
DIRS += main DIRS += main
endif endif

View File

@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE ifdef MOZ_XSL
MODULE = transformiix MODULE = transformiix
REQUIRES = string xpcom REQUIRES = string xpcom
endif endif
@ -45,11 +45,11 @@ CPPSRCS = ArrayList.cpp \
StringList.cpp \ StringList.cpp \
Tokenizer.cpp Tokenizer.cpp
ifdef TX_EXE ifdef MOZ_XSL
CPPSRCS += MozillaString.cpp
else
CPPSRCS += CommandLineUtils.cpp \ CPPSRCS += CommandLineUtils.cpp \
TxString.cpp TxString.cpp
else
CPPSRCS += MozillaString.cpp
endif endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -23,11 +23,11 @@
* Bob Miller, kbob@oblix.com * Bob Miller, kbob@oblix.com
* -- plugged core leak. * -- plugged core leak.
* *
* $Id: txList.cpp,v 1.7 2005/11/02 07:33:48 axel%pike.org Exp $ * $Id: txList.cpp,v 1.8 2005/11/02 07:33:49 axel%pike.org Exp $
*/ */
#include "List.h" #include "List.h"
#ifdef TX_EXE #ifndef MOZ_XSL
#include <iostream.h> #include <iostream.h>
#endif #endif
@ -38,7 +38,7 @@
/** /**
* Default constructor for a List; * Default constructor for a List;
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a> * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.7 $ $Date: 2005/11/02 07:33:48 $ * @version $Revision: 1.8 $ $Date: 2005/11/02 07:33:49 $
**/ **/
List::List() { List::List() {

View File

@ -26,13 +26,13 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE ifdef MOZ_XSL
MODULE = transformiix MODULE = transformiix
REQUIRES = string xpcom dom layout widget REQUIRES = string xpcom dom layout widget
endif endif
DIRS = dom parser util DIRS = dom parser util
ifdef TX_EXE ifndef MOZ_XSL
DIRS += printer DIRS += printer
endif endif

View File

@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE ifdef MOZ_XSL
MODULE = transformiix MODULE = transformiix
REQUIRES = string xpcom dom layout widget caps js REQUIRES = string xpcom dom layout widget caps js
endif endif
@ -65,7 +65,7 @@ CPPSRCS = AdditiveExpr.cpp \
UnionExpr.cpp \ UnionExpr.cpp \
VariableRefExpr.cpp \ VariableRefExpr.cpp \
XPathNames.cpp XPathNames.cpp
ifndef TX_EXE ifdef MOZ_XSL
CPPSRCS += XPathProcessor.cpp \ CPPSRCS += XPathProcessor.cpp \
nsNodeSet.cpp nsNodeSet.cpp
endif endif
@ -76,7 +76,7 @@ INCLUDES += -I$(srcdir)/../base -I$(srcdir)/../xml \
-I$(srcdir)/../xml/dom -I$(srcdir)/../xml/util \ -I$(srcdir)/../xml/dom -I$(srcdir)/../xml/util \
-I$(srcdir)/../xslt -I$(srcdir)/../xslt/util \ -I$(srcdir)/../xslt -I$(srcdir)/../xslt/util \
-I$(srcdir)/../xslt/functions -I$(srcdir)/../xslt/functions
ifndef TX_EXE ifdef MOZ_XSL
INCLUDES += -I$(srcdir) INCLUDES += -I$(srcdir)
endif endif