From 33cdbdf7e095370cf04240eed21344205a487191 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 5 Sep 2020 15:08:33 -0700 Subject: [PATCH] Makefiles: Use $(PHONY) instead of .PHONY. Avoids a warning from Automake in Smake: src/ui/gui/automake.mk:463: warning: .PHONY was already defined in condition TRUE, which includes condition HAVE_GUI ... Makefile.am:91: 'src/automake.mk' included from here src/automake.mk:55: 'src/ui/automake.mk' included from here src/ui/automake.mk:21: 'src/ui/gui/automake.mk' included from here po/automake.mk:128: ... '.PHONY' previously defined here Makefile.am:87: 'po/automake.mk' included from here --- Makefile.am | 2 +- doc/automake.mk | 2 +- po/automake.mk | 2 +- src/ui/gui/automake.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 59834123ac..b2df75983b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -154,4 +154,4 @@ distfiles: Makefile -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" \ | LC_ALL=C sort -u > $@ CLEANFILES += distfiles gitfiles missing-distfiles -.PHONY: dist-hook-git +PHONY += dist-hook-git diff --git a/doc/automake.mk b/doc/automake.mk index e02f1f4c68..976b584507 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -94,4 +94,4 @@ dist_docbook_DATA = doc/pspp.xml CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA) -.PHONY: doc +PHONY += doc diff --git a/po/automake.mk b/po/automake.mk index 6f918602a8..1d25f16948 100644 --- a/po/automake.mk +++ b/po/automake.mk @@ -125,7 +125,7 @@ CLEAN_LOCAL += po_CLEAN # Download the po files from http://translationproject.org # The final action to this rule is to remove the .pot file. This # is because the po files must be re-merged against an updated version of it. -.PHONY: po-update +PHONY += po-update po-update: $(POFILES) for p in $^; do \ wget --recursive --level=1 --accept=po --no-directories --no-use-server-timestamps \ diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index a334d2ff8e..54e8da0c61 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -460,7 +460,7 @@ src/ui/gui/glade-wrapper: src/ui/gui/glade-wrapper.in $(SED) -e 's%\@abs_top_srcdir\@%@abs_top_srcdir@%g' -e 's%\@abs_top_builddir\@%@abs_top_builddir@%g' $< > $@ chmod a+x $@ -.PHONY: glade-tools +PHONY += glade-tools glade-tools: src/ui/gui/glade-wrapper src/ui/gui/libpsppire-glade.la # This works around a possible bug in Automake 1.16.1 which installs -- 2.30.2