summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-05-23 21:10:23 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-05-23 21:10:23 (GMT)
commit7ad4792c50a17afacb920a04f80a23d3fe2dde4a (patch)
tree91fe7ca1d471fe0448f859cd4f7b7319ba05f268
parent804b85f80e4dcf5dae4bc28361df0678dcd691b9 (diff)
downloadhdf5-7ad4792c50a17afacb920a04f80a23d3fe2dde4a.zip
hdf5-7ad4792c50a17afacb920a04f80a23d3fe2dde4a.tar.gz
hdf5-7ad4792c50a17afacb920a04f80a23d3fe2dde4a.tar.bz2
[svn-r12372] Purpose:
Makefile cleanup Description: Cleaned up where files were distcleaned Platforms tested: mir (change only affects distclean)
-rwxr-xr-xMakefile.am2
-rw-r--r--Makefile.in2
-rwxr-xr-xsrc/Makefile.am2
-rw-r--r--src/Makefile.in3
4 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 45d1982..644c2c6 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,7 @@ SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
# Some files generated during configure that should be cleaned
-DISTCLEANFILES=src/H5config.h src/H5pubconf.h config/stamp1 config/stamp2
+DISTCLEANFILES=config/stamp1 config/stamp2
# Define rules for lib, progs, check, and tests.
# These simply involve recursing into subdirectories.
diff --git a/Makefile.in b/Makefile.in
index 566ce0a..c7305ed1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -367,7 +367,7 @@ SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
# Some files generated during configure that should be cleaned
-DISTCLEANFILES = src/H5config.h src/H5pubconf.h config/stamp1 config/stamp2
+DISTCLEANFILES = config/stamp1 config/stamp2
all: all-recursive
.SUFFIXES:
diff --git a/src/Makefile.am b/src/Makefile.am
index da84780..24dd7d9 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,8 @@ libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_
# H5Tinit.c is a generated file, and should be cleaned.
MOSTLYCLEANFILES=H5Tinit.c
+# H5pubconf.h is generated by configure, and should be cleaned.
+DISTCLEANFILES=H5pubconf.h
# library sources
libhdf5_la_SOURCES= H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 3c6a836..bb3780d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -391,6 +391,8 @@ libhdf5_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT
# H5Tinit.c is a generated file, and should be cleaned.
MOSTLYCLEANFILES = H5Tinit.c
+# H5pubconf.h is generated by configure, and should be cleaned.
+DISTCLEANFILES = H5pubconf.h
# library sources
libhdf5_la_SOURCES = H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
@@ -906,6 +908,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"