summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-04-21 20:54:23 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-04-21 20:54:23 (GMT)
commit74e554a8578e92b442ca760b6ca7de41140118c5 (patch)
treec68cd54b6ae6e037367f41ee159507cab924968e
parent7b975e7396b4af17722d3993e6680ca5297b2bd5 (diff)
downloadblt-74e554a8578e92b442ca760b6ca7de41140118c5.zip
blt-74e554a8578e92b442ca760b6ca7de41140118c5.tar.gz
blt-74e554a8578e92b442ca760b6ca7de41140118c5.tar.bz2
Squashed 'tkmpeg/' changes from 0858658e..dce516a7
dce516a7 minor config change 8e9d9855 rm autom4te.cache ref git-subtree-dir: tkmpeg git-subtree-split: dce516a7b110d03aba28b3509992bf63e76df941
-rw-r--r--Makefile.in3
-rwxr-xr-xconfigure1
-rw-r--r--configure.ac1
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 05a5b85..44ab3c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,7 +158,7 @@ PKG_CFLAGS = @PKG_CFLAGS@
DEFS = @DEFS@ $(PKG_CFLAGS)
# Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
-CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl tkmpegConfig.sh
+CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
CLEANFILES = @CLEANFILES@
CPPFLAGS = @CPPFLAGS@
@@ -363,7 +363,6 @@ distclean: clean
-rm -f *.tab.c
-rm -f $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log config.status
- -rm -rf autom4te.cache
#========================================================================
# Install binary object libraries. On Windows this includes both .dll and
diff --git a/configure b/configure
index a873fdd..223b835 100755
--- a/configure
+++ b/configure
@@ -5754,6 +5754,7 @@ done
#--------------------------------------------------------------------
#CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES tkmpegConfig.sh"
if test "${TEA_PLATFORM}" = "windows" ; then
# Ensure no empty if clauses
:
diff --git a/configure.ac b/configure.ac
index 926cbbe..b5fa501 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,6 +95,7 @@ TEA_ADD_TCL_SOURCES([])
#--------------------------------------------------------------------
#CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES tkmpegConfig.sh"
if test "${TEA_PLATFORM}" = "windows" ; then
# Ensure no empty if clauses
: