pier 01/08/06 13:59:35 Modified: webapp/java Makefile.in Log: Correctly derive values from Makedefs for JAR and JAVAC. Set up classpath to include JARs from the Tomcat 4.0 distribution. Revision Changes Path 1.2 +30 -7 jakarta-tomcat-connectors/webapp/java/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 2001/07/13 02:11:21 1.1 +++ Makefile.in 2001/08/06 20:59:35 1.2 @@ -56,7 +56,7 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makefile.in,v 1.1 2001/07/13 02:11:21 pier Exp $ +# @version $Id: Makefile.in,v 1.2 2001/08/06 20:59:35 pier Exp $ include @SRCDIR@/Makedefs @@ -65,11 +65,34 @@ all: $(ARCHIVE) $(ARCHIVE): *.java @SRCDIR@/Makedefs - @echo Compiling Java sources with CLASSPATH=$$CLASSPATH... - @javac -d . -classpath $$CLASSPATH *.java - @jar -cvf0 warp.jar org/ + @$(ECHO) "Compiling Java sources with CLASSPATH set to:" + + @CP="$(JAVACPATH):$${CLASSPATH}" ; \ + for ENTRY in `$(ECHO) $${CP} | $(SED) y/:/\ /` ; \ + do \ + $(ECHO) " $${ENTRY}" ; \ + done ; \ + for ENTRY in *.java ; \ + do \ + $(ECHO) "Compiling $${ENTRY}" ; \ + done ; \ + $(JAVAC) $(JAVACFLAGS) -d . -classpath $(JAVACPATH):$${CLASSPATH} \ + *.java -clean: - @echo Removing Java classes and archive - @rm -rf org $(ARCHIVE) + @$(ECHO) "Storing classes in warp.jar" + @$(JAR) -cvf0 warp.jar org/ 1>/dev/null +clean: + @for ENTRY in $(ARCHIVE) org ; \ + do \ + if $(TEST) -f $${ENTRY} ; \ + then \ + $(ECHO) Removing file $${ENTRY} ; \ + $(RM) -f $${ENTRY} ; \ + fi ; \ + if $(TEST) -d $${ENTRY} ; \ + then \ + $(ECHO) Removing directory $${ENTRY} ; \ + $(RM) -rf $${ENTRY} ; \ + fi ; \ + done
