Merge remote-tracking branch 'origin/master' into sheet
[pspp] / src / ui / gui / automake.mk
index f5bd07bee32513a0f5c1b84b8ed260f6bed458de..1877263b73eac257ef0354d5f8bdfba91c752b40 100644 (file)
@@ -1,3 +1,19 @@
+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 UI_FILES = \
@@ -5,11 +21,12 @@ UI_FILES = \
        src/ui/gui/autorecode.ui \
        src/ui/gui/binomial.ui \
        src/ui/gui/compute.ui \
+       src/ui/gui/barchart.ui \
        src/ui/gui/correlation.ui \
        src/ui/gui/count.ui \
+       src/ui/gui/comments.ui \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/chi-square.ui \
-       src/ui/gui/data-sheet.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/entry-dialog.ui \
        src/ui/gui/examine.ui \
@@ -17,7 +34,9 @@ UI_FILES = \
        src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
+       src/ui/gui/histogram.ui \
        src/ui/gui/indep-samples.ui \
+       src/ui/gui/k-independent.ui \
        src/ui/gui/k-means.ui \
        src/ui/gui/k-related.ui \
        src/ui/gui/ks-one-sample.ui \
@@ -25,8 +44,8 @@ UI_FILES = \
        src/ui/gui/means.ui \
        src/ui/gui/missing-val-dialog.ui \
        src/ui/gui/oneway.ui \
+       src/ui/gui/options.ui \
        src/ui/gui/paired-samples.ui \
-       src/ui/gui/psppire.ui \
        src/ui/gui/rank.ui \
        src/ui/gui/runs.ui \
        src/ui/gui/sort.ui \
@@ -35,29 +54,44 @@ UI_FILES = \
        src/ui/gui/regression.ui \
        src/ui/gui/reliability.ui \
        src/ui/gui/roc.ui \
+       src/ui/gui/scatterplot.ui \
        src/ui/gui/select-cases.ui \
        src/ui/gui/t-test.ui \
        src/ui/gui/text-data-import.ui \
+       src/ui/gui/transpose.ui \
        src/ui/gui/univariate.ui \
        src/ui/gui/val-labs-dialog.ui \
        src/ui/gui/variable-info.ui \
        src/ui/gui/data-editor.ui \
-       src/ui/gui/output-viewer.ui \
+       src/ui/gui/output-window.ui \
        src/ui/gui/syntax-editor.ui \
-       src/ui/gui/var-sheet.ui \
-       src/ui/gui/var-type-dialog.ui
+       src/ui/gui/var-type-dialog.ui \
+       src/ui/gui/weight.ui
+
+
+$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
+        $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
+   $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
+       -e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
+       test -s $@,tmp
+       mv $@,tmp $@
+
+EXTRA_DIST += doc/help-pages-list
+
 
 EXTRA_DIST += \
-       src/ui/gui/OChangeLog \
+       src/ui/gui/memorandum.txt \
+       src/ui/gui/gen-dot-desktop.sh \
        src/ui/gui/marshaller-list \
-       src/ui/gui/gen-dot-desktop.sh
+       src/ui/gui/pspplogo.svg
 
+src_ui_gui_psppire_CPPFLAGS=
 
 if HAVE_GUI
-bin_PROGRAMS += src/ui/gui/psppire 
+bin_PROGRAMS += src/ui/gui/psppire
 noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+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
 
 
@@ -74,13 +108,13 @@ endif
 
 
 src_ui_gui_psppire_LDADD = \
-       lib/gtk-contrib/libxpaned.a \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
        $(GTHREAD_LIBS) \
        $(GTKSOURCEVIEW_LIBS) \
+       $(SPREAD_SHEET_WIDGET_LIBS) \
        $(CAIRO_LIBS) \
        $(LIBINTL) \
        $(GSL_LIBS)
@@ -94,7 +128,6 @@ src_ui_gui_spreadsheet_test_LDADD = \
 
 src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c
 
-
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 
@@ -105,46 +138,21 @@ INSTALL_DATA_HOOKS += install-lang
 
 dist_src_ui_gui_psppire_DATA = \
        $(UI_FILES) \
