[Waba-commits] CVS: waba/waba_classes Makefile.am,1.9,1.10

[Christian G. <cg...@us...>]

Update of /cvsroot/waba/waba/waba_classes
In directory usw-pr-cvs1:/tmp/cvs-serv29841/waba_classes

Modified Files:
	Makefile.am 
Log Message:
fixed some misbehavior in the Makefiles


Index: Makefile.am
===================================================================
RCS file: /cvsroot/waba/waba/waba_classes/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	2002/01/25 17:10:44	1.9
--- Makefile.am	2002/01/28 16:56:32	1.10
***************
*** 1,15 ****
  SUBDIRS = waba ch org
  
! noinst_DATA = waba_classes
! MOSTLYCLEANFILES = waba_classes to_recompile.txt
  
  waba_classes:
  	if test -f to_recompile.txt ; then \
! 		CLASSPATH=@CLASSPATH@ @JAVAC@ @JAVACFLAGS@ -d . `cat to_recompile.txt` ; \
  		for p in `find ./java -name '*.class'` ; do \
  			mv $$p `echo $$p | sed 's/\/java\//\/waba\//'` ; \
  		done ; \
  		rm -rf ./java ; \
! 		touch waba_classes ; \
  		rm -f to_recompile.txt ; \
  	fi
--- 1,15 ----
  SUBDIRS = waba ch org
  
! TARGETS = waba_classes
! MOSTLYCLEANFILES = waba_classes.txt to_recompile.txt
  
  waba_classes:
  	if test -f to_recompile.txt ; then \
! 		CLASSPATH=@CLASSPATH@ @JAVAC@ @JAVACFLAGS@ -d . `cat to_recompile.txt`  || { rm -f to_recompile.txt && exit 1 } ; \
  		for p in `find ./java -name '*.class'` ; do \
  			mv $$p `echo $$p | sed 's/\/java\//\/waba\//'` ; \
  		done ; \
  		rm -rf ./java ; \
! 		touch waba_classes.txt ; \
  		rm -f to_recompile.txt ; \
  	fi
***************
*** 17,24 ****
  if ISPALMOS
  
! bin_PROGRAMS = waba.pdb
! waba_pdb_SOURCES =
  
! waba.pdb: waba_classes
  	@WARP@ c /q /c @WABA_ID@ waba `find $(SUBDIRS) -name \*.class`
  
--- 17,23 ----
  if ISPALMOS
  
! TARGETS_PALM = waba.pdb
  
! waba.pdb: waba_classes.txt
  	@WARP@ c /q /c @WABA_ID@ waba `find $(SUBDIRS) -name \*.class`
  
***************
*** 27,35 ****
  if JAR
  
! bin_PROGRAMS = waba.jar
! waba_jar_SOURCES =
  
! waba.jar: waba_classes
  	@JAR@ -cvf waba.jar `find $(SUBDIRS) -name \*.class`
  
  endif
--- 26,35 ----
  if JAR
  
! TARGETS_JAR = waba.jar
  
! waba.jar: waba_classes.txt
  	@JAR@ -cvf waba.jar `find $(SUBDIRS) -name \*.class`
  
  endif
+ 
+ noinst_DATA = $(TARGETS) $(TARGETS_PALM) $(TARGETS_JAR)