projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove call to gtk_style_context_add_provider_for_screen
[pspp]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 43068f2876c87d638ac82a3ccffb0034131ebc9c..e991eb2e47532e125c5151467f4ade270cc5249e 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-11,7
+11,6
@@
UI_FILES = \
src/ui/gui/comments.ui \
src/ui/gui/crosstabs.ui \
src/ui/gui/chi-square.ui \
src/ui/gui/comments.ui \
src/ui/gui/crosstabs.ui \
src/ui/gui/chi-square.ui \
- src/ui/gui/data-sheet.ui \
src/ui/gui/descriptives.ui \
src/ui/gui/entry-dialog.ui \
src/ui/gui/examine.ui \
src/ui/gui/descriptives.ui \
src/ui/gui/entry-dialog.ui \
src/ui/gui/examine.ui \
@@
-48,7
+47,6
@@
UI_FILES = \
src/ui/gui/data-editor.ui \
src/ui/gui/output-window.ui \
src/ui/gui/syntax-editor.ui \
src/ui/gui/data-editor.ui \
src/ui/gui/output-window.ui \
src/ui/gui/syntax-editor.ui \
- src/ui/gui/var-sheet.ui \
src/ui/gui/var-type-dialog.ui \
src/ui/gui/weight.ui
src/ui/gui/var-type-dialog.ui \
src/ui/gui/weight.ui
@@
-63,8
+61,6
@@
EXTRA_DIST += doc/help-pages-list
EXTRA_DIST += \
src/ui/gui/memorandum.txt \
EXTRA_DIST += \
src/ui/gui/memorandum.txt \
- src/ui/gui/artwork/actions/.empty \
- src/ui/gui/artwork/apps/scalable/.empty \
src/ui/gui/gen-dot-desktop.sh \
src/ui/gui/marshaller-list \
src/ui/gui/pspplogo.svg
src/ui/gui/gen-dot-desktop.sh \
src/ui/gui/marshaller-list \
src/ui/gui/pspplogo.svg
@@
-142,8
+138,7
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-keypad.c \
src/ui/gui/psppire-selector.c \
src/ui/gui/psppire-buttonbox.c \
src/ui/gui/psppire-keypad.c \
src/ui/gui/psppire-selector.c \
src/ui/gui/psppire-buttonbox.c \
- src/ui/gui/psppire-hbuttonbox.c \
- src/ui/gui/psppire-vbuttonbox.c \
+ src/ui/gui/psppire-buttonbox.h \
src/ui/gui/psppire-scanf.c \
src/ui/gui/psppire-scanf.h \
src/ui/gui/psppire-acr.c \
src/ui/gui/psppire-scanf.c \
src/ui/gui/psppire-scanf.h \
src/ui/gui/psppire-acr.c \
@@
-173,7
+168,6
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire.c \
src/ui/gui/psppire.h \
src/ui/gui/psppire-acr.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-checkbox-treeview.c \
src/ui/gui/psppire-checkbox-treeview.h \
src/ui/gui/psppire-conf.c \
src/ui/gui/psppire-checkbox-treeview.c \
src/ui/gui/psppire-checkbox-treeview.h \
src/ui/gui/psppire-conf.c \
@@
-241,6
+235,10
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-dialog-action-rank.h \
src/ui/gui/psppire-dialog-action-recode.c \
src/ui/gui/psppire-dialog-action-recode.h \
src/ui/gui/psppire-dialog-action-rank.h \
src/ui/gui/psppire-dialog-action-recode.c \
src/ui/gui/psppire-dialog-action-recode.h \
+ src/ui/gui/psppire-dialog-action-recode-same.c \
+ src/ui/gui/psppire-dialog-action-recode-same.h \
+ src/ui/gui/psppire-dialog-action-recode-different.c \
+ src/ui/gui/psppire-dialog-action-recode-different.h \
src/ui/gui/psppire-dialog-action-regression.c \
src/ui/gui/psppire-dialog-action-regression.h \
src/ui/gui/psppire-dialog-action-reliability.c \
src/ui/gui/psppire-dialog-action-regression.c \
src/ui/gui/psppire-dialog-action-regression.h \
src/ui/gui/psppire-dialog-action-reliability.c \
@@
-277,7
+275,6
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-encoding-selector.h \
src/ui/gui/psppire-format.c \
src/ui/gui/psppire-format.h \
src/ui/gui/psppire-encoding-selector.h \
src/ui/gui/psppire-format.c \
src/ui/gui/psppire-format.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-keypad.h \
src/ui/gui/psppire-lex-reader.c \
src/ui/gui/psppire-lex-reader.h \
@@
-304,7
+301,6
@@
src_ui_gui_psppire_SOURCES = \
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-ptr.h \
src/ui/gui/psppire-var-sheet.c \
src/ui/gui/psppire-var-sheet.h \
- 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.c \
src/ui/gui/psppire-window.h \
src/ui/gui/psppire-window-base.c \
@@
-322,7
+318,9
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/widget-io.c \
src/ui/gui/widget-io.h \
src/ui/gui/widgets.c \
src/ui/gui/widget-io.c \
src/ui/gui/widget-io.h \
src/ui/gui/widgets.c \
- src/ui/gui/widgets.h
+ src/ui/gui/widgets.h \
+ src/ui/gui/windows-menu.c \
+ src/ui/gui/windows-menu.h
OBSOLETE = \
OBSOLETE = \
@@
-344,7
+342,8
@@
OBSOLETE = \
nodist_src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-marshal.c \
nodist_src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-marshal.c \
- src/ui/gui/psppire-marshal.h
+ src/ui/gui/psppire-marshal.h \
+ src/ui/gui/resources.c
yelp-check:
@if ! yelp --version > /dev/null 2>&1 ; then \
yelp-check:
@if ! yelp --version > /dev/null 2>&1 ; then \
@@
-365,6
+364,13
@@
src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
CLEANFILES+=src/ui/gui/pspp.desktop
CLEANFILES+=src/ui/gui/pspp.desktop
+src/ui/gui/resources.c: src/ui/gui/resources.xml
+ $(AM_V_at)$(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src/ui/gui --generate-source $< --target=$@,out
+ $(AM_V_GEN)echo '#include <config.h>' > $@,tmp
+ cat $@,out >> $@,tmp
+ $(RM) $@,out
+ mv $@,tmp $@
+
src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
$(AM_V_GEN)echo '#include <config.h>' > $@
$(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
$(AM_V_GEN)echo '#include <config.h>' > $@
$(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
@@
-378,9
+384,10
@@
desktop_DATA = src/ui/gui/pspp.desktop
appdatadir = $(datadir)/appdata
dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
appdatadir = $(datadir)/appdata
dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
-BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
+BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/ui/gui/resources.c
+
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)
+
src/ui/gui/resources.c
$(nodist_src_ui_gui_psppire_DATA)
endif HAVE_GUI
#ensure the installcheck passes even if there is no X server available
endif HAVE_GUI
#ensure the installcheck passes even if there is no X server available
@@
-402,7
+409,7
@@
src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
} > $@-t && \
mv $@-t $@
CLEANFILES += src/ui/gui/include/gtk/gtk.h
} > $@-t && \
mv $@-t $@
CLEANFILES += src/ui/gui/include/gtk/gtk.h
-EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
+EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
src/ui/gui/resources.xml
include $(top_srcdir)/src/ui/gui/icons/automake.mk
include $(top_srcdir)/src/ui/gui/icons/automake.mk