Mercurial > octave-nkf

changeset 9864:1355a606667e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary .PHONY targets in Makefile.am for common targets which Automake supplies by default Examples are all-local, clean-local, etc.
author Rik <rdrider0-list@yahoo.com>
date Wed, 25 Nov 2009 10:58:55 -0800
parents 4c15e7cd9a14
children 763906db555e
files ChangeLog Makefile.am examples/Makefile.am liboctave/Makefile.am scripts/Makefile.am src/Makefile.am test/Makefile.am
diffstat 7 files changed, 12 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Nov 25 09:20:23 2009 -0800
+++ b/ChangeLog	Wed Nov 25 10:58:55 2009 -0800
@@ -1,3 +1,10 @@
+2009-11-25  Rik <octave@nomad.inbox5.com>
+
+	* Makefile.am examples/Makefile.am liboctave/Makefile.am
+	scripts/Makefile.am src/Makefile.am test/Makefile.am:
+	Remove unnecessary .PHONY targets for common targets which
+	Automake supplies already.  Examples are local-all, install-local-data
+
 2009-11-21  John W. Eaton  <jwe@octave.org>
 
 	* configure.ac (AC_MSG_NOTICE): Report graphics (fltk) CFLAGS.
--- a/Makefile.am	Wed Nov 25 09:20:23 2009 -0800
+++ b/Makefile.am	Wed Nov 25 10:58:55 2009 -0800
@@ -100,7 +100,6 @@
 	@echo "   make check      - to run the tests"
 	@echo "   make install    - to install (PREFIX=$(prefix))"
 	@echo ""
-.PHONY: all
 
 octave-bug: octave-bug.in Makefile
 	@$(do_subst_config_vals)
@@ -162,16 +161,12 @@
 
 installdirs-local:
 	$(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE))
-.PHONY: installdirs-local
 
 install-data-local: installdirs-local install-extras
-.PHONY: install-data-local
 
 install-exec-hook: make-version-links
-.PHONY: install-exec-hook
 
 uninstall-local: remove-version-links uninstall-extras
-.PHONY: uninstall-local
 
 install-extras:
 	$(MKDIR_P) $(DESTDIR)$(octetcdir)
--- a/examples/Makefile.am	Wed Nov 25 09:20:23 2009 -0800
+++ b/examples/Makefile.am	Wed Nov 25 10:58:55 2009 -0800
@@ -78,10 +78,8 @@
 	mv $@-t $@
 
 install-data-local: install-images install-desktop
-.PHONY: install-data-local
 
 uninstall-local: uninstall-images uninstall-desktop
-.PHONY: uninstall-local
 
 install-images:
 	$(MKDIR_P) $(DESTDIR)$(imagedir)
@@ -108,4 +106,4 @@
 	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
 	  rm -f $(DESTDIR)$(datadir)/applications/www.octave.org-octave.desktop; \
 	fi
-.PHONY: uninstall-desktop
\ No newline at end of file
+.PHONY: uninstall-desktop
--- a/liboctave/Makefile.am	Wed Nov 25 09:20:23 2009 -0800
+++ b/liboctave/Makefile.am	Wed Nov 25 10:58:55 2009 -0800
@@ -551,6 +551,8 @@
 	$(AWK) -f $(srcdir)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h $(srcdir)/mx-ops > $@-t
 	$(simple_move_if_change_rule)
 
-distclean-local maintainer-clean-local:
+distclean-local:
 	rm -f $(BUILT_INCS) $(BUILT_LIBOCTAVE_CXX_SOURCES)
-.PHONY: distclean-local maintainer-clean-local
+
+#distclean-local maintainer-clean-local:
+#.PHONY: distclean-local maintainer-clean-local
--- a/scripts/Makefile.am	Wed Nov 25 09:20:23 2009 -0800
+++ b/scripts/Makefile.am	Wed Nov 25 10:58:55 2009 -0800
@@ -370,10 +370,8 @@
 .PHONY: check-m-sources
 
 install-data-local: install-images install-startup-files install-pkg-add
-.PHONY: install-data-local
 
 uninstall-local: uninstall-images uninstall-startup-files uninstall-pkg-add
-.PHONY: uninstall-local
 
 install-images:
 	$(MKDIR_P) $(DESTDIR)$(imagedir)
--- a/src/Makefile.am	Wed Nov 25 09:20:23 2009 -0800
+++ b/src/Makefile.am	Wed Nov 25 10:58:55 2009 -0800
@@ -619,7 +619,6 @@
 install-data-hook: install-oct
 
 uninstall-local: remove-version-links uninstall-oct
-.PHONY: uninstall-local
 
 make-version-links:
 	cd $(DESTDIR)$(bindir) && \
--- a/test/Makefile.am	Wed Nov 25 09:20:23 2009 -0800
+++ b/test/Makefile.am	Wed Nov 25 10:58:55 2009 -0800
@@ -73,7 +73,6 @@
 
 check: test_sparse.m
 	../run-octave --norc --silent --no-history $(srcdir)/fntests.m $(srcdir)
-.PHONY: check
 
 test_sparse.m: build_sparse_tests.sh
 	$(srcdir)/build_sparse_tests.sh