Removed support for Java.

This commit is contained in:
henry
2009-07-17 09:30:36 +01:00
parent f96f883ea4
commit 6b3ceaf4b5
7 changed files with 9 additions and 45 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,4 +1,4 @@
.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 = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
@ -17,9 +17,6 @@ MKDEP = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
.C.dep: .C.dep:
$(MAKE_DEP) $(MAKE_DEP)
.java.dep:
$(MAKE_DEP)
.F.dep: .F.dep:
$(MAKE_DEP) $(MAKE_DEP)

View File

@ -2,7 +2,6 @@ include $(GENERAL_RULES)/version
include $(GENERAL_RULES)/sourceToDep include $(GENERAL_RULES)/sourceToDep
include $(GENERAL_RULES)/java
include $(GENERAL_RULES)/flex include $(GENERAL_RULES)/flex
include $(GENERAL_RULES)/flex++ include $(GENERAL_RULES)/flex++
#include $(GENERAL_RULES)/byacc #include $(GENERAL_RULES)/byacc

View File

@ -7,7 +7,6 @@ include $(RULES)/X
include $(GENERAL_RULES)/sourceToDep include $(GENERAL_RULES)/sourceToDep
include $(GENERAL_RULES)/java
include $(GENERAL_RULES)/flex include $(GENERAL_RULES)/flex
include $(GENERAL_RULES)/flex++ include $(GENERAL_RULES)/flex++
include $(GENERAL_RULES)/byacc include $(GENERAL_RULES)/byacc
@ -20,6 +19,6 @@ include $(RULES)/c++
SO = dll SO = dll
EXE_EXT = .exe EXE_EXT = .exe
# Ensure we know what OS we are compiling for # Ensure we know what OS we are compiling for
# during MakefileFiles and MakefileOptions # during MakefileFiles and MakefileOptions
GFLAGS += -DWIN32 -DLITTLE_ENDIAN GFLAGS += -DWIN32 -DLITTLE_ENDIAN

View File

@ -53,30 +53,13 @@ else
cat > $depName cat > $depName
fi fi
sed -e s%".*.o.*:"%'$(OBJECTS_DIR)/'"$objectName\:"% \
-e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'% \
>> $depName
if [ "$sub" = java ] echo '$(OBJECTS_DIR)/'$objectName': $(EXE_DEP)' >> $depName
then echo '$(OBJECTS_DIR)/'$objectName':' >> $depName
echo ' @SOURCE_DIR='$sourceDir >> $depName
sed -e s%"\(.*\).class.*:"%'$(CLASSES_DIR)/'"\1.class\:"% \ echo ' SOURCE='$1' ; $('$sub'too)' >> $depName
-e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'% \
>> $depName
echo '$(CLASSES_DIR)/'$sourceDir/$className': $(EXE_DEP)' >> $depName
echo '$(CLASSES_DIR)/'$sourceDir/$className':' >> $depName
echo ' @SOURCE_DIR='$sourceDir '\' >> $depName
echo ' SOURCE='$1' ; $('$sub'toclass)' >> $depName
else
sed -e s%".*.o.*:"%'$(OBJECTS_DIR)/'"$objectName\:"% \
-e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'% \
>> $depName
echo '$(OBJECTS_DIR)/'$objectName': $(EXE_DEP)' >> $depName
echo '$(OBJECTS_DIR)/'$objectName':' >> $depName
echo ' @SOURCE_DIR='$sourceDir >> $depName
echo ' SOURCE='$1' ; $('$sub'too)' >> $depName
fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------