diff --git a/fortran/Makefile.am b/fortran/Makefile.am
index 70e39beb2..735459960 100644
--- a/fortran/Makefile.am
+++ b/fortran/Makefile.am
@@ -5,8 +5,9 @@
 
 # $Id: Makefile.am,v 1.60 2010/05/29 00:21:22 dmh Exp $
 
-AM_CPPFLAGS = -I$(top_srcdir)/include 
-AM_LDFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/liblib @EXTERN_CFLAGS@
+AM_LDFLAGS = @EXTERN_LDFLAGS@
+
 # May need to set this.
 libnetcdff_la_LIBADD = 
 
@@ -70,14 +71,14 @@ if USE_NETCDF4
 libnetcdff_la_SOURCES += fort-nc4.c
 endif
 
+# The fortran-77 library may be build stand-alone, or as part of the C
+# library.
 if BUILD_SEPARATE_FORTRAN
 lib_LTLIBRARIES = libnetcdff.la
 else
 noinst_LTLIBRARIES = libnetcdff.la
 endif
 
-AM_CPPFLAGS += -I$(top_builddir)/liblib @EXTERN_CFLAGS@
-
 # If F90 is built, include it's convenience library.
 if BUILD_F90
 libnetcdff_la_LIBADD += ${top_builddir}/f90/libnetcdff90.la
@@ -89,8 +90,6 @@ if BUILD_DLL
 AM_CPPFLAGS += -DNC_DLL_EXPORT
 endif
 
-AM_LDFLAGS += @EXTERN_LDFLAGS@
-
 # The nfconfig.in file is turned into nfconfig.inc by the configure
 # script. The man page is generated on the developers machine for the
 # dist.
@@ -101,4 +100,3 @@ netcdf4.inc
 CLEANFILES = nfconfig1.inc netcdf.inc
 DISTCLEANFILES = nfconfig.inc 
 
-test: check