Add convenience library libwidgets-essential

This avoids having to compile large numbers of modules twice.

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 0abce32b3e19be3ee7caa398eaed66c530b1e1a3..b7c4b394124964f5a9c7e0f3d3f8b0ed623978c4 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -114,6 +114,7 @@ endif
 
 
 src_ui_gui_psppire_LDADD = \
+       src/ui/gui/libwidgets-essential.la \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
@@ -146,7 +147,82 @@ 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/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 +350,9 @@ 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)
 
 nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.c \
@@ -430,13 +436,13 @@ 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