Fix up makefiles; previous patch was mis-applied.

This commit is contained in:
norris%netscape.com 1999-10-04 21:31:21 +00:00
Родитель 1ca3e95ba7
Коммит 312ce3abcc
3 изменённых файлов: 25 добавлений и 40 удалений

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

@ -98,21 +98,6 @@ helpmessage : FORCE
all : jars examples all : jars examples
$(PATH_PREFIX)/optimizer/Block.java \
$(PATH_PREFIX)/optimizer/Codegen.java \
$(PATH_PREFIX)/optimizer/DataFlowBitSet.java \
$(PATH_PREFIX)/optimizer/FatBlock.java \
$(PATH_PREFIX)/optimizer/JavaScriptClassLoader.java\
$(PATH_PREFIX)/optimizer/OptClassNameHelper.java\
$(PATH_PREFIX)/optimizer/OptFunctionNode.java \
$(PATH_PREFIX)/optimizer/OptIRFactory.java \
$(PATH_PREFIX)/optimizer/OptLocalVariable.java \
$(PATH_PREFIX)/optimizer/OptRuntime.java \
$(PATH_PREFIX)/optimizer/OptTransformer.java \
$(PATH_PREFIX)/optimizer/OptVariableTable.java \
$(PATH_PREFIX)/optimizer/Optimizer.java \
$(PATH_PREFIX)/optimizer/StmtNodeIterator.java \
$(PATH_PREFIX)/optimizer/TypeEvent.java \
jars : $(JARS) jars : $(JARS)
fast : fast_$(JS_JAR) $(JSTOOLS_JAR) fast : fast_$(JS_JAR) $(JSTOOLS_JAR)

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

@ -79,7 +79,7 @@ SOURCES = \
$(PATH_PREFIX)/NotAFunctionException.java \ $(PATH_PREFIX)/NotAFunctionException.java \
$(PATH_PREFIX)/Parser.java \ $(PATH_PREFIX)/Parser.java \
$(PATH_PREFIX)/PreorderNodeIterator.java \ $(PATH_PREFIX)/PreorderNodeIterator.java \
$(PATH_PREFIX)/PropertyException.java \ $(PATH_PREFIX)/PropertyException.java \
$(PATH_PREFIX)/RegExpProxy.java \ $(PATH_PREFIX)/RegExpProxy.java \
$(PATH_PREFIX)/Script.java \ $(PATH_PREFIX)/Script.java \
$(PATH_PREFIX)/ScriptRuntime.java \ $(PATH_PREFIX)/ScriptRuntime.java \
@ -98,21 +98,21 @@ SOURCES = \
$(PATH_PREFIX)/regexp/NativeRegExpCtor.java \ $(PATH_PREFIX)/regexp/NativeRegExpCtor.java \
$(PATH_PREFIX)/regexp/RegExpImpl.java \ $(PATH_PREFIX)/regexp/RegExpImpl.java \
$(PATH_PREFIX)/regexp/SubString.java \ $(PATH_PREFIX)/regexp/SubString.java \
$(PATH_PREFIX)/optimizer/Block.java \ $(PATH_PREFIX)/optimizer/Block.java \
$(PATH_PREFIX)/optimizer/Codegen.java \ $(PATH_PREFIX)/optimizer/Codegen.java \
$(PATH_PREFIX)/optimizer/DataFlowBitSet.java \ $(PATH_PREFIX)/optimizer/DataFlowBitSet.java \
$(PATH_PREFIX)/optimizer/FatBlock.java \ $(PATH_PREFIX)/optimizer/FatBlock.java \
$(PATH_PREFIX)/optimizer/JavaScriptClassLoader.java\ $(PATH_PREFIX)/optimizer/JavaScriptClassLoader.java\
$(PATH_PREFIX)/optimizer/OptClassNameHelper.java\ $(PATH_PREFIX)/optimizer/OptClassNameHelper.java\
$(PATH_PREFIX)/optimizer/OptFunctionNode.java \ $(PATH_PREFIX)/optimizer/OptFunctionNode.java \
$(PATH_PREFIX)/optimizer/OptIRFactory.java \ $(PATH_PREFIX)/optimizer/OptIRFactory.java \
$(PATH_PREFIX)/optimizer/OptLocalVariable.java \ $(PATH_PREFIX)/optimizer/OptLocalVariable.java \
$(PATH_PREFIX)/optimizer/OptRuntime.java \ $(PATH_PREFIX)/optimizer/OptRuntime.java \
$(PATH_PREFIX)/optimizer/OptTransformer.java \ $(PATH_PREFIX)/optimizer/OptTransformer.java \
$(PATH_PREFIX)/optimizer/OptVariableTable.java \ $(PATH_PREFIX)/optimizer/OptVariableTable.java \
$(PATH_PREFIX)/optimizer/Optimizer.java \ $(PATH_PREFIX)/optimizer/Optimizer.java \
$(PATH_PREFIX)/optimizer/StmtNodeIterator.java \ $(PATH_PREFIX)/optimizer/StmtNodeIterator.java \
$(PATH_PREFIX)/optimizer/TypeEvent.java \ $(PATH_PREFIX)/optimizer/TypeEvent.java \
$(PATH_PREFIX)/../classfile/ByteCode.java \ $(PATH_PREFIX)/../classfile/ByteCode.java \
$(PATH_PREFIX)/../classfile/ClassFileWriter.java\ $(PATH_PREFIX)/../classfile/ClassFileWriter.java\
$(NULL) $(NULL)
@ -126,7 +126,7 @@ RESOURCES = $(RESOURCEDIR)/*.properties
# (use org/mozilla/classfile explicitly for now; should be replaced # (use org/mozilla/classfile explicitly for now; should be replaced
# with something parameterized, but jar doesn't understand ..) # with something parameterized, but jar doesn't understand ..)
CLASSES = $(PATH_PREFIX)/*.class $(PATH_PREFIX)/regexp/*.class \ CLASSES = $(PATH_PREFIX)/*.class $(PATH_PREFIX)/regexp/*.class \
$(PATH_PREFIX)/optimizer/*.class org/mozilla/classfile/*.class $(PATH_PREFIX)/optimizer/*.class org/mozilla/classfile/*.class
# A class or set of classes as visible from the top level. For want # A class or set of classes as visible from the top level. For want
# of ${subst ,,}. This variable is only used to trigger dependency # of ${subst ,,}. This variable is only used to trigger dependency
@ -172,9 +172,9 @@ $(FASTTARGET) : $(SOURCES)
cd $(CLASSDIR) ; \ cd $(CLASSDIR) ; \
jar cf ../$(JAR) $(CLASSES) $(RESOURCES) jar cf ../$(JAR) $(CLASSES) $(RESOURCES)
clean : clean :
- cd $(CLASSDIR) - cd $(CLASSDIR)
- rm $(CLASSES) - rm $(CLASSES)
- rm $(PATH_PREFIX)/message.ids \ - rm $(PATH_PREFIX)/message.ids \
$(PATH_PREFIX)/property.ids \ $(PATH_PREFIX)/property.ids \
$(PATH_PREFIX)/MANIFEST $(PATH_PREFIX)/MANIFEST
@ -194,7 +194,7 @@ MESSAGE_PREFIX = msg\.
# excluding duplicates. # excluding duplicates.
$(PATH_PREFIX)/message.ids : $(SOURCES) $(PATH_PREFIX)/message.ids : $(SOURCES)
grep '$(MESSAGE_PREFIX)' $(SOURCES) |\ grep '$(MESSAGE_PREFIX)' $(SOURCES) |\
sed -e 's/.*\"\($(MESSAGE_PREFIX)\)\([^\"]*\).*/\1\2/' | \ sed -e 's/.*\"\($(MESSAGE_PREFIX)\)\([^\"]*\).*/\1\2/' | \
sort | uniq > $(PATH_PREFIX)/message.ids sort | uniq > $(PATH_PREFIX)/message.ids

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

