projects / pspp / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Makefiles: Use $(PHONY) instead of .PHONY.
[pspp] / src / ui / gui / automake.mk
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 9f2a20f9a71d472f6db30e1b7b1e1b880d999f02..54e8da0c610af7e409d7bd3e8d58e6de9025bde7 100644 (file)
--- 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,12 +87,16 @@ 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) -Wall -DGDK_MULTIHEAD_SAFE=1
-src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(SPREAD_SHEET_WIDGET_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
+src_ui_gui_psppire_CFLAGS+=-Wno-unused-parameter
+src_ui_gui_spreadsheet_test_CFLAGS+=-Wno-unused-parameter
+endif
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -109,6 +112,7 @@ endif
 
 
 src_ui_gui_psppire_LDADD = \
+       src/ui/gui/libwidgets-essential.la \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
@@ -142,22 +146,8 @@ dist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/pspp.lang
 
 src_ui_gui_psppire_SOURCES = \
-       src/ui/gui/psppire-dialog.c \
-       src/ui/gui/psppire-keypad.c \
-       src/ui/gui/psppire-selector.c \
-       src/ui/gui/psppire-buttonbox.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-import-assistant.c \
-       src/ui/gui/psppire-import-assistant.h \
        src/ui/gui/builder-wrapper.c \
        src/ui/gui/builder-wrapper.h \
-       src/ui/gui/dialog-common.c \
-       src/ui/gui/dialog-common.h \
-       src/ui/gui/dict-display.h \
-       src/ui/gui/dict-display.c \
        src/ui/gui/entry-dialog.c \
        src/ui/gui/entry-dialog.h \
        src/ui/gui/executor.c \
@@ -167,50 +157,99 @@ src_ui_gui_psppire_SOURCES = \
        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/helper.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.h \
-       src/ui/gui/psppire-acr.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-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 \
        src/ui/gui/psppire-data-window.h \
-       src/ui/gui/psppire-dialog.h \
-       src/ui/gui/psppire-dialog-action.c \
-       src/ui/gui/psppire-dialog-action.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 \
+       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-conf.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 \
        src/ui/gui/psppire-dialog-action-aggregate.h \
        src/ui/gui/psppire-dialog-action-autorecode.c \
        src/ui/gui/psppire-dialog-action-autorecode.h \
-       src/ui/gui/psppire-dialog-action-1sks.c \
-       src/ui/gui/psppire-dialog-action-1sks.h \
        src/ui/gui/psppire-dialog-action-barchart.c \
        src/ui/gui/psppire-dialog-action-barchart.h \
        src/ui/gui/psppire-dialog-action-binomial.c \
        src/ui/gui/psppire-dialog-action-binomial.h \
+       src/ui/gui/psppire-dialog-action.c \
        src/ui/gui/psppire-dialog-action-chisquare.c \
        src/ui/gui/psppire-dialog-action-chisquare.h \
-       src/ui/gui/psppire-dialog-action-compute.c \
-       src/ui/gui/psppire-dialog-action-compute.h \
        src/ui/gui/psppire-dialog-action-comments.c \
        src/ui/gui/psppire-dialog-action-comments.h \
-       src/ui/gui/psppire-dialog-action-count.c \
-       src/ui/gui/psppire-dialog-action-count.h \
+       src/ui/gui/psppire-dialog-action-compute.c \
+       src/ui/gui/psppire-dialog-action-compute.h \
        src/ui/gui/psppire-dialog-action-correlation.c \
        src/ui/gui/psppire-dialog-action-correlation.h \
+       src/ui/gui/psppire-dialog-action-count.c \
+       src/ui/gui/psppire-dialog-action-count.h \
        src/ui/gui/psppire-dialog-action-crosstabs.c \
        src/ui/gui/psppire-dialog-action-crosstabs.h \
        src/ui/gui/psppire-dialog-action-descriptives.c \
@@ -223,18 +262,19 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-flip.h \
        src/ui/gui/psppire-dialog-action-frequencies.c \
        src/ui/gui/psppire-dialog-action-frequencies.h \
+       src/ui/gui/psppire-dialog-action.h \
        src/ui/gui/psppire-dialog-action-histogram.c \
        src/ui/gui/psppire-dialog-action-histogram.h \
        src/ui/gui/psppire-dialog-action-indep-samps.c \
        src/ui/gui/psppire-dialog-action-indep-samps.h \
-       src/ui/gui/psppire-dialog-action-kmeans.c \
-       src/ui/gui/psppire-dialog-action-kmeans.h \
-       src/ui/gui/psppire-dialog-action-logistic.c \
-       src/ui/gui/psppire-dialog-action-logistic.h \
        src/ui/gui/psppire-dialog-action-k-independent.c \
        src/ui/gui/psppire-dialog-action-k-independent.h \
+       src/ui/gui/psppire-dialog-action-kmeans.c \
+       src/ui/gui/psppire-dialog-action-kmeans.h \
        src/ui/gui/psppire-dialog-action-k-related.c \
        src/ui/gui/psppire-dialog-action-k-related.h \
+       src/ui/gui/psppire-dialog-action-logistic.c \
+       src/ui/gui/psppire-dialog-action-logistic.h \
        src/ui/gui/psppire-dialog-action-means.c \
        src/ui/gui/psppire-dialog-action-means.h \
        src/ui/gui/psppire-dialog-action-oneway.c \
@@ -244,11 +284,11 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-rank.c \
        src/ui/gui/psppire-dialog-action-rank.h \
        src/ui/gui/psppire-dialog-action-recode.c \
+       src/ui/gui/psppire-dialog-action-recode-different.c \
+       src/ui/gui/psppire-dialog-action-recode-different.h \
        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 \
@@ -259,10 +299,10 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-runs.h \
        src/ui/gui/psppire-dialog-action-scatterplot.c \
        src/ui/gui/psppire-dialog-action-scatterplot.h \
-       src/ui/gui/psppire-dialog-action-sort.c \
-       src/ui/gui/psppire-dialog-action-sort.h \
        src/ui/gui/psppire-dialog-action-select.c \
        src/ui/gui/psppire-dialog-action-select.h \
+       src/ui/gui/psppire-dialog-action-sort.c \
+       src/ui/gui/psppire-dialog-action-sort.h \
        src/ui/gui/psppire-dialog-action-split.c \
        src/ui/gui/psppire-dialog-action-split.h \
        src/ui/gui/psppire-dialog-action-tt1s.c \
@@ -275,110 +315,62 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-var-info.h \
        src/ui/gui/psppire-dialog-action-weight.c \
        src/ui/gui/psppire-dialog-action-weight.h \
+       src/ui/gui/psppire-dialog.c \
+       src/ui/gui/psppire-dialog.h \
        src/ui/gui/psppire-dict.c \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-dictview.c \
        src/ui/gui/psppire-dictview.h \
-       src/ui/gui/psppire-encoding-selector.c \
-       src/ui/gui/psppire-encoding-selector.h \
        src/ui/gui/psppire-format.c \
        src/ui/gui/psppire-format.h \
+       src/ui/gui/psppire-keypad.c \
        src/ui/gui/psppire-keypad.h \
-       src/ui/gui/psppire-lex-reader.c \
-       src/ui/gui/psppire-lex-reader.h \
        src/ui/gui/psppire-means-layer.c \
        src/ui/gui/psppire-means-layer.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-var-view.c \
-       src/ui/gui/psppire-var-view.h \
-       src/ui/gui/psppire-spreadsheet-model.c \
-       src/ui/gui/psppire-spreadsheet-model.h \
-       src/ui/gui/psppire-selector.h \
        src/ui/gui/psppire-select-dest.c \
        src/ui/gui/psppire-select-dest.h \
-       src/ui/gui/psppire-syntax-window.c \
-       src/ui/gui/psppire-syntax-window.h \
-       src/ui/gui/psppire-delimited-text.c \
-       src/ui/gui/psppire-delimited-text.h \
+       src/ui/gui/psppire-selector.c \
+       src/ui/gui/psppire-selector.h \
        src/ui/gui/psppire-text-file.c \
        src/ui/gui/psppire-text-file.h \
        src/ui/gui/psppire-val-chooser.c \
        src/ui/gui/psppire-val-chooser.h \
-       src/ui/gui/psppire-value-entry.c \
-       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-data-sheet.c \
-       src/ui/gui/psppire-data-sheet.h \
-       src/ui/gui/psppire-variable-sheet.c \
-       src/ui/gui/psppire-variable-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-var-view.c \
+       src/ui/gui/psppire-var-view.h \
        src/ui/gui/psppire-window-base.c \
        src/ui/gui/psppire-window-base.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/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/value-variant.c \
-       src/ui/gui/value-variant.h \
-       src/ui/gui/widget-io.c \
-       src/ui/gui/widget-io.h \
+       src/ui/gui/dialog-common.c \
+       src/ui/gui/dialog-common.h \
        src/ui/gui/widgets.c \
        src/ui/gui/widgets.h \
-       src/ui/gui/windows-menu.c \
-       src/ui/gui/windows-menu.h
-
-
-OBSOLETE = \
-       src/ui/gui/page-assistant.c \
-       src/ui/gui/page-intro.c \
-       src/ui/gui/page-intro.h \
-       src/ui/gui/page-file.c \
-       src/ui/gui/page-first-line.c \
-       src/ui/gui/page-first-line.h \
-       src/ui/gui/page-formats.c \
-       src/ui/gui/page-formats.h \
-       src/ui/gui/page-separators.c \
-       src/ui/gui/page-separators.h \
-       src/ui/gui/page-sheet-spec.c \
-       src/ui/gui/page-sheet-spec.h \
-       src/ui/gui/text-data-import-dialog.c \
-       src/ui/gui/text-data-import-dialog.h
-
+       src/ui/gui/dict-display.c \
+       src/ui/gui/dict-display.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 \
        src/ui/gui/psppire-marshal.h \
        src/ui/gui/resources.c
 
-yelp-check:
-       @if ! yelp --version > /dev/null 2>&1 ; then \
-               echo    ; \
-               echo '    The Yelp document viewer does not seem to be installed on the system.' ; \
-               echo '    If Yelp is not available at run time, then the PSPPIRE online reference' ; \
-               echo '    manual will not be available.' ; \
-               echo '    Yelp is available from the GNOME project.  ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
-               echo ; \
-       fi
-
-PHONY += yelp-check
-
 AM_CPPFLAGS += -Isrc
 
 src/ui/gui/org.fsf.pspp.metainfo.xml: src/ui/gui/org.fsf.pspp.metainfo.xml.in $(POFILES)
-       $(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po
+       $(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po || \
+         $(MSGFMT) -L appdata --xml --template $< -o $@ -d $(top_srcdir)/po
 
 src/ui/gui/org.fsf.pspp.desktop: src/ui/gui/org.fsf.pspp.desktop.in $(POFILES)
        $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po
@@ -395,11 +387,15 @@ src/ui/gui/resources.c: src/ui/gui/resources.xml
 
 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 $? >> $@
+       $(AM_V_at)$(GLIB_GENMARSHAL) --body --include-header=ui/gui/psppire-marshal.h --prefix=psppire_marshal $? >> $@
 
 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,9 +405,9 @@ dist_appdata_DATA = src/ui/gui/org.fsf.pspp.metainfo.xml
 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 \
+       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:
@@ -439,3 +435,35 @@ 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 = \
+       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) $(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)
+
+EXTRA_DIST += src/ui/gui/psppire.xml src/ui/gui/glade-wrapper.in
+
+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
+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
Unnamed repository; edit this file to name it for gitweb.