# HG changeset patch # User Rik # Date 1259175535 28800 # Node ID 1355a606667e9d1820a1273aff61721d18ef23d3 # Parent 4c15e7cd9a147ddf1e70016eb04dd107df45efba Remove unnecessary .PHONY targets in Makefile.am for common targets which Automake supplies by default Examples are all-local, clean-local, etc. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-25 Rik + + * 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 * configure.ac (AC_MSG_NOTICE): Report graphics (fltk) CFLAGS. diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -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) diff --git a/examples/Makefile.am b/examples/Makefile.am --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -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 diff --git a/liboctave/Makefile.am b/liboctave/Makefile.am --- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -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 diff --git a/scripts/Makefile.am b/scripts/Makefile.am --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -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) diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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) && \ diff --git a/test/Makefile.am b/test/Makefile.am --- a/test/Makefile.am +++ b/test/Makefile.am @@ -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