X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=9ae69bf1fb51d0383093779fe1c8b09ef9041fc4;hb=83477e8021833536509416fc98179546e4cfb6a7;hp=57d9163ce120ba84b9ef943f44ce48b7540a0e8b;hpb=c9d55afdda746d7e8b39e5a117c1644debbb0c75;p=pspp-builds.git diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 57d9163c..9ae69bf1 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -9,6 +9,7 @@ src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \ src_ui_gui_psppire_LDFLAGS = \ + $(PSPPIRE_LDFLAGS) \ $(PG_LDFLAGS) @@ -60,26 +61,45 @@ src_ui_gui_psppire_LDADD = \ src/libpspp-core.la \ $(GTK_LIBS) \ $(GLADE_LIBS) \ - @LIBINTL@ + @LIBINTL@ \ + $(LIB_CLOSE) src_ui_gui_psppiredir = $(pkgdatadir) -dist_src_ui_gui_psppire_DATA = \ - $(top_srcdir)/src/ui/gui/data-editor.glade \ +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/t-test.ui + +EXTRA_DIST += \ + $(top_srcdir)/src/ui/gui/crosstabs.glade \ $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ + $(top_srcdir)/src/ui/gui/data-editor.glade \ $(top_srcdir)/src/ui/gui/examine.glade \ - $(top_srcdir)/src/ui/gui/crosstabs.glade \ $(top_srcdir)/src/ui/gui/frequencies.glade \ $(top_srcdir)/src/ui/gui/message-dialog.glade \ + $(top_srcdir)/src/ui/gui/psppire.glade \ $(top_srcdir)/src/ui/gui/oneway.glade \ $(top_srcdir)/src/ui/gui/output-viewer.glade \ - $(top_srcdir)/src/ui/gui/psppire.glade \ $(top_srcdir)/src/ui/gui/rank.glade \ $(top_srcdir)/src/ui/gui/recode.glade \ $(top_srcdir)/src/ui/gui/regression.glade \ $(top_srcdir)/src/ui/gui/syntax-editor.glade \ + $(top_srcdir)/src/ui/gui/t-test.glade + +dist_src_ui_gui_psppire_DATA = \ $(top_srcdir)/src/ui/gui/text-data-import.glade \ - $(top_srcdir)/src/ui/gui/t-test.glade \ $(top_srcdir)/src/ui/gui/psppicon.png \ $(top_srcdir)/src/ui/gui/pspplogo.png \ $(top_srcdir)/src/ui/gui/icons/value-labels.png \ @@ -103,62 +123,68 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/about.h \ src/ui/gui/checkbox-treeview.c \ src/ui/gui/checkbox-treeview.h \ - src/ui/gui/compute-dialog.c \ - src/ui/gui/compute-dialog.h \ src/ui/gui/comments-dialog.c \ src/ui/gui/comments-dialog.h \ + src/ui/gui/compute-dialog.c \ + src/ui/gui/compute-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/frequencies-dialog.c \ - src/ui/gui/frequencies-dialog.h \ - src/ui/gui/goto-case-dialog.c \ - src/ui/gui/goto-case-dialog.h \ - src/ui/gui/data-editor.c \ - src/ui/gui/data-editor.h \ src/ui/gui/descriptives-dialog.c \ src/ui/gui/descriptives-dialog.h \ - src/ui/gui/examine-dialog.c \ - src/ui/gui/examine-dialog.h \ - src/ui/gui/find-dialog.c \ - src/ui/gui/find-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/examine-dialog.c \ + src/ui/gui/examine-dialog.h \ + src/ui/gui/find-dialog.c \ + src/ui/gui/find-dialog.h \ + src/ui/gui/frequencies-dialog.c \ + src/ui/gui/frequencies-dialog.h \ + src/ui/gui/goto-case-dialog.c \ + src/ui/gui/goto-case-dialog.h \ + src/ui/gui/helper.c \ + src/ui/gui/helper.h \ src/ui/gui/main.c \ src/ui/gui/message-dialog.c \ src/ui/gui/message-dialog.h \ - src/ui/gui/psppire.c \ - src/ui/gui/psppire.h \ - src/ui/gui/helper.c \ - src/ui/gui/helper.h \ src/ui/gui/missing-val-dialog.c \ src/ui/gui/missing-val-dialog.h \ src/ui/gui/oneway-anova-dialog.c \ src/ui/gui/oneway-anova-dialog.h \ - src/ui/gui/output-viewer.c \ - src/ui/gui/output-viewer.h \ + 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-hbuttonbox.h \ - src/ui/gui/psppire-vbuttonbox.h \ src/ui/gui/psppire-data-editor.c \ src/ui/gui/psppire-data-editor.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-window.h \ src/ui/gui/psppire-dialog.h \ src/ui/gui/psppire-dict.c \ src/ui/gui/psppire-dict.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-selector.h \ + src/ui/gui/psppire-syntax-window.c \ + src/ui/gui/psppire-syntax-window.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-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-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 \ @@ -171,8 +197,6 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/sort-cases-dialog.h \ src/ui/gui/split-file-dialog.c \ src/ui/gui/split-file-dialog.h \ - src/ui/gui/syntax-editor.c \ - src/ui/gui/syntax-editor.h \ src/ui/gui/syntax-editor-source.c \ src/ui/gui/syntax-editor-source.h \ src/ui/gui/text-data-import-dialog.c \ @@ -191,24 +215,20 @@ src_ui_gui_psppire_SOURCES = \ 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/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 \ src/ui/gui/weight-cases-dialog.h \ src/ui/gui/widget-io.c \ - src/ui/gui/widget-io.h \ - src/ui/gui/window-manager.c \ - src/ui/gui/window-manager.h + src/ui/gui/widget-io.h nodist_src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-marshal.c \ src/ui/gui/psppire-marshal.h - - yelp-check: @if ! yelp --version > /dev/null 2>&1 ; then \ echo ; \ @@ -228,8 +248,12 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list glib-genmarshal --header --prefix=psppire_marshal $< > $@ +.glade.ui: + gtk-builder-convert $< $@ + EXTRA_DIST += src/ui/gui/OChangeLog\ src/ui/gui/marshaller-list 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 +CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \ + $(nodist_src_ui_gui_psppire_DATA)