Merge branch 'master' into cvm

This commit is contained in:
graham
2009-07-28 10:40:50 +01:00
2023 changed files with 13229 additions and 15894 deletions

View File

@ -1,10 +0,0 @@
.SUFFIXES: .java .class
javac = javac
include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION)
javaFLAGS = -classpath $(CLASS_PATH):$(CLASSES_DIR):. $(EXE_INC) $(javaOPT) $(javaDBUG) -d $(CLASSES_DIR) -deprecation
javatoclass = mkdir -p $(CLASSES_DIR) ; \
( $(javac) $(javaFLAGS) $$SOURCE || ( rm -f $@ ) )

View File

@ -1,2 +0,0 @@
javaDBUG = -g
javaOPT =

View File

@ -1,2 +0,0 @@
javaDBUG =
javaOPT = -O

View File

@ -1,6 +1,6 @@
.SUFFIXES: .c .cc .cxx .cpp .C .java .F .f .dep
.SUFFIXES: .c .cc .cxx .cpp .C .F .f .dep
MKDEP = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
MKDEP = $(BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
.c.dep:
$(MAKE_DEP)
@ -17,9 +17,6 @@ MKDEP = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
.C.dep:
$(MAKE_DEP)
.java.dep:
$(MAKE_DEP)
.F.dep:
$(MAKE_DEP)

View File

@ -2,10 +2,9 @@ include $(GENERAL_RULES)/version
include $(GENERAL_RULES)/sourceToDep
include $(GENERAL_RULES)/java
include $(GENERAL_RULES)/flex
include $(GENERAL_RULES)/flex++
#include $(GENERAL_RULES)/byacc
#include $(GENERAL_RULES)/btyacc++
## include $(GENERAL_RULES)/byacc
## include $(GENERAL_RULES)/btyacc++
include $(GENERAL_RULES)/bison
include $(GENERAL_RULES)/moc