diff --git a/.gitignore b/.gitignore index edc86da57..5a4e3ec9d 100644 --- a/.gitignore +++ b/.gitignore @@ -101,6 +101,7 @@ TAGS /test/ffmpegtest /test/x264test /travis.mk +/travis.mak /version.h /version.mac /version.mak diff --git a/Makefile.in b/Makefile.in index 3f236786b..c3942e307 100644 --- a/Makefile.in +++ b/Makefile.in @@ -566,13 +566,13 @@ splint: # Travis tests # travis test: $(PROGS) - $(MAKE) -f travis.mk all + $(MAKE) -f travis.mak all clean-travis travis-clean: - $(MAKE) -f travis.mk clean + $(MAKE) -f travis.mak clean update-travis travis-update golden: - $(MAKE) -f travis.mk update + $(MAKE) -f travis.mak update # # Rules to run autogen if necessary diff --git a/configure.ac b/configure.ac index 560d83657..f84a2363c 100644 --- a/configure.ac +++ b/configure.ac @@ -371,5 +371,5 @@ dnl PA_CHECK_BAD_STDC_INLINE PA_C_TYPEOF -AC_CONFIG_FILES([Makefile doc/Makefile misc/Makefile test/Makefile travis.mk]) +AC_CONFIG_FILES([Makefile doc/Makefile misc/Makefile test/Makefile travis.mak]) AC_OUTPUT diff --git a/travis.mk.in b/travis.mak.in similarity index 100% rename from travis.mk.in rename to travis.mak.in