X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=560d44af835ea58582dc410611dd5754ef1ef9ef;hb=b367f5ac49aa1b4f0ea7d76e322e40b824f607b9;hp=e4ef91eb4f3310877829a923ca78fdee04b33c31;hpb=e30f5e6b6bf7a3b862dacce6b17635e8bf0d909d;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index e4ef91eb4f..560d44af83 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -35,6 +35,7 @@ UI_FILES = \ src/ui/gui/select-cases.ui \ src/ui/gui/t-test.ui \ src/ui/gui/text-data-import.ui \ + src/ui/gui/univariate.ui \ src/ui/gui/var-sheet-dialogs.ui \ src/ui/gui/variable-info.ui \ src/ui/gui/data-editor.ui \ @@ -43,14 +44,13 @@ UI_FILES = \ EXTRA_DIST += \ src/ui/gui/OChangeLog \ - src/ui/gui/psppicon.png \ src/ui/gui/marshaller-list \ src/ui/gui/pspp.desktop if HAVE_GUI bin_PROGRAMS += src/ui/gui/psppire -src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 +src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 src_ui_gui_psppire_LDFLAGS = \ @@ -72,27 +72,36 @@ src_ui_gui_psppire_LDADD = \ src/libpspp.la \ src/libpspp-core.la \ $(GTK_LIBS) \ - $(CAIRO_LIBS) + $(GTKSOURCEVIEW_LIBS) \ + $(CAIRO_LIBS) \ + $(LIBINTL) \ + $(GSL_LIBS) src_ui_gui_psppiredir = $(pkgdatadir) themedir = $(DESTDIR)$(datadir)/icons/hicolor -context = apps +context = pspp +install-lang: + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir) + install-icons: for size in 16x16 ; do \ $(MKDIR_P) $(themedir)/$$size/$(context) ; \ - $(INSTALL) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \ + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \ + $(MKDIR_P) $(themedir)/$$size/apps ; \ + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \ done gtk-update-icon-cache --ignore-theme-index $(themedir) -INSTALL_DATA_HOOKS += install-icons +INSTALL_DATA_HOOKS += install-icons install-lang uninstall-icons: for size in 16x16 ; do \ - rm -f $(themedir)/$$size/$(context)/psppicon.png ; \ + rm -r -f $(themedir)/$$size/$(context); \ + rm -f $(themedir)/$$size/apps/pspp.png; \ done gtk-update-icon-cache --ignore-theme-index $(themedir) @@ -100,6 +109,8 @@ UNINSTALL_DATA_HOOKS += uninstall-icons dist_src_ui_gui_psppire_DATA = \ $(UI_FILES) \ + $(top_srcdir)/src/ui/gui/app-icons/16x16/pspp.png \ + $(top_srcdir)/src/ui/gui/pspp.lang \ $(top_srcdir)/src/ui/gui/pspplogo.png \ $(top_srcdir)/src/ui/gui/icons/value-labels.png \ $(top_srcdir)/src/ui/gui/icons/goto-variable.png\ @@ -114,7 +125,7 @@ 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/splash.png + $(top_srcdir)/src/ui/gui/icons/splash.png src_ui_gui_psppire_SOURCES = \ @@ -133,6 +144,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/aggregate-dialog.h \ src/ui/gui/binomial-dialog.c \ src/ui/gui/binomial-dialog.h \ + src/ui/gui/builder-wrapper.c \ + src/ui/gui/builder-wrapper.h \ src/ui/gui/checkbox-treeview.c \ src/ui/gui/checkbox-treeview.h \ src/ui/gui/comments-dialog.c \ @@ -141,16 +154,12 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/compute-dialog.h \ src/ui/gui/chi-square-dialog.c \ src/ui/gui/chi-square-dialog.h \ - src/ui/gui/correlation-dialog.c \ - src/ui/gui/correlation-dialog.h \ src/ui/gui/count-dialog.c \ 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/descriptives-dialog.c \ - src/ui/gui/descriptives-dialog.h \ src/ui/gui/dialog-common.c \ src/ui/gui/dialog-common.h \ src/ui/gui/dict-display.h \ @@ -175,8 +184,6 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/helper.h \ src/ui/gui/k-related-dialog.c \ src/ui/gui/k-related-dialog.h \ - src/ui/gui/k-means-dialog.c \ - src/ui/gui/k-means-dialog.h \ src/ui/gui/ks-one-sample-dialog.c \ src/ui/gui/ks-one-sample-dialog.h \ src/ui/gui/main.c \ @@ -199,6 +206,22 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-data-window.c \ src/ui/gui/psppire-data-window.h \ 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-correlation.c \ + src/ui/gui/psppire-dialog-action-correlation.h \ + src/ui/gui/psppire-dialog-action-descriptives.c \ + src/ui/gui/psppire-dialog-action-descriptives.h \ + src/ui/gui/psppire-dialog-action-kmeans.c \ + src/ui/gui/psppire-dialog-action-kmeans.h \ + src/ui/gui/psppire-dialog-action-reliability.c \ + src/ui/gui/psppire-dialog-action-reliability.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 \ @@ -207,6 +230,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-encoding-selector.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-output-window.c \ src/ui/gui/psppire-output-window.h \ src/ui/gui/psppire-var-view.c \ @@ -227,6 +252,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-vbuttonbox.h \ 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/rank-dialog.c \ @@ -235,16 +262,10 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/recode-dialog.h \ src/ui/gui/regression-dialog.c \ src/ui/gui/regression-dialog.h \ - src/ui/gui/reliability-dialog.c \ - src/ui/gui/reliability-dialog.h \ - src/ui/gui/roc-dialog.c \ - src/ui/gui/roc-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/sort-cases-dialog.c \ - src/ui/gui/sort-cases-dialog.h \ src/ui/gui/split-file-dialog.c \ src/ui/gui/split-file-dialog.h \ src/ui/gui/text-data-import-dialog.c \ @@ -261,12 +282,12 @@ src_ui_gui_psppire_SOURCES = \ 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/variable-info-dialog.c \ - src/ui/gui/variable-info-dialog.h \ src/ui/gui/var-type-dialog.c \ src/ui/gui/var-type-dialog.h \ src/ui/gui/weight-cases-dialog.c \