Warnings: add AM_CFLAGS also for the psppire build

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 33eb18677b52c18beba530b92d257244975e9ac3..0abce32b3e19be3ee7caa398eaed66c530b1e1a3 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -92,8 +92,13 @@ if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire
 noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(SPREAD_SHEET_WIDGET_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
-src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(SPREAD_SHEET_WIDGET_CFLAGS) $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1
+
+if cc_is_gcc
+src_ui_gui_psppire_CFLAGS+=-Wno-unused-parameter
+src_ui_gui_spreadsheet_test_CFLAGS+=-Wno-unused-parameter
+endif
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -348,18 +353,6 @@ nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.h \
        src/ui/gui/resources.c
 
-yelp-check:
-       @if ! yelp --version > /dev/null 2>&1 ; then \
-               echo    ; \
-               echo '    The Yelp document viewer does not seem to be installed on the system.' ; \
-               echo '    If Yelp is not available at run time, then the PSPPIRE online reference' ; \
-               echo '    manual will not be available.' ; \
-               echo '    Yelp is available from the GNOME project.  ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
-               echo ; \
-       fi
-
-PHONY += yelp-check
-
 AM_CPPFLAGS += -Isrc
 
 src/ui/gui/org.fsf.pspp.metainfo.xml: src/ui/gui/org.fsf.pspp.metainfo.xml.in $(POFILES)
@@ -381,7 +374,7 @@ src/ui/gui/resources.c: src/ui/gui/resources.xml
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
        $(AM_V_GEN)echo '#include <config.h>' > $@
-       $(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
+       $(AM_V_at)$(GLIB_GENMARSHAL) --body --include-header=ui/gui/psppire-marshal.h --prefix=psppire_marshal $? >> $@
 
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
@@ -443,7 +436,10 @@ src_ui_gui_libpsppire_glade_la_SOURCES = \
 src_ui_gui_libpsppire_glade_la_LIBADD = \
        src/ui/gui/psppire-marshal.lo
 
-src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS)
+src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(AM_CFLAGS)
+if cc_is_gcc
+src_ui_gui_libpsppire_glade_la_CFLAGS += -Wno-unused-parameter
+endif
 src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION)
 
 EXTRA_DIST += src/ui/gui/psppire.xml src/ui/gui/glade-wrapper.in