X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=53ef0708515c4b7e316053855994279a3482bad1;hb=109eccf01c32b5784f464de2d424fd7a9905123f;hp=3da8349c027df8f76800c4aaedaf6faaac7f791d;hpb=dc6d0e08956c6ad42cc943b7496a192c71bdbe02;p=pspp
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 3da8349c02..53ef070851 100644
--- 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/data-sheet.ui \
src/ui/gui/descriptives.ui \
src/ui/gui/entry-dialog.ui \
src/ui/gui/examine.ui \
@@ -28,6 +27,7 @@ UI_FILES = \
src/ui/gui/means.ui \
src/ui/gui/missing-val-dialog.ui \
src/ui/gui/oneway.ui \
+ src/ui/gui/options.ui \
src/ui/gui/paired-samples.ui \
src/ui/gui/rank.ui \
src/ui/gui/runs.ui \
@@ -48,7 +48,6 @@ UI_FILES = \
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
@@ -56,19 +55,20 @@ UI_FILES = \
$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
$(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
$(SED) -e 's% *\([^<]*\)%//*[@id='"'"'\1'"'"']%' \
- -e 's%#%'"'"']/*[@id='"'"'%g' > $@
+ -e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
+ test -s $@,tmp
+ mv $@,tmp $@
EXTRA_DIST += doc/help-pages-list
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_psppire_CPPFLAGS=
if HAVE_GUI
bin_PROGRAMS += src/ui/gui/psppire
@@ -125,19 +125,6 @@ dist_src_ui_gui_psppire_DATA = \
$(top_srcdir)/src/ui/gui/psppire.gtkrc
src_ui_gui_psppire_SOURCES = \
- src/ui/gui/pspp-sheet-private.h \
- src/ui/gui/pspp-sheet-selection.c \
- src/ui/gui/pspp-sheet-selection.h \
- src/ui/gui/pspp-sheet-view-column.c \
- src/ui/gui/pspp-sheet-view-column.h \
- src/ui/gui/pspp-sheet-view.c \
- src/ui/gui/pspp-sheet-view.h \
- src/ui/gui/pspp-widget-facade.c \
- src/ui/gui/pspp-widget-facade.h \
- src/ui/gui/psppire-button-editable.c \
- src/ui/gui/psppire-button-editable.h \
- src/ui/gui/psppire-cell-renderer-button.c \
- src/ui/gui/psppire-cell-renderer-button.h \
src/ui/gui/psppire-dialog.c \
src/ui/gui/psppire-keypad.c \
src/ui/gui/psppire-selector.c \
@@ -169,6 +156,8 @@ src_ui_gui_psppire_SOURCES = \
src/ui/gui/main.c \
src/ui/gui/missing-val-dialog.c \
src/ui/gui/missing-val-dialog.h \
+ src/ui/gui/options-dialog.c \
+ src/ui/gui/options-dialog.h \
src/ui/gui/psppire.c \
src/ui/gui/psppire.h \
src/ui/gui/psppire-acr.h \
@@ -178,8 +167,6 @@ src_ui_gui_psppire_SOURCES = \
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-sheet.c \
- src/ui/gui/psppire-data-sheet.h \
src/ui/gui/psppire-data-store.c \
src/ui/gui/psppire-data-store.h \
src/ui/gui/psppire-data-window.c \
@@ -303,8 +290,8 @@ src_ui_gui_psppire_SOURCES = \
src/ui/gui/psppire-value-entry.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-sheet-header.h \
+ src/ui/gui/psppire-var-sheet-header.c \
src/ui/gui/psppire-window.c \
src/ui/gui/psppire-window.h \
src/ui/gui/psppire-window-base.c \
@@ -319,6 +306,8 @@ src_ui_gui_psppire_SOURCES = \
src/ui/gui/var-display.h \
src/ui/gui/var-type-dialog.c \
src/ui/gui/var-type-dialog.h \
+ src/ui/gui/value-variant.c \
+ src/ui/gui/value-variant.h \
src/ui/gui/widget-io.c \
src/ui/gui/widget-io.h \
src/ui/gui/widgets.c \
@@ -346,7 +335,8 @@ OBSOLETE = \
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 \
@@ -367,6 +357,13 @@ src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
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 ' > $@,tmp
+ cat $@,out >> $@,tmp
+ $(RM) $@,out
+ mv $@,tmp $@
+
src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
$(AM_V_GEN)echo '#include ' > $@
$(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
@@ -380,9 +377,12 @@ desktop_DATA = src/ui/gui/pspp.desktop
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 \
- $(nodist_src_ui_gui_psppire_DATA)
+ src/ui/gui/resources.c $(nodist_src_ui_gui_psppire_DATA)
+
+include $(top_srcdir)/src/ui/gui/efficient-sheet.mk
endif HAVE_GUI
#ensure the installcheck passes even if there is no X server available
@@ -390,7 +390,7 @@ installcheck-local:
DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS
# wrapper
-src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include
+src_ui_gui_psppire_CPPFLAGS += $(AM_CPPFLAGS) -Isrc/ui/gui/include
BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h
src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
@$(MKDIR_P) src/ui/gui/include/gtk
@@ -404,7 +404,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
-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