Skip to content

Commit

Permalink
remove non-existent 'build' directory from EXTRA_DIST and add cmake a…
Browse files Browse the repository at this point in the history
…nd vc7 makefiles
  • Loading branch information
farindk committed Jul 8, 2015
1 parent d87aa20 commit 94f6aaa
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions enc265/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ if HAVE_VIDEOGFX
enc265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
enc265_LDFLAGS += $(VIDEOGFX_LIBS)
endif

EXTRA_DIST = \
CMakeLists.txt \
Makefile.vc7
1 change: 1 addition & 0 deletions libde265/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ if MINGW
endif

EXTRA_DIST = Makefile.vc7 \
CMakeLists.txt \
../extra/stdbool.h \
../extra/stdint.h

Expand Down
3 changes: 3 additions & 0 deletions libde265/encoder/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ libde265_encoder_la_SOURCES = \

SUBDIRS=algo
libde265_encoder_la_LIBADD = algo/libde265_encoder_algo.la

EXTRA_DIST = \
CMakeLists.txt
3 changes: 3 additions & 0 deletions libde265/encoder/algo/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions libde265/x86/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ if HAVE_VISIBILITY
libde265_x86_sse_la_CXXFLAGS += -DHAVE_VISIBILITY
endif

EXTRA_DIST = \
CMakeLists.txt

0 comments on commit 94f6aaa

Please sign in to comment.