fixed some automake issues to get distcheck working

This commit is contained in:
Ed Hartnett 2010-06-23 17:48:10 +00:00
parent cbb36d7710
commit 9da0b67627
2 changed files with 9 additions and 16 deletions

View File

@ -15,11 +15,10 @@
@SET_MAKE@
# Copyright 2005, see the COPYRIGHT file for more information.
# Copyright 2010, see the COPYRIGHT file for more information.
# This is the makefile for the include directory.
# $Id: Makefile.am,v 1.137 2010/06/01 15:34:49 ed Exp $
# This automake file generates the Makefile to build the include
# directory.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@ -41,7 +40,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@BUILD_PARALLEL_TRUE@am__append_1 = netcdf_par.h
@BUILD_PARALLEL_TRUE@am__append_1 = netcdf_par.h
subdir = include
DIST_COMMON = $(am__include_HEADERS_DIST) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
@ -138,6 +137,7 @@ HAS_HDF4 = @HAS_HDF4@
HAS_HDF5 = @HAS_HDF5@
HAS_NC2 = @HAS_NC2@
HAS_NC4 = @HAS_NC4@
HAS_PNETCDF = @HAS_PNETCDF@
HAS_SZLIB = @HAS_SZLIB@
HDF4DIR = @HDF4DIR@
HDF5DIR = @HDF5DIR@
@ -248,14 +248,8 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# Tell automake that netcdf.h (and maybe netcdf_par.h) is a header
# file we want to install.
include_HEADERS = netcdf.h $(am__append_1)
# These headers may be used by library code and test programs but will
# not be installed.
noinst_HEADERS = nc_tests.h nc_logging.h
noinst_HEADERS = nc_logging.h nc_tests.h
all: all-am
.SUFFIXES:

View File

@ -17,10 +17,9 @@ AM_CPPFLAGS += -I${top_srcdir}/oc
endif
# Netcdf-4 source.
NC4SOURCES = nc4internal.h netcdf3.h error4.c error.h netcdf4l.h \
nctolnc4.h nc4dispatch.c nc4dispatch.h nc3stub.c nc3stub.h nc4attr.c \
nc4dim.c nc4file.c nc4grp.c nc4type.c nc4var.c ncfunc.c nc4internal.c \
nc4hdf.c
NC4SOURCES = nc4internal.h netcdf3.h error4.c netcdf4l.h nctolnc4.h \
nc4dispatch.c nc4dispatch.h nc3stub.c nc3stub.h nc4attr.c nc4dim.c \
nc4file.c nc4grp.c nc4type.c nc4var.c ncfunc.c nc4internal.c nc4hdf.c
# This is our output. The big enchilada.
noinst_LTLIBRARIES = libnetcdf4.la