projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made var_is_valid_name more permissive.
[pspp]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 748a12dfc4559e9e2f428f835b307a95fc297b1f..0d3bbc187dbf86d9bd503e9ea8b0ac92f617fe9c 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-5,7
+5,9
@@
include $(top_srcdir)/src/ui/gui/sheet/automake.mk
bin_PROGRAMS += src/ui/gui/psppire
src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
bin_PROGRAMS += src/ui/gui/psppire
src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
- -DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1
+ -DINSTALLDIR=\"$(bindir)\" \
+ -DDOCDIR=\"$(docdir)\" \
+ -DGDK_MULTIHEAD_SAFE=1
src_ui_gui_psppire_LDFLAGS = \
src_ui_gui_psppire_LDFLAGS = \
@@
-70,7
+72,10
@@
nodist_src_ui_gui_psppire_DATA = \
$(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/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/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 = \
$(top_srcdir)/src/ui/gui/pspplogo.png \
dist_src_ui_gui_psppire_DATA = \
$(top_srcdir)/src/ui/gui/pspplogo.png \
@@
-114,8
+119,8
@@
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/find-dialog.c \
src/ui/gui/examine-dialog.c \
src/ui/gui/examine-dialog.h \
src/ui/gui/find-dialog.c \
@@
-137,6
+142,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 \
@@
-146,6
+153,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 \
@@
-218,7
+227,9
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/regression.glade \
src/ui/gui/syntax-editor.glade \
src/ui/gui/text-data-import.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/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 = \
@@
-241,13
+252,14
@@
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
desktopdir = $(datadir)/applications
desktop_DATA = src/ui/gui/pspp.desktop