Oneway Dialog: Remove deprecated properties

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 9a21f3f8c70101c6dea2331d6d1c882396bc5811..0fa4afb1bf54952b586e08fe95f86d0322e9696d 100644 (file)
--- 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 \
@@ -409,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:
@@ -462,7 +465,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