X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=0a827a3a489876cba70598abcf2ee7fbc946a576;hb=86c375340d9440a413ed014a3db81987f7d66b95;hp=e104b275e45e2705258d55544b203388d5dda2f0;hpb=e589b646894ffc013ab5e57981c8ac07bce522dd;p=pspp-builds.git diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index e104b275..0a827a3a 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -4,10 +4,7 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk bin_PROGRAMS += src/ui/gui/psppire -src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \ - -DINSTALLDIR=\"$(bindir)\" \ - -DDOCDIR=\"$(docdir)\" \ - -DGDK_MULTIHEAD_SAFE=1 +src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 src_ui_gui_psppire_LDFLAGS = \ @@ -29,8 +26,7 @@ src_ui_gui_psppire_LDADD = \ src/libpspp.la \ src/libpspp-core.la \ $(GTK_LIBS) \ - @LIBINTL@ \ - $(LIB_CLOSE) + $(LIBINTL) src_ui_gui_psppiredir = $(pkgdatadir) @@ -50,34 +46,43 @@ INSTALL_DATA_HOOKS += install-icons uninstall-icons: for size in 16x16 ; do \ - $(RM) $(themedir)/$$size/$(context)/psppicon.png ; \ + rm -f $(themedir)/$$size/$(context)/psppicon.png ; \ done gtk-update-icon-cache --ignore-theme-index $(themedir) UNINSTALL_DATA_HOOKS += uninstall-icons +UI_FILES = \ + src/ui/gui/correlation.ui \ + src/ui/gui/crosstabs.ui \ + src/ui/gui/descriptives.ui \ + src/ui/gui/examine.ui \ + src/ui/gui/factor.ui \ + src/ui/gui/find.ui \ + src/ui/gui/frequencies.ui \ + src/ui/gui/message-dialog.ui \ + src/ui/gui/oneway.ui \ + src/ui/gui/psppire.ui \ + src/ui/gui/rank.ui \ + src/ui/gui/sort.ui \ + src/ui/gui/recode.ui \ + src/ui/gui/regression.ui \ + src/ui/gui/reliability.ui \ + src/ui/gui/roc.ui \ + src/ui/gui/t-test.ui \ + src/ui/gui/text-data-import.ui \ + src/ui/gui/var-sheet-dialogs.ui \ + src/ui/gui/variable-info.ui + nodist_src_ui_gui_psppire_DATA = \ - $(top_builddir)/src/ui/gui/crosstabs.ui \ - $(top_builddir)/src/ui/gui/descriptives-dialog.ui \ $(top_builddir)/src/ui/gui/data-editor.ui \ - $(top_builddir)/src/ui/gui/examine.ui \ - $(top_builddir)/src/ui/gui/frequencies.ui \ - $(top_builddir)/src/ui/gui/message-dialog.ui \ - $(top_builddir)/src/ui/gui/psppire.ui \ - $(top_builddir)/src/ui/gui/oneway.ui \ $(top_builddir)/src/ui/gui/output-viewer.ui \ - $(top_builddir)/src/ui/gui/rank.ui \ - $(top_builddir)/src/ui/gui/recode.ui \ - $(top_builddir)/src/ui/gui/regression.ui \ - $(top_builddir)/src/ui/gui/syntax-editor.ui \ - $(top_builddir)/src/ui/gui/text-data-import.ui \ - $(top_builddir)/src/ui/gui/t-test.ui \ - $(top_builddir)/src/ui/gui/var-sheet-dialogs.ui \ - $(top_builddir)/src/ui/gui/variable-info-dialog.ui + $(top_builddir)/src/ui/gui/syntax-editor.ui dist_src_ui_gui_psppire_DATA = \ + $(UI_FILES) \ $(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\ @@ -111,6 +116,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/comments-dialog.h \ src/ui/gui/compute-dialog.c \ src/ui/gui/compute-dialog.h \ + src/ui/gui/correlation-dialog.c \ + src/ui/gui/correlation-dialog.h \ src/ui/gui/crosstabs-dialog.c \ src/ui/gui/crosstabs-dialog.h \ src/ui/gui/customentry.c \ @@ -119,12 +126,16 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/descriptives-dialog.h \ src/ui/gui/dialog-common.c \ src/ui/gui/dialog-common.h \ - src/ui/gui/dict-display.c \ src/ui/gui/dict-display.h \ + src/ui/gui/dict-display.c \ src/ui/gui/examine-dialog.c \ src/ui/gui/examine-dialog.h \ + src/ui/gui/executor.c \ + 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 \ @@ -153,11 +164,17 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-dialog.h \ src/ui/gui/psppire-dict.c \ src/ui/gui/psppire-dict.h \ + src/ui/gui/psppire-dictview.c \ + src/ui/gui/psppire-dictview.h \ src/ui/gui/psppire-hbuttonbox.h \ src/ui/gui/psppire-keypad.h \ src/ui/gui/psppire-output-window.c \ src/ui/gui/psppire-output-window.h \ + src/ui/gui/psppire-var-view.c \ + src/ui/gui/psppire-var-view.h \ src/ui/gui/psppire-selector.h \ + src/ui/gui/psppire-select-dest.c \ + src/ui/gui/psppire-select-dest.h \ src/ui/gui/psppire-syntax-window.c \ src/ui/gui/psppire-syntax-window.h \ src/ui/gui/psppire-var-ptr.c \ @@ -177,6 +194,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/select-cases-dialog.c \ src/ui/gui/select-cases-dialog.h \ src/ui/gui/sort-cases-dialog.c \ @@ -211,23 +232,9 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/widget-io.h \ src/ui/gui/widgets.c \ src/ui/gui/widgets.h \ - src/ui/gui/crosstabs.glade \ - src/ui/gui/descriptives-dialog.glade \ src/ui/gui/data-editor.glade \ - src/ui/gui/examine.glade \ - src/ui/gui/frequencies.glade \ - src/ui/gui/message-dialog.glade \ - src/ui/gui/psppire.glade \ - src/ui/gui/oneway.glade \ src/ui/gui/output-viewer.glade \ - src/ui/gui/rank.glade \ - src/ui/gui/recode.glade \ - src/ui/gui/regression.glade \ - src/ui/gui/syntax-editor.glade \ - src/ui/gui/text-data-import.glade \ - src/ui/gui/t-test.glade \ - src/ui/gui/var-sheet-dialogs.glade \ - src/ui/gui/variable-info-dialog.glade + src/ui/gui/syntax-editor.glade nodist_src_ui_gui_psppire_SOURCES = \ @@ -250,11 +257,13 @@ PHONY += yelp-check AM_CPPFLAGS += -Isrc src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list - glib-genmarshal --body --prefix=psppire_marshal $< > $@ + echo '#include ' > $@ + glib-genmarshal --body --prefix=psppire_marshal $? >> $@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list - glib-genmarshal --header --prefix=psppire_marshal $< > $@ + glib-genmarshal --header --prefix=psppire_marshal $? > $@ +SUFFIXES += .glade .ui .glade.ui: $(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@