From 94f6aaa91fc0caa373ea7c535226a303aefd0d49 Mon Sep 17 00:00:00 2001 From: Dirk Farin Date: Wed, 8 Jul 2015 15:21:41 +0200 Subject: [PATCH] remove non-existent 'build' directory from EXTRA_DIST and add cmake and vc7 makefiles --- Makefile.am | 2 +- enc265/Makefile.am | 4 ++++ libde265/Makefile.am | 1 + libde265/encoder/Makefile.am | 3 +++ libde265/encoder/algo/Makefile.am | 3 +++ libde265/x86/Makefile.am | 2 ++ 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index dd368de40..ddda31bc6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,8 @@ EXTRA_DIST = .travis.yml \ autogen.sh \ build.bat \ m4/m4_ax_check_compile_flag.m4 \ - build \ Makefile.vc7 \ + CMakeLists.txt \ README.md \ libde265.png \ */COPYING diff --git a/enc265/Makefile.am b/enc265/Makefile.am index c8a121631..82f159469 100644 --- a/enc265/Makefile.am +++ b/enc265/Makefile.am @@ -13,3 +13,7 @@ if HAVE_VIDEOGFX enc265_CXXFLAGS += $(VIDEOGFX_CFLAGS) enc265_LDFLAGS += $(VIDEOGFX_LIBS) endif + +EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.vc7 diff --git a/libde265/Makefile.am b/libde265/Makefile.am index 047ce7069..29ee58399 100644 --- a/libde265/Makefile.am +++ b/libde265/Makefile.am @@ -96,6 +96,7 @@ if MINGW endif EXTRA_DIST = Makefile.vc7 \ + CMakeLists.txt \ ../extra/stdbool.h \ ../extra/stdint.h diff --git a/libde265/encoder/Makefile.am b/libde265/encoder/Makefile.am index f386c7681..cb062846f 100644 --- a/libde265/encoder/Makefile.am +++ b/libde265/encoder/Makefile.am @@ -11,3 +11,6 @@ libde265_encoder_la_SOURCES = \ SUBDIRS=algo libde265_encoder_la_LIBADD = algo/libde265_encoder_algo.la + +EXTRA_DIST = \ + CMakeLists.txt diff --git a/libde265/encoder/algo/Makefile.am b/libde265/encoder/algo/Makefile.am index da96a929f..e618a1887 100644 --- a/libde265/encoder/algo/Makefile.am +++ b/libde265/encoder/algo/Makefile.am @@ -14,3 +14,6 @@ libde265_encoder_algo_la_SOURCES = \ tb-split.h tb-split.cc \ tb-intrapredmode.h tb-intrapredmode.cc \ pb-mv.h pb-mv.cc + +EXTRA_DIST = \ + CMakeLists.txt diff --git a/libde265/x86/Makefile.am b/libde265/x86/Makefile.am index 836aaea60..55b389802 100644 --- a/libde265/x86/Makefile.am +++ b/libde265/x86/Makefile.am @@ -18,3 +18,5 @@ if HAVE_VISIBILITY libde265_x86_sse_la_CXXFLAGS += -DHAVE_VISIBILITY endif +EXTRA_DIST = \ + CMakeLists.txt