[Woc-commit] CVS: woc/source/wocjava Makefile.am,1.5,1.6

[Geert J. <gj...@us...>]

Update of /cvsroot/woc/woc/source/wocjava
In directory usw-pr-cvs1:/tmp/cvs-serv32448

Modified Files:
	Makefile.am 
Log Message:
correction on cygwin support

Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Makefile.am	17 Aug 2002 11:44:59 -0000	1.5
--- Makefile.am	17 Aug 2002 13:11:30 -0000	1.6
***************
*** 12,22 ****
  JAVA=${JAVA_HOME}/java
  
- JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
  
! # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ]
! || [ "$OSTYPE" = "posix" ] ; then
!    JARS=`cygpath --path --windows "$JARS"`
! fi
  
  all: jar
--- 12,17 ----
  JAVA=${JAVA_HOME}/java
  
  
! JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
  
  all: jar
***************
*** 24,28 ****
--- 19,33 ----
  classes:
  	mkdir -p build
+ 	@if [ "$$OSTYPE" = "cygwin32" ] || [ "$$OSTYPE" = "cygwin" ] || ["$$OSTYPE" = "posix" ] ; then \
+ 		${MAKE} JARS=${JARS} winclasses ; \
+ 	else \
+ 		${MAKE} unixclasses ; \
+ 	fi
+ 
+ unixclasses:
  	${JAVAC} -classpath ${JARS} -d build -O `find source/com -name "*.java"`
+ 
+ winclasses:
+ 	${JAVAC} -classpath `cygpath --path --windows ${JARS}` -d build -O `find source/com -name "*.java"`
  
  clean: