X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=0fa4afb1bf54952b586e08fe95f86d0322e9696d;hb=373132ca89b003b116d69a987a43f3f9cceae33a;hp=91a110708c854c02c9d10a670b2595b4d737e4a8;hpb=50f7ce1fe0dc1e974d5aae426421fc5ebf24ca4c;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 91a110708c..0fa4afb1bf 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -87,11 +87,13 @@ EXTRA_DIST += \
 
 src_ui_gui_psppire_CPPFLAGS=
 
-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) $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) \
+        $(SPREAD_SHEET_WIDGET_CFLAGS) \
+        $(LIBRSVG_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
@@ -121,6 +123,7 @@ src_ui_gui_psppire_LDADD = \
 	$(GTHREAD_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(SPREAD_SHEET_WIDGET_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBINTL) \
 	$(GSL_LIBS)
@@ -166,6 +169,7 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/missing-val-dialog.h \
 	src/ui/gui/options-dialog.c \
 	src/ui/gui/options-dialog.h \
+	src/ui/gui/pre-initialisation.h \
 	src/ui/gui/psppire.c \
 	src/ui/gui/psppire-data-editor.c \
 	src/ui/gui/psppire-data-editor.h \
@@ -351,7 +355,16 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
 
 src_ui_gui_libwidgets_essential_la_CFLAGS = \
 	$(GTK_CFLAGS) \
-	$(GTKSOURCEVIEW_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 \
@@ -400,7 +413,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:
@@ -428,7 +440,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
 
@@ -453,5 +465,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