-       $(top_srcdir)/src/ui/gui/pspp.lang \
-       $(top_srcdir)/src/ui/gui/psppire.gtkrc
+       $(top_srcdir)/src/ui/gui/pspp.lang
 
 src_ui_gui_psppire_SOURCES = \
-       src/ui/gui/pspp-sheet-private.h \
-       src/ui/gui/pspp-sheet-selection.c \
-       src/ui/gui/pspp-sheet-selection.h \
-       src/ui/gui/pspp-sheet-view-column.c \
-       src/ui/gui/pspp-sheet-view-column.h \
-       src/ui/gui/pspp-sheet-view.c \
-       src/ui/gui/pspp-sheet-view.h \
-       src/ui/gui/pspp-widget-facade.c \
-       src/ui/gui/pspp-widget-facade.h \
-       src/ui/gui/psppire-button-editable.c \
-       src/ui/gui/psppire-button-editable.h \
-       src/ui/gui/psppire-cell-renderer-button.c \
-       src/ui/gui/psppire-cell-renderer-button.h \
        src/ui/gui/psppire-dialog.c \
        src/ui/gui/psppire-keypad.c \
        src/ui/gui/psppire-selector.c \
        src/ui/gui/psppire-buttonbox.c \
-       src/ui/gui/psppire-hbuttonbox.c \
-       src/ui/gui/psppire-vbuttonbox.c \
+       src/ui/gui/psppire-buttonbox.h \
        src/ui/gui/psppire-scanf.c \
        src/ui/gui/psppire-scanf.h \
        src/ui/gui/psppire-acr.c \
-       src/ui/gui/autorecode-dialog.c \
-       src/ui/gui/autorecode-dialog.h \
-       src/ui/gui/aggregate-dialog.c \
-       src/ui/gui/aggregate-dialog.h \
+       src/ui/gui/psppire-import-assistant.c \
+       src/ui/gui/psppire-import-assistant.h \
        src/ui/gui/builder-wrapper.c \
        src/ui/gui/builder-wrapper.h \
-       src/ui/gui/comments-dialog.c \
-       src/ui/gui/comments-dialog.h \
-       src/ui/gui/compute-dialog.c \
-       src/ui/gui/compute-dialog.h \
-       src/ui/gui/chi-square-dialog.c \
-       src/ui/gui/chi-square-dialog.h \
-       src/ui/gui/count-dialog.c \
-       src/ui/gui/count-dialog.h \
        src/ui/gui/dialog-common.c \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
@@ -161,29 +169,20 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/help-menu.c \
        src/ui/gui/help-menu.h \
        src/ui/gui/helper.h \
-       src/ui/gui/k-related-dialog.c \
-       src/ui/gui/k-related-dialog.h \
-       src/ui/gui/ks-one-sample-dialog.c \
-       src/ui/gui/ks-one-sample-dialog.h \
        src/ui/gui/main.c \
        src/ui/gui/missing-val-dialog.c \
        src/ui/gui/missing-val-dialog.h \
-        src/ui/gui/oneway-anova-dialog.c \
-        src/ui/gui/oneway-anova-dialog.h \
-       src/ui/gui/paired-dialog.c \
-       src/ui/gui/paired-dialog.h \
+       src/ui/gui/options-dialog.c \
+       src/ui/gui/options-dialog.h \
        src/ui/gui/psppire.c \
        src/ui/gui/psppire.h \
        src/ui/gui/psppire-acr.h \
-       src/ui/gui/psppire-buttonbox.h \
        src/ui/gui/psppire-checkbox-treeview.c \
        src/ui/gui/psppire-checkbox-treeview.h \
        src/ui/gui/psppire-conf.c \
        src/ui/gui/psppire-conf.h \
        src/ui/gui/psppire-data-editor.c \
        src/ui/gui/psppire-data-editor.h \
-       src/ui/gui/psppire-data-sheet.c \
-       src/ui/gui/psppire-data-sheet.h \
        src/ui/gui/psppire-data-store.c \
        src/ui/gui/psppire-data-store.h \
        src/ui/gui/psppire-data-window.c \
@@ -191,8 +190,24 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog.h \
        src/ui/gui/psppire-dialog-action.c \
        src/ui/gui/psppire-dialog-action.h \
