Minor build system fixes.

[anag] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8fbe744..5e02cb6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.2 2001/02/04 19:53:07 mdw Exp $
+## $Id: Makefile.am,v 1.7 2001/02/19 19:19:21 mdw Exp $
 ##
 ## Makefile for Anag
 ##
@@ -28,6 +28,22 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.7  2001/02/19 19:19:21  mdw
+## Minor build system fixes.
+##
+## Revision 1.6  2001/02/07 09:09:20  mdw
+## Install Java files in the right place.
+##
+## Revision 1.5  2001/02/06 10:06:25  mdw
+## Find a suitable Java compiler.  If there isn't one, don't compile the
+## Java bits.
+##
+## Revision 1.4  2001/02/06 09:38:46  mdw
+## Remove redundant rule.
+##
+## Revision 1.3  2001/02/06 09:37:56  mdw
+## Clean the .jar file.
+##
 ## Revision 1.2  2001/02/04 19:53:07  mdw
 ## Simple GUI front-end in Java.
 ##
@@ -36,19 +52,26 @@
 ##
 
 AUTOMAKE_OPTIONS = foreign
+javadir = $(datadir)/java
+
+JAVAC = @JAVAC@
+
 SUFFIXES = .java .class
-JAVAC = javac
 .java.class:; $(JAVAC) -d . $<
 
 bin_PROGRAMS = anag
-anag_SOURCES = anag.c anag.h wildcard.c anagram.c trackword.c util.c
+java_DATA = @jarfiles@
 
-all: anag.jar
+anag_SOURCES = anag.c anag.h wildcard.c anagram.c trackword.c util.c
 anag.jar: AnagGUI.class
-       jar cf anag.jar *.class
-AnagGUI.class: AnagGUI.java
+       jar cf anag.jar Anag*.class
+
+doszip: distdir
+       rm -f $(PACKAGE).zip
+       zip -qlr $(PACKAGE).zip $(distdir)
+       rm -rf $(distdir)
 
 EXTRA_DIST = AnagGUI.java
-CLEANFILES = *.class
+CLEANFILES = *.class *.jar
 
 ##----- That's all, folks ---------------------------------------------------