projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 92acbd69409776f1cb2e092d0e7892ad5dcc162f..110ef43f04ac2d53551ba457153a75fd0208888b 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-4,8
+4,10
@@
include $(top_srcdir)/src/ui/gui/sheet/automake.mk
bin_PROGRAMS += src/ui/gui/psppire
bin_PROGRAMS += src/ui/gui/psppire
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
- -DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
+ -DINSTALLDIR=\"$(bindir)\" \
+ -DDOCDIR=\"$(docdir)\" \
+ -DGDK_MULTIHEAD_SAFE=1
src_ui_gui_psppire_LDFLAGS = \
src_ui_gui_psppire_LDFLAGS = \
@@
-27,9
+29,7
@@
src_ui_gui_psppire_LDADD = \
src/libpspp.la \
src/libpspp-core.la \
$(GTK_LIBS) \
src/libpspp.la \
src/libpspp-core.la \
$(GTK_LIBS) \
- $(GLADE_LIBS) \
- @LIBINTL@ \
- $(LIB_CLOSE)
+ @LIBINTL@
src_ui_gui_psppiredir = $(pkgdatadir)
src_ui_gui_psppiredir = $(pkgdatadir)
@@
-61,6
+61,7
@@
nodist_src_ui_gui_psppire_DATA = \
$(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/descriptives-dialog.ui \
$(top_builddir)/src/ui/gui/data-editor.ui \
$(top_builddir)/src/ui/gui/examine.ui \
+ $(top_builddir)/src/ui/gui/find.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/frequencies.ui \
$(top_builddir)/src/ui/gui/message-dialog.ui \
$(top_builddir)/src/ui/gui/psppire.ui \
@@
-69,12
+70,15
@@
nodist_src_ui_gui_psppire_DATA = \
$(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/rank.ui \
$(top_builddir)/src/ui/gui/recode.ui \
$(top_builddir)/src/ui/gui/regression.ui \
+ $(top_builddir)/src/ui/gui/reliability.ui \
$(top_builddir)/src/ui/gui/syntax-editor.ui \
$(top_builddir)/src/ui/gui/text-data-import.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/t-test.ui \
+ $(top_builddir)/src/ui/gui/var-sheet-dialogs.ui \
+ $(top_builddir)/src/ui/gui/variable-info-dialog.ui
+
dist_src_ui_gui_psppire_DATA = \
dist_src_ui_gui_psppire_DATA = \
- $(top_srcdir)/src/ui/gui/text-data-import.glade \
$(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\
$(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\
@@
-116,10
+120,12
@@
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/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.h \
+ src/ui/gui/dict-display.c \
src/ui/gui/examine-dialog.c \
src/ui/gui/examine-dialog.h \
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/frequencies-dialog.c \
src/ui/gui/find-dialog.c \
src/ui/gui/find-dialog.h \
src/ui/gui/frequencies-dialog.c \
@@
-139,6
+145,8
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire.h \
src/ui/gui/psppire-acr.h \
src/ui/gui/psppire-buttonbox.h \
src/ui/gui/psppire.h \
src/ui/gui/psppire-acr.h \
src/ui/gui/psppire-buttonbox.h \
+ src/ui/gui/psppire-conf.c \
+ 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-store.c \
src/ui/gui/psppire-data-editor.c \
src/ui/gui/psppire-data-editor.h \
src/ui/gui/psppire-data-store.c \
@@
-148,6
+156,8
@@
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-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-hbuttonbox.h \
src/ui/gui/psppire-keypad.h \
src/ui/gui/psppire-output-window.c \
@@
-172,6
+182,8
@@
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/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/select-cases-dialog.c \
src/ui/gui/select-cases-dialog.h \
src/ui/gui/sort-cases-dialog.c \
src/ui/gui/select-cases-dialog.c \
src/ui/gui/select-cases-dialog.h \
src/ui/gui/sort-cases-dialog.c \
@@
-210,6
+222,7
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/descriptives-dialog.glade \
src/ui/gui/data-editor.glade \
src/ui/gui/examine.glade \
src/ui/gui/descriptives-dialog.glade \
src/ui/gui/data-editor.glade \
src/ui/gui/examine.glade \
+ src/ui/gui/find.glade \
src/ui/gui/frequencies.glade \
src/ui/gui/message-dialog.glade \
src/ui/gui/psppire.glade \
src/ui/gui/frequencies.glade \
src/ui/gui/message-dialog.glade \
src/ui/gui/psppire.glade \
@@
-218,8
+231,12
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/rank.glade \
src/ui/gui/recode.glade \
src/ui/gui/regression.glade \
src/ui/gui/rank.glade \
src/ui/gui/recode.glade \
src/ui/gui/regression.glade \
+ src/ui/gui/reliability.glade \
src/ui/gui/syntax-editor.glade \
src/ui/gui/syntax-editor.glade \
- src/ui/gui/t-test.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
nodist_src_ui_gui_psppire_SOURCES = \
nodist_src_ui_gui_psppire_SOURCES = \
@@
-242,18
+259,25
@@
PHONY += yelp-check
AM_CPPFLAGS += -Isrc
src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
AM_CPPFLAGS += -Isrc
src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
- glib-genmarshal --body --prefix=psppire_marshal $< > $@
+ echo '#include <config.h>' > $@
+ glib-genmarshal --body --prefix=psppire_marshal $< >> $@
src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
glib-genmarshal --header --prefix=psppire_marshal $< > $@
.glade.ui:
src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
glib-genmarshal --header --prefix=psppire_marshal $< > $@
.glade.ui:
- gtk-builder-convert $< $@
+ $(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@
+
+desktopdir = $(datadir)/applications
+desktop_DATA = src/ui/gui/pspp.desktop
EXTRA_DIST += src/ui/gui/OChangeLog\
src/ui/gui/psppicon.png \
EXTRA_DIST += src/ui/gui/OChangeLog\
src/ui/gui/psppicon.png \
- src/ui/gui/marshaller-list
+ src/ui/gui/marshaller-list \
+ $(desktop_DATA)
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 \
$(nodist_src_ui_gui_psppire_DATA)
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 \
$(nodist_src_ui_gui_psppire_DATA)
+
+