+       src/ui/gui/psppire-dialog-action-aggregate.c \
+       src/ui/gui/psppire-dialog-action-aggregate.h \
+       src/ui/gui/psppire-dialog-action-autorecode.c \
+       src/ui/gui/psppire-dialog-action-autorecode.h \
+       src/ui/gui/psppire-dialog-action-1sks.c \
+       src/ui/gui/psppire-dialog-action-1sks.h \
+       src/ui/gui/psppire-dialog-action-barchart.c \
+       src/ui/gui/psppire-dialog-action-barchart.h \
        src/ui/gui/psppire-dialog-action-binomial.c \
        src/ui/gui/psppire-dialog-action-binomial.h \
+       src/ui/gui/psppire-dialog-action-chisquare.c \
+       src/ui/gui/psppire-dialog-action-chisquare.h \
+       src/ui/gui/psppire-dialog-action-compute.c \
+       src/ui/gui/psppire-dialog-action-compute.h \
+       src/ui/gui/psppire-dialog-action-comments.c \
+       src/ui/gui/psppire-dialog-action-comments.h \
+       src/ui/gui/psppire-dialog-action-count.c \
+       src/ui/gui/psppire-dialog-action-count.h \
        src/ui/gui/psppire-dialog-action-correlation.c \
        src/ui/gui/psppire-dialog-action-correlation.h \
        src/ui/gui/psppire-dialog-action-crosstabs.c \
@@ -203,44 +218,77 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-examine.h \
        src/ui/gui/psppire-dialog-action-factor.c \
        src/ui/gui/psppire-dialog-action-factor.h \
+       src/ui/gui/psppire-dialog-action-flip.c \
+       src/ui/gui/psppire-dialog-action-flip.h \
        src/ui/gui/psppire-dialog-action-frequencies.c \
        src/ui/gui/psppire-dialog-action-frequencies.h \
+       src/ui/gui/psppire-dialog-action-histogram.c \
+       src/ui/gui/psppire-dialog-action-histogram.h \
        src/ui/gui/psppire-dialog-action-indep-samps.c \
        src/ui/gui/psppire-dialog-action-indep-samps.h \
        src/ui/gui/psppire-dialog-action-kmeans.c \
        src/ui/gui/psppire-dialog-action-kmeans.h \
        src/ui/gui/psppire-dialog-action-logistic.c \
        src/ui/gui/psppire-dialog-action-logistic.h \
+       src/ui/gui/psppire-dialog-action-k-independent.c \
+       src/ui/gui/psppire-dialog-action-k-independent.h \
+       src/ui/gui/psppire-dialog-action-k-related.c \
+       src/ui/gui/psppire-dialog-action-k-related.h \
        src/ui/gui/psppire-dialog-action-means.c \
        src/ui/gui/psppire-dialog-action-means.h \
+       src/ui/gui/psppire-dialog-action-oneway.c \
+       src/ui/gui/psppire-dialog-action-oneway.h \
+       src/ui/gui/psppire-dialog-action-paired.c \
+       src/ui/gui/psppire-dialog-action-paired.h \
        src/ui/gui/psppire-dialog-action-rank.c \
        src/ui/gui/psppire-dialog-action-rank.h \
+       src/ui/gui/psppire-dialog-action-recode.c \
+       src/ui/gui/psppire-dialog-action-recode.h \
+       src/ui/gui/psppire-dialog-action-recode-same.c \
+       src/ui/gui/psppire-dialog-action-recode-same.h \
+       src/ui/gui/psppire-dialog-action-recode-different.c \
+       src/ui/gui/psppire-dialog-action-recode-different.h \
        src/ui/gui/psppire-dialog-action-regression.c \
        src/ui/gui/psppire-dialog-action-regression.h \
        src/ui/gui/psppire-dialog-action-reliability.c \
        src/ui/gui/psppire-dialog-action-reliability.h \
        src/ui/gui/psppire-dialog-action-roc.c \
        src/ui/gui/psppire-dialog-action-roc.h \
+       src/ui/gui/psppire-dialog-action-runs.c \
+       src/ui/gui/psppire-dialog-action-runs.h \
+       src/ui/gui/psppire-dialog-action-scatterplot.c \
+       src/ui/gui/psppire-dialog-action-scatterplot.h \
        src/ui/gui/psppire-dialog-action-sort.c \
        src/ui/gui/psppire-dialog-action-sort.h \
