X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=2ca50a89dad62b5a7fbfc195365d95965c31b845;hb=8ec823cac8dd9eee5d0ad6cee9d001b9fdb673ba;hp=853444d9d06425e6c31a948dea73d01ae7db8756;hpb=1fb80b7279687d4181e3786bb3acc1879cb8d16f;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 853444d9d0..2ca50a89da 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -56,6 +56,7 @@ UI_FILES = \ src/ui/gui/roc.ui \ src/ui/gui/scatterplot.ui \ src/ui/gui/select-cases.ui \ + src/ui/gui/spreadsheet-import.ui \ src/ui/gui/t-test.ui \ src/ui/gui/text-data-import.ui \ src/ui/gui/transpose.ui \ @@ -68,16 +69,7 @@ UI_FILES = \ src/ui/gui/var-type-dialog.ui \ src/ui/gui/weight.ui - -$(top_srcdir)/doc/help-pages-list: $(UI_FILES) - $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \ - $(SED) -e 's% *\([^<]*\)%//*[@id='"'"'\1'"'"']%' \ - -e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp - test -s $@,tmp - mv $@,tmp $@ - -EXTRA_DIST += doc/help-pages-list - +if building_gui EXTRA_DIST += \ src/ui/gui/org.fsf.pspp.metainfo.xml.in \ @@ -87,11 +79,13 @@ EXTRA_DIST += \ src_ui_gui_psppire_CPPFLAGS= -if HAVE_GUI bin_PROGRAMS += src/ui/gui/psppire noinst_PROGRAMS += src/ui/gui/spreadsheet-test -src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(SPREAD_SHEET_WIDGET_CFLAGS) $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1 +src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) \ + $(SPREAD_SHEET_WIDGET_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ + $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1 src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1 if cc_is_gcc @@ -121,6 +115,7 @@ src_ui_gui_psppire_LDADD = \ $(GTHREAD_LIBS) \ $(GTKSOURCEVIEW_LIBS) \ $(SPREAD_SHEET_WIDGET_LIBS) \ + $(LIBRSVG_LIBS) \ $(CAIRO_LIBS) \ $(LIBINTL) \ $(GSL_LIBS) @@ -166,11 +161,10 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/missing-val-dialog.h \ src/ui/gui/options-dialog.c \ src/ui/gui/options-dialog.h \ + src/ui/gui/pre-initialisation.h \ src/ui/gui/psppire.c \ 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 \ @@ -182,6 +176,10 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire.h \ src/ui/gui/psppire-import-assistant.c \ src/ui/gui/psppire-import-assistant.h \ + src/ui/gui/psppire-import-spreadsheet.c \ + src/ui/gui/psppire-import-spreadsheet.h \ + src/ui/gui/psppire-import-textfile.c \ + src/ui/gui/psppire-import-textfile.h \ src/ui/gui/psppire-lex-reader.c \ src/ui/gui/psppire-lex-reader.h \ src/ui/gui/psppire-output-view.c \ @@ -190,16 +188,14 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-output-window.h \ src/ui/gui/psppire-scanf.c \ src/ui/gui/psppire-scanf.h \ + src/ui/gui/psppire-spreadsheet-data-model.c \ + src/ui/gui/psppire-spreadsheet-data-model.h \ src/ui/gui/psppire-spreadsheet-model.c \ src/ui/gui/psppire-spreadsheet-model.h \ src/ui/gui/psppire-syntax-window.c \ src/ui/gui/psppire-syntax-window.h \ src/ui/gui/psppire-value-entry.c \ src/ui/gui/psppire-value-entry.h \ - src/ui/gui/psppire-variable-sheet.c \ - src/ui/gui/psppire-variable-sheet.h \ - src/ui/gui/psppire-var-sheet-header.c \ - src/ui/gui/psppire-var-sheet-header.h \ src/ui/gui/psppire-window.c \ src/ui/gui/psppire-window.h \ src/ui/gui/psppire-window-register.c \ @@ -230,6 +226,8 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \ src/ui/gui/psppire-checkbox-treeview.h \ src/ui/gui/psppire-conf.c \ src/ui/gui/psppire-conf.h \ + src/ui/gui/psppire-data-sheet.c \ + src/ui/gui/psppire-data-sheet.h \ src/ui/gui/psppire-dialog-action-1sks.c \ src/ui/gui/psppire-dialog-action-1sks.h \ src/ui/gui/psppire-dialog-action-aggregate.c \ @@ -340,6 +338,10 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \ src/ui/gui/psppire-var-ptr.h \ src/ui/gui/psppire-var-view.c \ src/ui/gui/psppire-var-view.h \ + src/ui/gui/psppire-var-sheet-header.c \ + src/ui/gui/psppire-var-sheet-header.h \ + src/ui/gui/psppire-variable-sheet.c \ + src/ui/gui/psppire-variable-sheet.h \ src/ui/gui/psppire-window-base.c \ src/ui/gui/psppire-window-base.h \ src/ui/gui/dialog-common.c \ @@ -352,6 +354,7 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \ src_ui_gui_libwidgets_essential_la_CFLAGS = \ $(GTK_CFLAGS) \ $(GTKSOURCEVIEW_CFLAGS) \ + $(SPREAD_SHEET_WIDGET_CFLAGS) \ $(AM_CFLAGS) # The unused-parameter warning is not by default disabled @@ -394,8 +397,6 @@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@ mimedir = $(datadir)/mime/packages -mime_DATA = src/ui/gui/pspp.xml -EXTRA_DIST += src/ui/gui/pspp.xml desktopdir = $(datadir)/applications desktop_DATA = src/ui/gui/org.fsf.pspp.desktop @@ -409,7 +410,6 @@ CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \ src/ui/gui/.deps/psppire-marshal.Plo \ 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 installcheck-local: @@ -437,7 +437,7 @@ include $(top_srcdir)/src/ui/gui/icons/automake.mk UNINSTALL_DATA_HOOKS += update-icon-cache INSTALL_DATA_HOOKS += update-icon-cache -############################################# +#### Build the tools needed to run glade on our .ui files EXTRA_pkgdir = $(abs_builddir)/src/ui/gui @@ -454,7 +454,7 @@ src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS) if cc_is_gcc src_ui_gui_libpsppire_glade_la_CFLAGS += -Wno-unused-parameter endif -src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION) +src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION) $(SPREAD_SHEET_WIDGET_LIBS) EXTRA_DIST += src/ui/gui/psppire.xml src/ui/gui/glade-wrapper.in @@ -462,5 +462,12 @@ src/ui/gui/glade-wrapper: src/ui/gui/glade-wrapper.in $(SED) -e 's%\@abs_top_srcdir\@%@abs_top_srcdir@%g' -e 's%\@abs_top_builddir\@%@abs_top_builddir@%g' $< > $@ chmod a+x $@ -.PHONY: glade-tools +PHONY += glade-tools glade-tools: src/ui/gui/glade-wrapper src/ui/gui/libpsppire-glade.la + +# This works around a possible bug in Automake 1.16.1 which installs +# EXTRA_pkgLTLIBRARIES if DESTDIR is set. It should not do that. +install-EXTRA_pkgLTLIBRARIES: + true + +endif