Makefiles: Use $(PHONY) instead of .PHONY.

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 8d80ce781d5e100c2373ad54933530da12f875bc..54e8da0c610af7e409d7bd3e8d58e6de9025bde7 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -87,7 +87,6 @@ EXTRA_DIST += \
 
 src_ui_gui_psppire_CPPFLAGS=
 
-if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire
 noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
@@ -354,6 +353,14 @@ src_ui_gui_libwidgets_essential_la_CFLAGS = \
        $(GTKSOURCEVIEW_CFLAGS) \
        $(AM_CFLAGS)
 
+# The unused-parameter warning is not by default disabled
+# in AM_CFLAGS because the core pspp code has this enabled.
+# This is only disabled in the gui code where we have many
+# callbacks from gtk3 which have fixed parameters
+if cc_is_gcc
+src_ui_gui_libwidgets_essential_la_CFLAGS += -Wno-unused-parameter
+endif
+
 nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.c \
        src/ui/gui/psppire-marshal.h \
@@ -401,7 +408,6 @@ CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
        src/ui/gui/.deps/psppire-marshal.Plo \
        src/ui/gui/resources.c $(nodist_src_ui_gui_psppire_DATA)
 
-endif HAVE_GUI
 
 #ensure the installcheck passes even if there is no X server available
 installcheck-local:
@@ -429,7 +435,7 @@ include $(top_srcdir)/src/ui/gui/icons/automake.mk
 UNINSTALL_DATA_HOOKS += update-icon-cache
 INSTALL_DATA_HOOKS += update-icon-cache
 
-#############################################
+#### Build the tools needed to run glade on our .ui files
 
 EXTRA_pkgdir = $(abs_builddir)/src/ui/gui
 
@@ -454,5 +460,10 @@ 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
+# EXTRA_pkgLTLIBRARIES if DESTDIR is set.  It should not do that.
+install-EXTRA_pkgLTLIBRARIES:
+       true