projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index e184975e5c2533b86b8cb694f18fbff1cd6945c5..87795d8dd388d1211fd2de416a49b1521500f933 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-1,7
+1,5
@@
## Process this file with automake to produce Makefile.in -*- makefile -*-
## Process this file with automake to produce Makefile.in -*- makefile -*-
-include $(top_srcdir)/src/ui/gui/sheet/automake.mk
-
UI_FILES = \
src/ui/gui/aggregate.ui \
src/ui/gui/autorecode.ui \
UI_FILES = \
src/ui/gui/aggregate.ui \
src/ui/gui/autorecode.ui \
@@
-11,6
+9,7
@@
UI_FILES = \
src/ui/gui/count.ui \
src/ui/gui/crosstabs.ui \
src/ui/gui/chi-square.ui \
src/ui/gui/count.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 \
src/ui/gui/descriptives.ui \
src/ui/gui/entry-dialog.ui \
src/ui/gui/examine.ui \
@@
-18,10
+17,12
@@
UI_FILES = \
src/ui/gui/factor.ui \
src/ui/gui/find.ui \
src/ui/gui/frequencies.ui \
src/ui/gui/factor.ui \
src/ui/gui/find.ui \
src/ui/gui/frequencies.ui \
+ src/ui/gui/indep-samples.ui \
src/ui/gui/k-means.ui \
src/ui/gui/k-related.ui \
src/ui/gui/ks-one-sample.ui \
src/ui/gui/means.ui \
src/ui/gui/k-means.ui \
src/ui/gui/k-related.ui \
src/ui/gui/ks-one-sample.ui \
src/ui/gui/means.ui \
+ src/ui/gui/missing-val-dialog.ui \
src/ui/gui/oneway.ui \
src/ui/gui/paired-samples.ui \
src/ui/gui/psppire.ui \
src/ui/gui/oneway.ui \
src/ui/gui/paired-samples.ui \
src/ui/gui/psppire.ui \
@@
-37,11
+38,13
@@
UI_FILES = \
src/ui/gui/t-test.ui \
src/ui/gui/text-data-import.ui \
src/ui/gui/univariate.ui \
src/ui/gui/t-test.ui \
src/ui/gui/text-data-import.ui \
src/ui/gui/univariate.ui \
- src/ui/gui/va
r-sheet-dialogs
.ui \
+ src/ui/gui/va
l-labs-dialog
.ui \
src/ui/gui/variable-info.ui \
src/ui/gui/data-editor.ui \
src/ui/gui/output-viewer.ui \
src/ui/gui/variable-info.ui \
src/ui/gui/data-editor.ui \
src/ui/gui/output-viewer.ui \
- src/ui/gui/syntax-editor.ui
+ src/ui/gui/syntax-editor.ui \
+ src/ui/gui/var-sheet.ui \
+ src/ui/gui/var-type-dialog.ui
EXTRA_DIST += \
src/ui/gui/OChangeLog \
EXTRA_DIST += \
src/ui/gui/OChangeLog \
@@
-68,12
+71,12
@@
endif
src_ui_gui_psppire_LDADD = \
src_ui_gui_psppire_LDADD = \
- src/ui/gui/sheet/libsheet.la \
- lib/gtk-contrib/libgtksheet.a \
+ lib/gtk-contrib/libxpaned.a \
src/ui/libuicommon.la \
src/libpspp.la \
src/libpspp-core.la \
$(GTK_LIBS) \
src/ui/libuicommon.la \
src/libpspp.la \
src/libpspp-core.la \
$(GTK_LIBS) \
+ $(GTHREAD_LIBS) \
$(GTKSOURCEVIEW_LIBS) \
$(CAIRO_LIBS) \
$(LIBINTL) \
$(GTKSOURCEVIEW_LIBS) \
$(CAIRO_LIBS) \
$(LIBINTL) \
@@
-129,8
+132,8
@@
dist_src_ui_gui_psppire_DATA = \
$(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
$(top_srcdir)/src/ui/gui/icons/16x16/string.png \
$(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
$(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
$(top_srcdir)/src/ui/gui/icons/16x16/string.png \
$(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
- $(top_srcdir)/src/ui/gui/icons/splash.png
-
+ $(top_srcdir)/src/ui/gui/icons/splash.png
\
+ $(top_srcdir)/src/ui/gui/psppire.gtkrc
src_ui_gui_psppire_SOURCES = \
src/ui/gui/pspp-sheet-private.h \
src_ui_gui_psppire_SOURCES = \
src/ui/gui/pspp-sheet-private.h \
@@
-142,6
+145,10
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/pspp-sheet-view.h \
src/ui/gui/pspp-widget-facade.c \
src/ui/gui/pspp-widget-facade.h \
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-dialog.c \
src/ui/gui/psppire-keypad.c \
src/ui/gui/psppire-selector.c \
@@
-171,8
+178,6
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/count-dialog.h \
src/ui/gui/crosstabs-dialog.c \
src/ui/gui/crosstabs-dialog.h \
src/ui/gui/count-dialog.h \
src/ui/gui/crosstabs-dialog.c \
src/ui/gui/crosstabs-dialog.h \
- src/ui/gui/customentry.c \
- src/ui/gui/customentry.h \
src/ui/gui/dialog-common.c \
src/ui/gui/dialog-common.h \
src/ui/gui/dict-display.h \
src/ui/gui/dialog-common.c \
src/ui/gui/dialog-common.h \
src/ui/gui/dict-display.h \
@@
-183,8
+188,6
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/executor.h \
src/ui/gui/find-dialog.c \
src/ui/gui/find-dialog.h \
src/ui/gui/executor.h \
src/ui/gui/find-dialog.c \
src/ui/gui/find-dialog.h \
- src/ui/gui/factor-dialog.c \
- src/ui/gui/factor-dialog.h \
src/ui/gui/frequencies-dialog.c \
src/ui/gui/frequencies-dialog.h \
src/ui/gui/goto-case-dialog.c \
src/ui/gui/frequencies-dialog.c \
src/ui/gui/frequencies-dialog.h \
src/ui/gui/goto-case-dialog.c \
@@
-212,6
+215,8
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-conf.h \
src/ui/gui/psppire-data-editor.c \
src/ui/gui/psppire-data-editor.h \
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 \
src/ui/gui/psppire-data-store.c \
src/ui/gui/psppire-data-store.h \
src/ui/gui/psppire-data-window.c \
@@
-225,18
+230,26
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-dialog-action-descriptives.h \
src/ui/gui/psppire-dialog-action-examine.c \
src/ui/gui/psppire-dialog-action-examine.h \
src/ui/gui/psppire-dialog-action-descriptives.h \
src/ui/gui/psppire-dialog-action-examine.c \
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-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-means.c \
src/ui/gui/psppire-dialog-action-means.h \
src/ui/gui/psppire-dialog-action-kmeans.c \
src/ui/gui/psppire-dialog-action-kmeans.h \
src/ui/gui/psppire-dialog-action-means.c \
src/ui/gui/psppire-dialog-action-means.h \
+ src/ui/gui/psppire-dialog-action-rank.c \
+ src/ui/gui/psppire-dialog-action-rank.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-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-sort.c \
src/ui/gui/psppire-dialog-action-sort.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-sort.c \
src/ui/gui/psppire-dialog-action-sort.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-roc.c \
- src/ui/gui/psppire-dialog-action-roc.h \
src/ui/gui/psppire-dict.c \
src/ui/gui/psppire-dict.h \
src/ui/gui/psppire-dictview.c \
src/ui/gui/psppire-dict.c \
src/ui/gui/psppire-dict.h \
src/ui/gui/psppire-dictview.c \
@@
-270,8
+283,6
@@
src_ui_gui_psppire_SOURCES = \
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-ptr.h \
src/ui/gui/psppire-var-sheet.c \
src/ui/gui/psppire-var-sheet.h \
- src/ui/gui/psppire-var-store.c \
- src/ui/gui/psppire-var-store.h \
src/ui/gui/psppire-vbuttonbox.h \
src/ui/gui/psppire-window.c \
src/ui/gui/psppire-window.h \
src/ui/gui/psppire-vbuttonbox.h \
src/ui/gui/psppire-window.c \
src/ui/gui/psppire-window.h \
@@
-279,12
+290,8
@@
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/psppire-window-base.h \
src/ui/gui/psppire-window-register.c \
src/ui/gui/psppire-window-register.h \
- src/ui/gui/rank-dialog.c \
- src/ui/gui/rank-dialog.h \
src/ui/gui/recode-dialog.c \
src/ui/gui/recode-dialog.h \
src/ui/gui/recode-dialog.c \
src/ui/gui/recode-dialog.h \
- src/ui/gui/regression-dialog.c \
- src/ui/gui/regression-dialog.h \
src/ui/gui/runs-dialog.c \
src/ui/gui/runs-dialog.h \
src/ui/gui/select-cases-dialog.c \
src/ui/gui/runs-dialog.c \
src/ui/gui/runs-dialog.h \
src/ui/gui/select-cases-dialog.c \
@@
-295,8
+302,6
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/text-data-import-dialog.h \
src/ui/gui/transpose-dialog.c \
src/ui/gui/transpose-dialog.h \
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-independent-samples-dialog.c \
- src/ui/gui/t-test-independent-samples-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-one-sample.c \
src/ui/gui/t-test-one-sample.h \
src/ui/gui/t-test-options.c \
@@
-378,3
+383,4
@@
src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
mv $@-t $@
CLEANFILES += src/ui/gui/include/gtk/gtk.h
EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
mv $@-t $@
CLEANFILES += src/ui/gui/include/gtk/gtk.h
EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
+