fix wmake bug introduced by a9699afbb4

- skip including java rather than having recursive includes
  (and too many files open error) when WM_JAVAC_OPTION isn't defined.
This commit is contained in:
Mark Olesen
2009-07-16 13:32:40 +02:00
parent 7b3eb9da14
commit 33358fd383
3 changed files with 5 additions and 4 deletions

View File

@ -2,7 +2,8 @@
javac = javac
include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION)
## avoid recursive include if WM_JAVAC_OPTION isn't defined
## include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION)
javaFLAGS = -classpath $(CLASS_PATH):$(CLASSES_DIR):. $(EXE_INC) $(javaOPT) $(javaDBUG) -d $(CLASSES_DIR) -deprecation

View File

@ -5,7 +5,7 @@ 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