Push condition down into sub-directory.

* Adding condition for optional builds without Fortran should make
  the conditional in the higher level Makefile unnecessary.

inst_headers/Makefile.am

@@ -44,12 +44,8 @@ xtincludedir = $(includedir)/xt
 
 nodist_include_HEADERS = yaxt.h
 
-SUBDIRS =
-DIST_SUBDIRS =
-if with_fortran
-SUBDIRS += . f90
-DIST_SUBDIRS += f90 .
-endif
+SUBDIRS = . f90
+DIST_SUBDIRS = f90 .
 
 ../src/xtinclude_Makefile.inc:
 	(cd ../src ; if test -r Makefile ; then \
@@ -87,9 +83,6 @@ clean-local:
 	rm -rf xt yaxt.h
 
 distclean-local:
-if ! with_fortran
-	rm -f f90/Makefile
-endif
 	-test "$(abs_builddir)" = "$(abs_srcdir)" || rmdir f90
 
 install-data-local: yaxt.h $(xtinclude_HEADERS)

inst_headers/f90/Makefile.am

@@ -158,6 +158,7 @@ $(XT_XMAP_RENAME_MOD_NAME).$(FCMODEXT): ../../src/$(XT_XMAP_RENAME_MOD_NAME).$(F
 
 ##MODULE_RECIPE_MARKER do not remove ##
 
+if with_fortran
 ##INCLUDE_HEADER_MARKER do not remove ##
 nodist_include_HEADERS= \
 	$(XT_XMAP_RENAME_MOD_NAME).$(FCMODEXT) \
@@ -182,6 +183,7 @@ nodist_include_HEADERS= \
 	$(XT_IDXVEC_MOD_NAME).$(FCMODEXT) \
 	$(XT_IDXSTRIPES_MOD_NAME).$(FCMODEXT) \
 	$(YAXT_MOD_NAME).$(FCMODEXT)
+endif
 
 clean-local:
 	rm -f *.$(FCMODEXT)