X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=8130f5cf42087876484d05662fb19c8ed38b4f42;hb=b5b474193e450bba97610065df0518c08074a7fb;hp=4d92354867a1e1423d43e66bb07d86f96466f342;hpb=4c2001f2a436355d68bb513e15d9a44e2fd6ac27;p=pspp-builds.git diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 4d923548..8130f5cf 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- - - bin_PROGRAMS += src/ui/gui/psppire src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \ @@ -9,7 +7,8 @@ src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \ src_ui_gui_psppire_LDFLAGS = \ - -export-dynamic + $(PG_LDFLAGS) + if RELOCATABLE_VIA_LD @@ -19,28 +18,53 @@ src_ui_gui_psppire_LDFLAGS += -rpath $(pkglibdir) endif -pkglib_LTLIBRARIES = src/ui/gui/libpsppire.la +# The library libpsppire contains a single function to register our custom widgets with libglade. +# This library is dynamically loaded by libglade. On w32 platforms, dynamic libraries simply +# can't be created unless all of the symbols can be resolved at link time. Thus, all the custom +# widgets have to be available. +# But they can't appear in the library AND the binary, otherwise glib complains about them already +# existing (and its a waste of space). So we have a seperate shared library (statically loaded) +# libpsppwidgets which contains our custom widgets. + +pkglib_LTLIBRARIES = src/ui/gui/libpsppwidgets.la src/ui/gui/libpsppire.la + +src_ui_gui_libpsppwidgets_la_CFLAGS = $(GTK_CFLAGS) +src_ui_gui_libpsppwidgets_la_LDFLAGS = -no-undefined +src_ui_gui_libpsppwidgets_la_LIBADD = $(GTK_LIBS) + +src_ui_gui_libpsppwidgets_la_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-hbuttonbox.c \ + src/ui/gui/psppire-vbuttonbox.c \ + src/ui/gui/psppire-acr.c + src_ui_gui_libpsppire_la_CFLAGS = $(GLADE_CFLAGS) +src_ui_gui_libpsppire_la_LDFLAGS = -no-undefined +src_ui_gui_libpsppire_la_LIBADD = $(GLADE_LIBS) src/ui/gui/libpsppwidgets.la src_ui_gui_libpsppire_la_SOURCES = \ src/ui/gui/glade-register.c src_ui_gui_psppire_LDADD = \ -dlopen src/ui/gui/libpsppire.la \ + src/ui/gui/libpsppwidgets.la \ lib/gtksheet/libgtksheet.a \ src/language/liblanguage.a \ src/ui/libuicommon.a \ src/output/charts/libcharts.a \ src/output/liboutput.a \ src/math/libpspp_math.a \ - src/math/linreg/libpspp_linreg.a \ lib/linreg/liblinreg.a \ lib/gsl-extras/libgsl-extras.a \ src/data/libdata.a \ src/libpspp/libpspp.a \ $(GTK_LIBS) \ $(GLADE_LIBS) \ + $(PG_LIBS) \ gl/libgl.la \ @LIBINTL@ @LIBREADLINE@ @@ -49,10 +73,18 @@ src_ui_gui_psppiredir = $(pkgdatadir) dist_src_ui_gui_psppire_DATA = \ $(top_srcdir)/src/ui/gui/data-editor.glade \ $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ + $(top_srcdir)/src/ui/gui/examine.glade \ + $(top_srcdir)/src/ui/gui/crosstabs.glade \ + $(top_srcdir)/src/ui/gui/frequencies.glade \ + $(top_srcdir)/src/ui/gui/message-dialog.glade \ + $(top_srcdir)/src/ui/gui/oneway.glade \ $(top_srcdir)/src/ui/gui/output-viewer.glade \ $(top_srcdir)/src/ui/gui/psppire.glade \ $(top_srcdir)/src/ui/gui/rank.glade \ + $(top_srcdir)/src/ui/gui/recode.glade \ + $(top_srcdir)/src/ui/gui/regression.glade \ $(top_srcdir)/src/ui/gui/syntax-editor.glade \ + $(top_srcdir)/src/ui/gui/text-data-import.glade \ $(top_srcdir)/src/ui/gui/t-test.glade \ $(top_srcdir)/src/ui/gui/psppicon.png \ $(top_srcdir)/src/ui/gui/pspplogo.png \ @@ -75,22 +107,26 @@ dist_src_ui_gui_psppire_DATA = \ src_ui_gui_psppire_SOURCES = \ src/ui/gui/about.c \ src/ui/gui/about.h \ - src/ui/gui/clipboard.c \ - src/ui/gui/clipboard.h \ + src/ui/gui/checkbox-treeview.c \ + src/ui/gui/checkbox-treeview.h \ src/ui/gui/compute-dialog.c \ src/ui/gui/compute-dialog.h \ src/ui/gui/comments-dialog.c \ src/ui/gui/comments-dialog.h \ + src/ui/gui/crosstabs-dialog.c \ + src/ui/gui/crosstabs-dialog.h \ src/ui/gui/customentry.c \ src/ui/gui/customentry.h \ + src/ui/gui/frequencies-dialog.c \ + src/ui/gui/frequencies-dialog.h \ src/ui/gui/goto-case-dialog.c \ src/ui/gui/goto-case-dialog.h \ - src/ui/gui/data-sheet.c \ - src/ui/gui/data-sheet.h \ src/ui/gui/data-editor.c \ src/ui/gui/data-editor.h \ src/ui/gui/descriptives-dialog.c \ src/ui/gui/descriptives-dialog.h \ + src/ui/gui/examine-dialog.c \ + src/ui/gui/examine-dialog.h \ src/ui/gui/find-dialog.c \ src/ui/gui/find-dialog.h \ src/ui/gui/dialog-common.c \ @@ -106,30 +142,37 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/helper.h \ src/ui/gui/missing-val-dialog.c \ src/ui/gui/missing-val-dialog.h \ + src/ui/gui/oneway-anova-dialog.c \ + src/ui/gui/oneway-anova-dialog.h \ src/ui/gui/output-viewer.c \ src/ui/gui/output-viewer.h \ - src/ui/gui/psppire-buttonbox.c \ + src/ui/gui/psppire-acr.h \ src/ui/gui/psppire-buttonbox.h \ - src/ui/gui/psppire-hbuttonbox.c \ src/ui/gui/psppire-hbuttonbox.h \ - src/ui/gui/psppire-vbuttonbox.c \ src/ui/gui/psppire-vbuttonbox.h \ src/ui/gui/psppire-case-file.c \ src/ui/gui/psppire-case-file.h \ + src/ui/gui/psppire-data-editor.c \ + src/ui/gui/psppire-data-editor.h \ src/ui/gui/psppire-data-store.c \ src/ui/gui/psppire-data-store.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-keypad.c \ src/ui/gui/psppire-keypad.h \ - src/ui/gui/psppire-selector.c \ src/ui/gui/psppire-selector.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-store.c \ src/ui/gui/psppire-var-store.h \ src/ui/gui/rank-dialog.c \ src/ui/gui/rank-dialog.h \ + src/ui/gui/recode-dialog.c \ + src/ui/gui/recode-dialog.h \ + src/ui/gui/regression-dialog.c \ + src/ui/gui/regression-dialog.h \ src/ui/gui/select-cases-dialog.c \ src/ui/gui/select-cases-dialog.h \ src/ui/gui/sort-cases-dialog.c \ @@ -140,16 +183,22 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/syntax-editor.h \ src/ui/gui/syntax-editor-source.c \ src/ui/gui/syntax-editor-source.h \ + src/ui/gui/text-data-import-dialog.c \ + src/ui/gui/text-data-import-dialog.h \ src/ui/gui/transpose-dialog.c \ src/ui/gui/transpose-dialog.h \ src/ui/gui/t-test-independent-samples-dialog.c \ src/ui/gui/t-test-independent-samples-dialog.h \ + src/ui/gui/t-test-one-sample.c \ + src/ui/gui/t-test-one-sample.h \ + src/ui/gui/t-test-options.c \ + src/ui/gui/t-test-options.h \ + src/ui/gui/t-test-paired-samples.c \ + src/ui/gui/t-test-paired-samples.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-sheet.c \ - src/ui/gui/var-sheet.h \ src/ui/gui/var-type-dialog.c \ src/ui/gui/var-type-dialog.h \ src/ui/gui/variable-info-dialog.c \ @@ -161,4 +210,13 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/window-manager.c \ src/ui/gui/window-manager.h - +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