diff options
| author | Matias Elo <matias.elo@nokia.com> | 2019-05-15 10:35:37 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2019-05-15 10:35:37 +0300 |
| commit | ebe70ec11dcc32ae62deaf53ff972e5ad26a792d (patch) | |
| tree | 6033da413c26561861dbbe18483de29a4af594eb /Makefile.am | |
| parent | a7e8e58948345a882228d2c20a03130b670b86ce (diff) | |
| parent | 7f79421ba6204559fc33d960f9c58ee4bd2ca064 (diff) | |
Merge branch 'master' of https://github.com/OpenDataPlane/odp into odp-dpdk
# Conflicts:
# .travis.yml
# configure.ac
# scripts/ci/check.sh
# scripts/ci/coverage.sh
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 598cd28e1..0cf84a59f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ endif @DX_RULES@ -EXTRA_DIST = bootstrap CHANGELOG config/README config/odp-$(with_platform).conf +EXTRA_DIST = bootstrap CHANGELOG config/README distcheck-hook: if test -n "$(DX_CLEANFILES)" ; \ |