From ff0ff83d9867e5eae649a5f4a33ab708ac31cbf3 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 16 Aug 2017 14:40:57 +0200 Subject: [PATCH] Update EXTRA_DIST in several makefiles. --- Makefile.am | 4 +++- build/Makefile.am | 1 - demos/Makefile.am | 6 ------ src/3rdparty/Makefile.am | 4 ++-- src/Makefile.am | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 demos/Makefile.am diff --git a/Makefile.am b/Makefile.am index ed9f6a7e..5884b55b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,9 @@ include $(top_srcdir)/build/autotools/common.am SUBDIRS = build src tools doc DIST_SUBDIRS = $(SUBDIRS) binaries -EXTRA_DIST += bootstrap COPYING TODO +EXTRA_DIST += bootstrap COPYING TODO \ + .gitignore .gitattributes .gitmodules \ + .travis.yml lol.sln build.config AUTOMAKE_OPTIONS = dist-bzip2 ACLOCAL_AMFLAGS = -I build/autotools/m4 diff --git a/build/Makefile.am b/build/Makefile.am index d1644e80..e5840ff6 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -9,7 +9,6 @@ EXTRA_DIST += lol-build \ build-nacl32 build-nacl64 build-android build-html \ \ msbuild/lolfx.targets \ - msbuild/config-build.xml \ msbuild/lolfx.xml \ msbuild/lolfx.props \ msbuild/lol.config.props \ diff --git a/demos/Makefile.am b/demos/Makefile.am deleted file mode 100644 index 18898cd6..00000000 --- a/demos/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ - -include $(top_srcdir)/build/autotools/common.am - -SUBDIRS = -SUBDIRS += lol.js - diff --git a/src/3rdparty/Makefile.am b/src/3rdparty/Makefile.am index ecae9949..fe8bca5e 100644 --- a/src/3rdparty/Makefile.am +++ b/src/3rdparty/Makefile.am @@ -19,8 +19,8 @@ liblol_lua_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUA_ANSI include lol-lua.am EXTRA_DIST += $(imgui_sources) $(mingw_std_threads_sources) $(pegtl_sources) -EXTRA_DIST += lol-bullet.vcxproj -EXTRA_DIST += lol-lua.vcxproj +EXTRA_DIST += lol-bullet.vcxproj lol-bullet.vcxproj.filters +EXTRA_DIST += lol-lua.vcxproj lol-lua.vcxproj.filters include lol-imgui.am include lol-mingw-std-threads.am diff --git a/src/Makefile.am b/src/Makefile.am index c9aa86ac..66038e5a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = 3rdparty data . t noinst_LIBRARIES = liblol-core.a -EXTRA_DIST += lol-core.vcxproj +EXTRA_DIST += lol-core.vcxproj lol-core.vcxproj.filter liblol_core_a_SOURCES = \ tiler.cpp tiler.h dict.cpp dict.h lolgl.h \