Fix build of pspp.xml

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index d3036d887df2138fe198a68457a631ceed2831b5..2ca50a89dad62b5a7fbfc195365d95965c31b845 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -56,6 +56,7 @@ UI_FILES = \
        src/ui/gui/roc.ui \
        src/ui/gui/scatterplot.ui \
        src/ui/gui/select-cases.ui \
+       src/ui/gui/spreadsheet-import.ui \
        src/ui/gui/t-test.ui \
        src/ui/gui/text-data-import.ui \
        src/ui/gui/transpose.ui \
@@ -68,16 +69,7 @@ UI_FILES = \
        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
-
+if building_gui
 
 EXTRA_DIST += \
        src/ui/gui/org.fsf.pspp.metainfo.xml.in \
@@ -169,11 +161,10 @@ 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 \
-       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 \
@@ -185,6 +176,10 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire.h \
        src/ui/gui/psppire-import-assistant.c \
        src/ui/gui/psppire-import-assistant.h \
+       src/ui/gui/psppire-import-spreadsheet.c \
+       src/ui/gui/psppire-import-spreadsheet.h \
+       src/ui/gui/psppire-import-textfile.c \
+       src/ui/gui/psppire-import-textfile.h \
        src/ui/gui/psppire-lex-reader.c \
        src/ui/gui/psppire-lex-reader.h \
        src/ui/gui/psppire-output-view.c \
@@ -193,16 +188,14 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-output-window.h \
        src/ui/gui/psppire-scanf.c \
        src/ui/gui/psppire-scanf.h \
+       src/ui/gui/psppire-spreadsheet-data-model.c \
+       src/ui/gui/psppire-spreadsheet-data-model.h \
        src/ui/gui/psppire-spreadsheet-model.c \
        src/ui/gui/psppire-spreadsheet-model.h \
        src/ui/gui/psppire-syntax-window.c \
        src/ui/gui/psppire-syntax-window.h \
        src/ui/gui/psppire-value-entry.c \
        src/ui/gui/psppire-value-entry.h \
-       src/ui/gui/psppire-variable-sheet.c \
-       src/ui/gui/psppire-variable-sheet.h \
-       src/ui/gui/psppire-var-sheet-header.c \
-       src/ui/gui/psppire-var-sheet-header.h \
        src/ui/gui/psppire-window.c \
        src/ui/gui/psppire-window.h \
        src/ui/gui/psppire-window-register.c \
@@ -233,6 +226,8 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
        src/ui/gui/psppire-checkbox-treeview.h \
        src/ui/gui/psppire-conf.c \
        src/ui/gui/psppire-conf.h \
+       src/ui/gui/psppire-data-sheet.c \
+       src/ui/gui/psppire-data-sheet.h \
        src/ui/gui/psppire-dialog-action-1sks.c \
        src/ui/gui/psppire-dialog-action-1sks.h \
        src/ui/gui/psppire-dialog-action-aggregate.c \
@@ -343,6 +338,10 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
        src/ui/gui/psppire-var-ptr.h \
        src/ui/gui/psppire-var-view.c \
        src/ui/gui/psppire-var-view.h \
+       src/ui/gui/psppire-var-sheet-header.c \
+       src/ui/gui/psppire-var-sheet-header.h \
+       src/ui/gui/psppire-variable-sheet.c \
+       src/ui/gui/psppire-variable-sheet.h \
        src/ui/gui/psppire-window-base.c \
        src/ui/gui/psppire-window-base.h \
        src/ui/gui/dialog-common.c \
@@ -355,6 +354,7 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
 src_ui_gui_libwidgets_essential_la_CFLAGS = \
        $(GTK_CFLAGS) \
        $(GTKSOURCEVIEW_CFLAGS) \
+        $(SPREAD_SHEET_WIDGET_CFLAGS) \
        $(AM_CFLAGS)
 
 # The unused-parameter warning is not by default disabled
@@ -397,8 +397,6 @@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
 mimedir = $(datadir)/mime/packages
-mime_DATA = src/ui/gui/pspp.xml
-EXTRA_DIST += src/ui/gui/pspp.xml
 
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/org.fsf.pspp.desktop
@@ -456,7 +454,7 @@ src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_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)
+src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION)  $(SPREAD_SHEET_WIDGET_LIBS)
 
 EXTRA_DIST += src/ui/gui/psppire.xml src/ui/gui/glade-wrapper.in
 
@@ -471,3 +469,5 @@ glade-tools: src/ui/gui/glade-wrapper src/ui/gui/libpsppire-glade.la
 # EXTRA_pkgLTLIBRARIES if DESTDIR is set.  It should not do that.
 install-EXTRA_pkgLTLIBRARIES:
        true
+
+endif