Skip to content

Commit

Permalink
Don't distribute license tools
Browse files Browse the repository at this point in the history
It was annoying that the license tool got run in a distributed
tar ball and would probably confuse users. This removes it from
the distributed tarball. But we have to then check if it's there
if we're going to run it so that we don't get an error in the
tar ball (or different confusing messages).
  • Loading branch information
pbauman committed Apr 29, 2016
1 parent 480f3a8 commit 04df34e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
9 changes: 6 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILT_SOURCES = .license.stamp

# Doxygen support
include $(top_srcdir)/doxygen/aminclude.am

Expand Down Expand Up @@ -52,7 +50,7 @@ install-data-hook:
cd $(DESTDIR)$(includedir) && mv config.replaced antioch_config.h ;

# Install config file
BUILT_SOURCES += antioch_config.h
BUILT_SOURCES = antioch_config.h
include_HEADERS = antioch_config.h

# Additional files to be deleted by 'make distclean'
Expand Down Expand Up @@ -94,11 +92,16 @@ MAINTAINERCLEANFILES += m4/lt~obsolete.m4
# works.
#STAMPED_FILES = $(shell find $(top_srcdir)/src -name '*.h' -or -name '*.C')

# Since we don't distribute the lic_utils, check and make sure it's there.
# This way, we won't run this on distributed tarballs, only on the repos clones
if ANTIOCH_LICENSESTAMPEXISTS
BUILT_SOURCES += .license.stamp
.license.stamp: $(top_srcdir)/LICENSE
@$(top_srcdir)/src/common/lic_utils/update_license.pl $(top_srcdir)/LICENSE $(ANTIOCH_STAMPED_FILES)
echo 'updated source license headers' >$@

CLEANFILES = .license.stamp
endif

# -------------------------------------------
# Optional support for code coverage analysis
Expand Down
5 changes: 5 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,11 @@ dnl-----------------------------------------------
_AC_SRCDIRS(.)
TOP_SEARCH_DIR=$ac_abs_top_srcdir

# Since we don't distribute the lic_utils, check and make sure it's there.
# This way, we won't run the license stamping perl script on distributed
# tarballs, only on the repository clones
AM_CONDITIONAL(ANTIOCH_LICENSESTAMPEXISTS, [test -f $TOP_SEARCH_DIR/src/common/lic_utils/update_license.pl])

# We have to do this by subdirectory because otherwise distcheck
# breaks as we start picking up files in the directories
# that it uses.
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,4 @@ if CODE_COVERAGE_ENABLED
CLEANFILES += *.gcda *.gcno
endif

EXTRA_DIST = common
EXTRA_DIST = common/lcov

0 comments on commit 04df34e

Please sign in to comment.