Mercurial > octave-nkf

changeset 15737:71dfd53ed47a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Add rules to clean built files in java/scripts directory. * scripts/Makefile.am: Add distlean-local rule for java_JAVA_IMAGES. * scripts/java/module.mk: Add files to CLEANFILES and DISTCLEANFILES variables.
author Rik <rik@octave.org>
date Thu, 06 Dec 2012 11:54:22 -0800
parents 6faa01ff2967
children e340df7b8034
files scripts/Makefile.am scripts/java/module.mk
diffstat 2 files changed, 19 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/Makefile.am	Thu Dec 06 10:37:54 2012 -0800
+++ b/scripts/Makefile.am	Thu Dec 06 11:54:22 2012 -0800
@@ -24,6 +24,10 @@
 
 EXTRA_DIST =
 
+CLEANFILES =
+
+DISTCLEANFILES =
+
 FCN_FILE_DIRS =
 
 FCN_FILES =
@@ -451,10 +455,15 @@
   mkdoc.pl \
   mk-pkg-add
 
-DISTCLEANFILES = \
+DISTCLEANFILES += \
   .DOCSTRINGS \
   DOCSTRINGS \
   $(PKG_ADD_FILES) \
   $(DIRSTAMP_FILES) \
   $(GEN_FCN_FILES)
 
+distclean-local:
+	if [ "x$(srcdir)" != "x." ]; then \
+	  rm $(java_JAVA_IMAGES); \
+	fi
+	
--- a/scripts/java/module.mk	Thu Dec 06 10:37:54 2012 -0800
+++ b/scripts/java/module.mk	Thu Dec 06 11:54:22 2012 -0800
@@ -1,7 +1,5 @@
 FCN_FILE_DIRS += java
 
-EXTRA_DIST += java/octave.jar
-
 java_FCN_FILES = \
   java/dlgtest.m \
   java/errordlg.m \
@@ -56,18 +54,16 @@
 
 java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES))
 
-java_JAVA_IMAGES_src = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES))
-
-java_JAVA_CLASSES_src = $(addprefix $(srcdir)/java/, $(java_JAVA_CLASSES))
+srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES))
 
 %.class : %.java
 	$(MKDIR_P) java/$(org_octave_dir)
 	( cd $(srcdir)/java; $(JAVAC) -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) )
 
-java/images.stamp: $(java_JAVA_IMAGES_src)
+java/images.stamp: $(srcdir_java_JAVA_IMAGES)
 	if [ "x$(srcdir)" != "x." ]; then \
 	  $(MKDIR_P) java/$(org_octave_dir)/images; \
-	  cp $(java_JAVA_IMAGES_src) java/$(org_octave_dir)/images; \
+	  cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \
 	fi
 	touch $@
 
@@ -75,4 +71,9 @@
 	( cd java; $(JAR) cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) )
 	mv $@.t $@
 
-EXTRA_DIST += $(java_JAVA_SRC) $(java_JAVA_IMAGES)
+EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES)
+
+CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES)
+
+DISTCLEANFILES += java/images.stamp
+