X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=0fa4afb1bf54952b586e08fe95f86d0322e9696d;hb=a1538e0714e45fae1b7d43d11c587b70f2aa1eed;hp=0abce32b3e19be3ee7caa398eaed66c530b1e1a3;hpb=cc0afe999a50963f6419dd3b9d3f00f50b26c760;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 0abce32b3e..0fa4afb1bf 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -80,7 +80,6 @@ EXTRA_DIST += doc/help-pages-list EXTRA_DIST += \ - src/ui/gui/memorandum.txt \ src/ui/gui/org.fsf.pspp.metainfo.xml.in \ src/ui/gui/org.fsf.pspp.desktop.in \ src/ui/gui/marshaller-list \ @@ -88,11 +87,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 @@ -114,6 +115,7 @@ endif src_ui_gui_psppire_LDADD = \ + src/ui/gui/libwidgets-essential.la \ src/ui/libuicommon.la \ src/libpspp.la \ src/libpspp-core.la \ @@ -121,6 +123,7 @@ src_ui_gui_psppire_LDADD = \ $(GTHREAD_LIBS) \ $(GTKSOURCEVIEW_LIBS) \ $(SPREAD_SHEET_WIDGET_LIBS) \ + $(LIBRSVG_LIBS) \ $(CAIRO_LIBS) \ $(LIBINTL) \ $(GSL_LIBS) @@ -146,7 +149,83 @@ dist_src_ui_gui_psppire_DATA = \ $(UI_FILES) \ $(top_srcdir)/src/ui/gui/pspp.lang -UI_WIDGETS_ESSENTIAL= \ +src_ui_gui_psppire_SOURCES = \ + src/ui/gui/builder-wrapper.c \ + src/ui/gui/builder-wrapper.h \ + src/ui/gui/entry-dialog.c \ + src/ui/gui/entry-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/goto-case-dialog.c \ + src/ui/gui/goto-case-dialog.h \ + src/ui/gui/helper.c \ + src/ui/gui/helper.h \ + src/ui/gui/help-menu.c \ + src/ui/gui/help-menu.h \ + 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/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 \ + src/ui/gui/psppire-data-window.h \ + src/ui/gui/psppire-delimited-text.c \ + src/ui/gui/psppire-delimited-text.h \ + src/ui/gui/psppire-encoding-selector.c \ + src/ui/gui/psppire-encoding-selector.h \ + src/ui/gui/psppire.h \ + src/ui/gui/psppire-import-assistant.c \ + src/ui/gui/psppire-import-assistant.h \ + src/ui/gui/psppire-lex-reader.c \ + src/ui/gui/psppire-lex-reader.h \ + src/ui/gui/psppire-output-view.c \ + src/ui/gui/psppire-output-view.h \ + src/ui/gui/psppire-output-window.c \ + src/ui/gui/psppire-output-window.h \ + src/ui/gui/psppire-scanf.c \ + src/ui/gui/psppire-scanf.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 \ + src/ui/gui/psppire-window-register.h \ + src/ui/gui/t-test-options.c \ + src/ui/gui/t-test-options.h \ + src/ui/gui/val-labs-dialog.c \ + src/ui/gui/val-labs-dialog.h \ + src/ui/gui/value-variant.c \ + src/ui/gui/value-variant.h \ + src/ui/gui/var-display.c \ + src/ui/gui/var-display.h \ + src/ui/gui/var-type-dialog.c \ + src/ui/gui/var-type-dialog.h \ + src/ui/gui/widget-io.c \ + src/ui/gui/widget-io.h \ + src/ui/gui/windows-menu.c \ + src/ui/gui/windows-menu.h + +noinst_LTLIBRARIES += src/ui/gui/libwidgets-essential.la + +src_ui_gui_libwidgets_essential_la_SOURCES = \ src/ui/gui/psppire-acr.c \ src/ui/gui/psppire-acr.h \ src/ui/gui/psppire-buttonbox.c \ @@ -274,79 +353,18 @@ UI_WIDGETS_ESSENTIAL= \ src/ui/gui/dict-display.c \ src/ui/gui/dict-display.h -src_ui_gui_psppire_SOURCES = $(UI_WIDGETS_ESSENTIAL) \ - src/ui/gui/builder-wrapper.c \ - src/ui/gui/builder-wrapper.h \ - src/ui/gui/entry-dialog.c \ - src/ui/gui/entry-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/goto-case-dialog.c \ - src/ui/gui/goto-case-dialog.h \ - src/ui/gui/helper.c \ - src/ui/gui/helper.h \ - src/ui/gui/help-menu.c \ - src/ui/gui/help-menu.h \ - 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-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 \ - src/ui/gui/psppire-data-window.h \ - src/ui/gui/psppire-delimited-text.c \ - src/ui/gui/psppire-delimited-text.h \ - src/ui/gui/psppire-encoding-selector.c \ - src/ui/gui/psppire-encoding-selector.h \ - src/ui/gui/psppire.h \ - src/ui/gui/psppire-import-assistant.c \ - src/ui/gui/psppire-import-assistant.h \ - src/ui/gui/psppire-lex-reader.c \ - src/ui/gui/psppire-lex-reader.h \ - src/ui/gui/psppire-output-view.c \ - src/ui/gui/psppire-output-view.h \ - src/ui/gui/psppire-output-window.c \ - src/ui/gui/psppire-output-window.h \ - src/ui/gui/psppire-scanf.c \ - src/ui/gui/psppire-scanf.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 \ - src/ui/gui/psppire-window-register.h \ - src/ui/gui/t-test-options.c \ - src/ui/gui/t-test-options.h \ - src/ui/gui/val-labs-dialog.c \ - src/ui/gui/val-labs-dialog.h \ - src/ui/gui/value-variant.c \ - src/ui/gui/value-variant.h \ - src/ui/gui/var-display.c \ - src/ui/gui/var-display.h \ - src/ui/gui/var-type-dialog.c \ - src/ui/gui/var-type-dialog.h \ - src/ui/gui/widget-io.c \ - src/ui/gui/widget-io.h \ - src/ui/gui/windows-menu.c \ - src/ui/gui/windows-menu.h +src_ui_gui_libwidgets_essential_la_CFLAGS = \ + $(GTK_CFLAGS) \ + $(GTKSOURCEVIEW_CFLAGS) \ + $(AM_CFLAGS) +# The unused-parameter warning is not by default disabled +# in AM_CFLAGS because the core pspp code has this enabled. +# This is only disabled in the gui code where we have many +# callbacks from gtk3 which have fixed parameters +if cc_is_gcc +src_ui_gui_libwidgets_essential_la_CFLAGS += -Wno-unused-parameter +endif nodist_src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-marshal.c \ @@ -395,7 +413,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: @@ -423,20 +440,20 @@ 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 EXTRA_pkg_LTLIBRARIES = src/ui/gui/libpsppire-glade.la src_ui_gui_libpsppire_glade_la_SOURCES = \ - $(UI_WIDGETS_ESSENTIAL) \ src/ui/gui/dummy.c src_ui_gui_libpsppire_glade_la_LIBADD = \ + src/ui/gui/libwidgets-essential.la \ src/ui/gui/psppire-marshal.lo -src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(AM_CFLAGS) +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 @@ -448,5 +465,10 @@ 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