put $(MAKE) definition in defs.gmk
X-SVN-Rev: 793
This commit is contained in:
parent
f61a806057
commit
299b9f97b6
@ -8,3 +8,7 @@ TARGDIR= $(CLASSDIR)/$(PKGPATH)
|
||||
|
||||
#JAVACFLAGS= -target 1.1
|
||||
JAVACFLAGS=
|
||||
|
||||
JAVAC= javac -classpath $(CLASSPATH) -sourcepath $(SRCDIR) -d $(CLASSDIR) $(JAVACFLAGS)
|
||||
MAKE= gmake -f makefile.gmk
|
||||
|
||||
|
@ -2,8 +2,8 @@ default: classes
|
||||
|
||||
include $(TOPDIR)/src/build/CancelImplicits.gmk
|
||||
|
||||
JAVAC= javac -classpath $(CLASSPATH) -sourcepath $(SRCDIR) -d $(CLASSDIR) $(JAVACFLAGS)
|
||||
#JAVAC= javac -classpath $(CLASSPATH) -d $(CLASSDIR) $(JAVACFLAGS)
|
||||
#JAVAC= javac -classpath $(CLASSPATH) -sourcepath $(SRCDIR) -d $(CLASSDIR) $(JAVACFLAGS)
|
||||
#MAKE= gmake -f makefile.gmk
|
||||
|
||||
.SUFFIXES: .java .class
|
||||
|
||||
@ -17,9 +17,6 @@ FILES_class= $(FILES_java:.java=.class)
|
||||
CLASSLIST= classes.list
|
||||
CLASS_DEST_DIR= $(CLASSDIR)/$(PKGPATH)
|
||||
|
||||
# {$(SRCDIR)/$(PKGPATH)}.java{$(CLASS_DEST_DIR)}.class:
|
||||
# @echo $(?) >> .classes.list
|
||||
|
||||
$(CLASS_DEST_DIR) :
|
||||
@mkdir -p $@
|
||||
|
||||
@ -34,7 +31,6 @@ $(FILES_class) : $(CLASS_DEST_DIR)%.class: $(SRCDIR)/$(PKGPATH)%.java
|
||||
@rm -f .classes.list
|
||||
|
||||
ifdef FILES_dict
|
||||
#SRC_FILES_dict= $(subst classes,src,$(FILES_dict))
|
||||
SRC_FILES_dict= $(FILES_dict:classes=src)
|
||||
endif
|
||||
|
||||
@ -43,7 +39,7 @@ ifdef FILES_dict
|
||||
@cp $(SRC_FILES_dict) $(CLASS_DEST_DIR)/$(notdir $(SRC_FILES_dict))
|
||||
endif
|
||||
ifdef SUBDIRS
|
||||
@for D in $(SUBDIRS) ; do cd $$D ; gnumake -f makefile.gmk classes ; cd .. ; done
|
||||
@for D in $(SUBDIRS) ; do cd $$D ; $(MAKE) classes ; cd .. ; done
|
||||
endif
|
||||
|
||||
dict: $(SRC_FILES_dict) $(CLASS_DEST_DIR)
|
||||
|
Loading…
Reference in New Issue
Block a user