doc/pspp-figures/independent-samples-t.sps \
doc/pspp-figures/reliability.sps \
doc/pspp-figures/select-if.sps \
+ doc/pspp-figures/show-system.sps \
doc/pspp-figures/sort-cases.sps \
doc/pspp-figures/split.sps \
doc/pspp-figures/temporary.sps \
$(MKDIR_P) native
(cd native && $(abs_top_srcdir)/configure --host=$(build) --without-gui)
-native/gl/libgl.la: native/Makefile
- (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) gl/libgl.la)
+# The gnulib header files are required for the object files of the native pspp
+# They are defined in BUILT_SOURCES but that is only defined as a first dependency
+# for the make all target. src/ui/terminal/pspp as a target will try to compile the
+# objects first but that fails without the header files. Therefore I build the native
+# executables via the default make target
+$(pspp) $(pspp_output) &: native/Makefile
+ (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) )
-$(pspp): native/gl/libgl.la
- (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) src/ui/terminal/pspp)
-
-$(pspp_output): native/gl/libgl.la
- (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) utilities/pspp-output)
else
pspp = src/ui/terminal/pspp$(EXEEXT)
pspp_output = utilities/pspp-output$(EXEEXT)
desktopdir = $(datadir)/applications
-doc/org.fsf.pspp.metainfo.xml: doc/org.fsf.pspp.metainfo.xml.in $(POFILES)
+doc/org.gnu.pspp.metainfo.xml: doc/org.gnu.pspp.metainfo.xml.in $(POFILES)
$(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po || \
$(MSGFMT) -L appdata --xml --template $< -o $@ -d $(top_srcdir)/po
-doc/org.fsf.pspp.desktop: doc/org.fsf.pspp.desktop.in $(POFILES)
+doc/org.gnu.pspp.desktop: doc/org.gnu.pspp.desktop.in $(POFILES)
$(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po
-CLEANFILES+=doc/org.fsf.pspp.desktop \
- doc/org.fsf.pspp.metainfo.xml
+CLEANFILES+=doc/org.gnu.pspp.desktop \
+ doc/org.gnu.pspp.metainfo.xml
-desktop_DATA = doc/org.fsf.pspp.desktop
+desktop_DATA = doc/org.gnu.pspp.desktop
appdatadir = $(datadir)/metainfo
-dist_appdata_DATA = doc/org.fsf.pspp.metainfo.xml
+dist_appdata_DATA = doc/org.gnu.pspp.metainfo.xml
-EXTRA_DIST += doc/org.fsf.pspp.metainfo.xml.in \
- doc/org.fsf.pspp.desktop.in
+EXTRA_DIST += doc/org.gnu.pspp.metainfo.xml.in \
+ doc/org.gnu.pspp.desktop.in
\f