projects / pspp / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 0200348656aa3cec6dba9b7b121a23c92a0d1830..f4791522a487fbfce5d001d727d0978be915ade6 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -11,7 +11,6 @@ UI_FILES = \
        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 \
@@ -48,13 +47,12 @@ UI_FILES = \
        src/ui/gui/data-editor.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/weight.ui
 
 
 $(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' > $@
 
@@ -63,12 +61,11 @@ EXTRA_DIST += doc/help-pages-list
 
 EXTRA_DIST += \
        src/ui/gui/memorandum.txt \
-       src/ui/gui/artwork/actions/.empty \
-       src/ui/gui/artwork/apps/scalable/.empty \
        src/ui/gui/gen-dot-desktop.sh \
        src/ui/gui/marshaller-list \
        src/ui/gui/pspplogo.svg
 
+src_ui_gui_psppire_CPPFLAGS=
 
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
@@ -125,32 +122,18 @@ dist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/psppire.gtkrc
 
 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/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/dialog-common.c \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
@@ -173,7 +156,6 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -203,6 +185,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 \
@@ -237,6 +221,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 \
@@ -249,6 +239,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 \
@@ -257,6 +251,8 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -267,7 +263,6 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -292,21 +287,31 @@ 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-vbuttonbox.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/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/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 \
@@ -320,25 +325,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/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/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 \
@@ -359,6 +352,13 @@ src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
 
 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
        $(AM_V_GEN)echo '#include <config.h>' > $@
        $(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
@@ -372,9 +372,12 @@ desktop_DATA = src/ui/gui/pspp.desktop
 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
+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) 
+
+include $(top_srcdir)/src/ui/gui/efficient-sheet.mk
 endif HAVE_GUI
 
 #ensure the installcheck passes even if there is no X server available
@@ -382,7 +385,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
@@ -396,7 +399,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
 
Unnamed repository; edit this file to name it for gitweb.