+       src/ui/gui/psppire-dialog-action-select.c \
+       src/ui/gui/psppire-dialog-action-select.h \
+       src/ui/gui/psppire-dialog-action-split.c \
+       src/ui/gui/psppire-dialog-action-split.h \
+       src/ui/gui/psppire-dialog-action-tt1s.c \
+       src/ui/gui/psppire-dialog-action-tt1s.h \
+       src/ui/gui/psppire-dialog-action-two-sample.c \
+       src/ui/gui/psppire-dialog-action-two-sample.h \
+       src/ui/gui/psppire-dialog-action-univariate.c \
+       src/ui/gui/psppire-dialog-action-univariate.h \
        src/ui/gui/psppire-dialog-action-var-info.c \
        src/ui/gui/psppire-dialog-action-var-info.h \
+       src/ui/gui/psppire-dialog-action-weight.c \
+       src/ui/gui/psppire-dialog-action-weight.h \
        src/ui/gui/psppire-dict.c \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-dictview.c \
        src/ui/gui/psppire-dictview.h \
-       src/ui/gui/psppire-empty-list-store.c \
-       src/ui/gui/psppire-empty-list-store.h \
        src/ui/gui/psppire-encoding-selector.c \
        src/ui/gui/psppire-encoding-selector.h \
        src/ui/gui/psppire-format.c \
        src/ui/gui/psppire-format.h \
-       src/ui/gui/psppire-hbuttonbox.h \
        src/ui/gui/psppire-keypad.h \
        src/ui/gui/psppire-lex-reader.c \
        src/ui/gui/psppire-lex-reader.h \
        src/ui/gui/psppire-means-layer.c \
        src/ui/gui/psppire-means-layer.h \
+       src/ui/gui/psppire-output-view.c \
+       src/ui/gui/psppire-output-view.h \
        src/ui/gui/psppire-output-window.c \
        src/ui/gui/psppire-output-window.h \
        src/ui/gui/psppire-var-view.c \
@@ -252,29 +300,47 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-select-dest.h \
        src/ui/gui/psppire-syntax-window.c \
        src/ui/gui/psppire-syntax-window.h \
+       src/ui/gui/psppire-delimited-text.c \
+       src/ui/gui/psppire-delimited-text.h \
+       src/ui/gui/psppire-text-file.c \
+       src/ui/gui/psppire-text-file.h \
        src/ui/gui/psppire-val-chooser.c \
        src/ui/gui/psppire-val-chooser.h \
        src/ui/gui/psppire-value-entry.c \
        src/ui/gui/psppire-value-entry.h \
        src/ui/gui/psppire-var-ptr.c \
        src/ui/gui/psppire-var-ptr.h \
-       src/ui/gui/psppire-var-sheet.c \
-       src/ui/gui/psppire-var-sheet.h \
-       src/ui/gui/psppire-vbuttonbox.h \
+       src/ui/gui/psppire-data-sheet.c \
+       src/ui/gui/psppire-data-sheet.h \
+       src/ui/gui/psppire-variable-sheet.c \
+       src/ui/gui/psppire-variable-sheet.h \
+       src/ui/gui/psppire-var-sheet-header.h \
+       src/ui/gui/psppire-var-sheet-header.c \
        src/ui/gui/psppire-window.c \
        src/ui/gui/psppire-window.h \
        src/ui/gui/psppire-window-base.c \
        src/ui/gui/psppire-window-base.h \
        src/ui/gui/psppire-window-register.c \
        src/ui/gui/psppire-window-register.h \