@ -24,7 +24,7 @@
# creeping in. # creeping in.
SOURCES = $(PATH_PREFIX)/*.java \ SOURCES = $(PATH_PREFIX)/*.java \
$(PATH_PREFIX)/shell/*.java \ $(PATH_PREFIX)/shell/*.java \
$(PATH_PREFIX)/jsc/*.java $(PATH_PREFIX)/jsc/*.java
RESOURCEDIR = $(PATH_PREFIX)/resources RESOURCEDIR = $(PATH_PREFIX)/resources
RESOURCES = $(RESOURCEDIR)/*.properties RESOURCES = $(RESOURCEDIR)/*.properties
@ -34,7 +34,7 @@ RESOURCES = $(RESOURCEDIR)/*.properties
# .java file may produce more than one .class file. # .java file may produce more than one .class file.
CLASSES = $(PATH_PREFIX)/*.class \ CLASSES = $(PATH_PREFIX)/*.class \
$(PATH_PREFIX)/shell/*.class \ $(PATH_PREFIX)/shell/*.class \
$(PATH_PREFIX)/jsc/*.class $(PATH_PREFIX)/jsc/*.class
# A class or set of classes as visible from the top level. For want # A class or set of classes as visible from the top level. For want
# of ${subst ,,}. This variable is only used to trigger dependency # of ${subst ,,}. This variable is only used to trigger dependency
@ -57,8 +57,8 @@ $(CLASSDIR)/$(RESOURCES) : $(RESOURCES)
cp $(RESOURCES) $(CLASSDIR)/$(RESOURCEDIR) cp $(RESOURCES) $(CLASSDIR)/$(RESOURCEDIR)
clean : clean :
- cd $(CLASSDIR) - cd $(CLASSDIR)
- rm $(CLASSES) - rm $(CLASSES)
- rm $(PATH_PREFIX)/message.ids \ - rm $(PATH_PREFIX)/message.ids \
$(PATH_PREFIX)/property.ids \ $(PATH_PREFIX)/property.ids \
$(PATH_PREFIX)/MANIFEST $(PATH_PREFIX)/MANIFEST