Merge remote-tracking branch 'origin/master' into sheet

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index c2577cb8459f618854ab923a1a4f95d42a883f9a..1155cf70db779a1b41dd91f9f030b1e9bdc3bd91 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -54,7 +54,7 @@ UI_FILES = \
 
 
 $(top_srcdir)/doc/help-pages-list: $(UI_FILES)
-        cat $^ | grep '"help[-_]page"' | \
+        $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
    $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
        -e 's%#%'"'"']/*[@id='"'"'%g' > $@
 
@@ -69,6 +69,7 @@ EXTRA_DIST += \
        src/ui/gui/marshaller-list \
        src/ui/gui/pspplogo.svg
 
+src_ui_gui_psppire_CPPFLAGS=
 
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
@@ -151,8 +152,6 @@ src_ui_gui_psppire_SOURCES = \
        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/dialog-common.c \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
@@ -205,6 +204,8 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -239,6 +240,12 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -251,6 +258,10 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -296,8 +307,9 @@ src_ui_gui_psppire_SOURCES = \
        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-var-sheet-header.h \
+       src/ui/gui/psppire-var-sheet-header.c \
        src/ui/gui/psppire-vbuttonbox.h \
        src/ui/gui/psppire-window.c \
        src/ui/gui/psppire-window.h \
@@ -305,12 +317,6 @@ src_ui_gui_psppire_SOURCES = \
        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/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 \
@@ -322,7 +328,9 @@ src_ui_gui_psppire_SOURCES = \
        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/widgets.h \
+       src/ui/gui/windows-menu.c \
+       src/ui/gui/windows-menu.h
 
 
 OBSOLETE = \
@@ -381,6 +389,7 @@ dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
        $(nodist_src_ui_gui_psppire_DATA)
+include $(top_srcdir)/src/ui/gui/efficient-sheet.mk
 endif HAVE_GUI
 
 #ensure the installcheck passes even if there is no X server available
@@ -388,7 +397,7 @@ 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