-       src/ui/gui/recode-dialog.c \
-       src/ui/gui/recode-dialog.h \
-       src/ui/gui/runs-dialog.c \
-       src/ui/gui/runs-dialog.h \
-       src/ui/gui/select-cases-dialog.c \
-       src/ui/gui/select-cases-dialog.h \
-       src/ui/gui/split-file-dialog.c \
-       src/ui/gui/split-file-dialog.h \
+       src/ui/gui/t-test-options.c \
+       src/ui/gui/t-test-options.h \
+       src/ui/gui/val-labs-dialog.c \
+       src/ui/gui/val-labs-dialog.h \
+       src/ui/gui/var-display.c \
+       src/ui/gui/var-display.h \
+       src/ui/gui/var-type-dialog.c \
+       src/ui/gui/var-type-dialog.h \
+       src/ui/gui/value-variant.c \
+       src/ui/gui/value-variant.h \
+       src/ui/gui/widget-io.c \
+       src/ui/gui/widget-io.h \
+       src/ui/gui/widgets.c \
+       src/ui/gui/widgets.h \
+       src/ui/gui/windows-menu.c \
+       src/ui/gui/windows-menu.h
+
+
+OBSOLETE = \
        src/ui/gui/page-assistant.c \
        src/ui/gui/page-intro.c \
        src/ui/gui/page-intro.h \
@@ -288,35 +354,13 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/page-sheet-spec.c \
        src/ui/gui/page-sheet-spec.h \
        src/ui/gui/text-data-import-dialog.c \
-       src/ui/gui/text-data-import-dialog.h \
-       src/ui/gui/transpose-dialog.c \
-       src/ui/gui/transpose-dialog.h \
-       src/ui/gui/t-test-one-sample.c \
-       src/ui/gui/t-test-one-sample.h \
-       src/ui/gui/t-test-options.c \
-       src/ui/gui/t-test-options.h \
-       src/ui/gui/t-test-paired-samples.c \
-       src/ui/gui/t-test-paired-samples.h \
-       src/ui/gui/npar-two-sample-related.c \
-       src/ui/gui/npar-two-sample-related.h \
-       src/ui/gui/univariate-dialog.c \
-       src/ui/gui/univariate-dialog.h \
-       src/ui/gui/val-labs-dialog.c \
-       src/ui/gui/val-labs-dialog.h \
-       src/ui/gui/var-display.c \
-       src/ui/gui/var-display.h \
-       src/ui/gui/var-type-dialog.c \
-       src/ui/gui/var-type-dialog.h \
-       src/ui/gui/weight-cases-dialog.c \
-       src/ui/gui/weight-cases-dialog.h \
-       src/ui/gui/widget-io.c \
-       src/ui/gui/widget-io.h \
-       src/ui/gui/widgets.c \
-       src/ui/gui/widgets.h
+       src/ui/gui/text-data-import-dialog.h
+
 
 nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.c \
-       src/ui/gui/psppire-marshal.h
+       src/ui/gui/psppire-marshal.h \
+       src/ui/gui/resources.c
 
 yelp-check:
        @if ! yelp --version > /dev/null 2>&1 ; then \
@@ -333,23 +377,35 @@ PHONY += yelp-check
 AM_CPPFLAGS += -Isrc
 
 src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
-       POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@
+       $(AM_V_GEN)POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@
 
 CLEANFILES+=src/ui/gui/pspp.desktop
 
+src/ui/gui/resources.c: src/ui/gui/resources.xml
+       $(AM_V_at)$(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src/ui/gui --generate-source $< --target=$@,out
+       $(AM_V_GEN)echo '#include <config.h>' > $@,tmp
+       cat $@,out >> $@,tmp
+       $(RM) $@,out
+       mv $@,tmp $@
+
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
-       echo '#include <config.h>' > $@
-       $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
+       $(AM_V_GEN)echo '#include <config.h>' > $@
+       $(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
 
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
-       $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
+       $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/pspp.desktop
 
-BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
+
+BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/ui/gui/resources.c
+
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
-       $(nodist_src_ui_gui_psppire_DATA)
+       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
@@ -357,13 +413,13 @@ installcheck-local:
        DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS
 
 # <gtk/gtk.h> wrapper
-src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include
+src_ui_gui_psppire_CPPFLAGS += $(AM_CPPFLAGS) -Isrc/ui/gui/include
 BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h
 src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
        @$(MKDIR_P) src/ui/gui/include/gtk
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         $(SED) -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_GTK_GTK_H''@|$(NEXT_GTK_GTK_H)|g' \
@@ -371,7 +427,7 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
        } > $@-t && \
        mv $@-t $@
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
-EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
+EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h src/ui/gui/resources.xml
 
 include $(top_srcdir)/src/ui/gui/icons/automake.mk