X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=5636fa302e1525a8440d20574276badc786794ad;hb=15a81d8991a8e2dd78434f846b70837083614a20;hp=63972bb3e49bbc869ada2657543ad5a96e7af048;hpb=af8622f11c920a03269ad489617d86bfd568b287;p=pspp diff --git a/doc/automake.mk b/doc/automake.mk index 63972bb3e4..5636fa302e 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -193,14 +193,14 @@ native/Makefile: $(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)