Skip to content

Commit

Permalink
Add CMake-related files to EXTRA_DIST
Browse files Browse the repository at this point in the history
  • Loading branch information
Lekensteyn committed Mar 12, 2016
1 parent 618073e commit bdb6581
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 6 deletions.
14 changes: 13 additions & 1 deletion Makefile.am
Expand Up @@ -33,7 +33,19 @@ ACLOCAL_AMFLAGS = -I m4
dist_doc_DATA = README.rst

EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
Dockerfile.android
Dockerfile.android \
cmakeconfig.h.in \
CMakeLists.txt \
CMakeOptions.txt \
cmake/FindSpdylay.cmake \
cmake/ExtractValidFlags.cmake \
cmake/FindJemalloc.cmake \
cmake/FindLibev.cmake \
cmake/FindCUnit.cmake \
cmake/Version.cmake \
cmake/FindCython.cmake \
cmake/FindLibevent.cmake \
cmake/FindJansson.cmake

.PHONY: clang-format

Expand Down
6 changes: 5 additions & 1 deletion contrib/Makefile.am
Expand Up @@ -23,7 +23,11 @@

configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf

EXTRA_DIST = $(configfiles:%=%.in) nghttpx-logrotate tlsticketupdate.go
EXTRA_DIST = \
CMakeLists.txt \
$(configfiles:%=%.in) \
nghttpx-logrotate \
tlsticketupdate.go

edit = sed -e 's|@bindir[@]|$(bindir)|g'

Expand Down
1 change: 1 addition & 0 deletions doc/Makefile.am
Expand Up @@ -154,6 +154,7 @@ RST_FILES = \
h2load.1.rst

EXTRA_DIST = \
CMakeLists.txt \
mkapiref.py \
$(RST_FILES) \
$(APIDOCS) \
Expand Down
2 changes: 2 additions & 0 deletions examples/Makefile.am
Expand Up @@ -21,6 +21,8 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

EXTRA_DIST = CMakeLists.txt

if ENABLE_EXAMPLES

AM_CFLAGS = $(WARNCFLAGS)
Expand Down
1 change: 1 addition & 0 deletions integration-tests/Makefile.am
Expand Up @@ -28,6 +28,7 @@ GO_FILES = \
server_tester.go

EXTRA_DIST = \
CMakeLists.txt \
$(GO_FILES) \
server.key \
server.crt \
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.am
Expand Up @@ -22,7 +22,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = includes

EXTRA_DIST = Makefile.msvc
EXTRA_DIST = Makefile.msvc CMakeLists.txt

AM_CFLAGS = $(WARNCFLAGS) $(EXTRACFLAG)
AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
Expand Down
3 changes: 3 additions & 0 deletions lib/includes/Makefile.am
Expand Up @@ -20,4 +20,7 @@
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

EXTRA_DIST = CMakeLists.txt

nobase_include_HEADERS = nghttp2/nghttp2.h nghttp2/nghttp2ver.h
2 changes: 1 addition & 1 deletion python/Makefile.am
Expand Up @@ -25,7 +25,7 @@
# clean-local in parallel build.
.NOTPARALLEL:

EXTRA_DIST = cnghttp2.pxd nghttp2.pyx
EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CMakeLists.txt install-python.cmake.in

if ENABLE_PYTHON_BINDINGS

Expand Down
2 changes: 1 addition & 1 deletion script/Makefile.am
Expand Up @@ -21,5 +21,5 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

EXTRA_DIST = README.rst
EXTRA_DIST = README.rst CMakeLists.txt
dist_pkgdata_SCRIPTS = fetch-ocsp-response
2 changes: 2 additions & 0 deletions src/Makefile.am
Expand Up @@ -22,6 +22,8 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = includes

EXTRA_DIST = CMakeLists.txt

bin_PROGRAMS =
check_PROGRAMS =
TESTS =
Expand Down
2 changes: 2 additions & 0 deletions src/includes/Makefile.am
Expand Up @@ -21,6 +21,8 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

EXTRA_DIST = CMakeLists.txt

if ENABLE_ASIO_LIB
nobase_include_HEADERS = nghttp2/asio_http2.h nghttp2/asio_http2_client.h \
nghttp2/asio_http2_server.h
Expand Down
2 changes: 2 additions & 0 deletions tests/Makefile.am
Expand Up @@ -22,6 +22,8 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = testdata

EXTRA_DIST = CMakeLists.txt

if HAVE_CUNIT

check_PROGRAMS = main
Expand Down
4 changes: 3 additions & 1 deletion third-party/Makefile.am
Expand Up @@ -23,6 +23,8 @@

AM_CPPFLAGS = @DEFS@

EXTRA_DIST = CMakeLists.txt

if ENABLE_THIRD_PARTY

noinst_LTLIBRARIES = libhttp-parser.la
Expand All @@ -39,7 +41,7 @@ endif # HAVE_NEVERBLEED

if HAVE_MRUBY

EXTRA_DIST = build_config.rb mruby/*
EXTRA_DIST += build_config.rb mruby/*

.PHONY: all-local clean mruby

Expand Down

0 comments on commit bdb6581

Please sign in to comment.