projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
16c9b32
)
Fix broken ./configure --without-gui (again)
author
John Darrington
<john@darrington.wattle.id.au>
Sat, 3 Oct 2020 05:24:16 +0000
(07:24 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Sun, 27 Sep 2020 15:25:40 +0000
(17:25 +0200)
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
doc/automake.mk
patch
|
blob
|
history
src/ui/automake.mk
patch
|
blob
|
history
src/ui/gui/automake.mk
patch
|
blob
|
history
src/ui/gui/icons/automake.mk
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index b2df75983bc26238fcade0ebe42400803dc6787b..3a71973ca3d635b3feaba04123246d30f16df2ed 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-86,11
+86,11
@@
DIST_HOOKS += generate-changelog
include $(top_srcdir)/build-aux/automake.mk
include $(top_srcdir)/po/automake.mk
include $(top_srcdir)/lib/automake.mk
include $(top_srcdir)/build-aux/automake.mk
include $(top_srcdir)/po/automake.mk
include $(top_srcdir)/lib/automake.mk
-include $(top_srcdir)/doc/automake.mk
include $(top_srcdir)/examples/automake.mk
include $(top_srcdir)/src/automake.mk
include $(top_srcdir)/utilities/automake.mk
include $(top_srcdir)/tests/automake.mk
include $(top_srcdir)/examples/automake.mk
include $(top_srcdir)/src/automake.mk
include $(top_srcdir)/utilities/automake.mk
include $(top_srcdir)/tests/automake.mk
+include $(top_srcdir)/doc/automake.mk
if WITH_PERL_MODULE
include $(top_srcdir)/perl-module/automake.mk
if WITH_PERL_MODULE
include $(top_srcdir)/perl-module/automake.mk
diff --git
a/configure.ac
b/configure.ac
index 27a4c87af388f9f0b71faa05c4d047e4b3d7a33d..c23dc6bcd199715f637c4f77af50b05bc07a6ed6 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-119,7
+119,7
@@
AC_ARG_WITH([gui],
[AS_HELP_STRING([--without-gui],
[Don't build the PSPPIRE GUI (using GTK+)])],
[], [with_gui=yes])
[AS_HELP_STRING([--without-gui],
[Don't build the PSPPIRE GUI (using GTK+)])],
[], [with_gui=yes])
-AM_CONDITIONAL([
HAVE_GUI
],
+AM_CONDITIONAL([
building_gui
],
[test "$with_cairo" != no && test "$with_gui" != "no"])
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
[test "$with_cairo" != no && test "$with_gui" != "no"])
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
diff --git
a/doc/automake.mk
b/doc/automake.mk
index 976b5845078b62ac76769b071dca2cc1506c80b0..5bdfaa675463a0f85dd55e6e91e6df4b0c3fed29 100644
(file)
--- a/
doc/automake.mk
+++ b/
doc/automake.mk
@@
-95,3
+95,12
@@
CLEANFILES += pspp-dev.dvi $(docbook_DATA)
doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
PHONY += doc
doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
PHONY += doc
+
+$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
+ $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
+ $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
+ -e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
+ test -s $@,tmp
+ mv $@,tmp $@
+
+EXTRA_DIST += doc/help-pages-list
diff --git
a/src/ui/automake.mk
b/src/ui/automake.mk
index a531cf3c745e0b549fc2622df399fa77c6e615c1..239ed4e3022de8510a034b3d72711ca1a5cb77d4 100644
(file)
--- a/
src/ui/automake.mk
+++ b/
src/ui/automake.mk
@@
-17,9
+17,7
@@
## Process this file with automake to produce Makefile.in -*- makefile -*-
include $(top_srcdir)/src/ui/terminal/automake.mk
## Process this file with automake to produce Makefile.in -*- makefile -*-
include $(top_srcdir)/src/ui/terminal/automake.mk
-if HAVE_GUI
include $(top_srcdir)/src/ui/gui/automake.mk
include $(top_srcdir)/src/ui/gui/automake.mk
-endif
noinst_LTLIBRARIES += src/ui/libuicommon.la
noinst_LTLIBRARIES += src/ui/libuicommon.la
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 37dbdb4e82e56f56674532aa3ec488292e3caa12..fec10f5538689ae438dd4a3ceae04f22d1598526 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-68,16
+68,7
@@
UI_FILES = \
src/ui/gui/var-type-dialog.ui \
src/ui/gui/weight.ui
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% *<property name="help[-_]page">\([^<]*\)</property>%//*[@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 \
EXTRA_DIST += \
src/ui/gui/org.fsf.pspp.metainfo.xml.in \
@@
-473,3
+464,5
@@
glade-tools: src/ui/gui/glade-wrapper src/ui/gui/libpsppire-glade.la
# EXTRA_pkgLTLIBRARIES if DESTDIR is set. It should not do that.
install-EXTRA_pkgLTLIBRARIES:
true
# EXTRA_pkgLTLIBRARIES if DESTDIR is set. It should not do that.
install-EXTRA_pkgLTLIBRARIES:
true
+
+endif
diff --git
a/src/ui/gui/icons/automake.mk
b/src/ui/gui/icons/automake.mk
index f124b1c6588e0320b5852c400c760ec4c203f2c0..35d2331821717674cd787e4a258de8a4cbaa4346 100644
(file)
--- a/
src/ui/gui/icons/automake.mk
+++ b/
src/ui/gui/icons/automake.mk
@@
-74,7
+74,7
@@
uninstall-icons:
INSTALL_DATA_HOOKS += install-icons install-ext-icons
UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-ext-icons
INSTALL_DATA_HOOKS += install-icons install-ext-icons
UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-ext-icons
-if
HAVE_GUI
+if
building_gui
nodist_src_ui_gui_psppire_DATA = src/ui/gui/icons/splash.png
src/ui/gui/icons/splash.png: $(top_srcdir)/src/ui/gui/icons/splash-t.png $(top_srcdir)/src/ui/gui/icons/splash-r.png Makefile
nodist_src_ui_gui_psppire_DATA = src/ui/gui/icons/splash.png
src/ui/gui/icons/splash.png: $(top_srcdir)/src/ui/gui/icons/splash-t.png $(top_srcdir)/src/ui/gui/icons/splash-r.png Makefile