Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
22362633
Commit
22362633
authored
Jul 23, 2015
by
Thomas Markwalder
Browse files
[master] Corrected distcheck failure in cfgrpt
Merges branch 'trac3929'
parents
380d6511
c2c8a908
Changes
24
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
22362633
...
...
@@ -127,6 +127,7 @@ install-exec-hook:
### in the distributed tarball:
EXTRA_DIST
=
tools/system_messages.py
EXTRA_DIST
+=
tools/path_replacer.sh
EXTRA_DIST
+=
tools/mk_cfgrpt.sh
#### include external sources in the distributed tarball:
EXTRA_DIST
+=
ext/asio/README
...
...
configure.ac
View file @
22362633
...
...
@@ -1393,7 +1393,6 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/bin/d2/tests/Makefile
src/bin/d2/tests/d2_process_tests.sh
src/bin/d2/tests/test_data_files_config.h
src/bin/cfgrpt/Makefile
src/bin/dhcp4/Makefile
src/bin/dhcp4/spec_config.h.pre
src/bin/dhcp4/tests/Makefile
...
...
@@ -1442,6 +1441,8 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/lib/asiolink/tests/Makefile
src/lib/cc/Makefile
src/lib/cc/tests/Makefile
src/lib/cfgrpt/Makefile
src/lib/cfgrpt/tests/Makefile
src/lib/config/Makefile
src/lib/config/tests/Makefile
src/lib/config/tests/data_def_unittests_config.h
...
...
@@ -1651,10 +1652,6 @@ Developer:
END
# Create config_report.cc with embedded config.report
chmod +x ${srcdir}/tools/mk_cfgrpt.sh
${srcdir}/tools/mk_cfgrpt.sh ${srcdir}/src/bin/cfgrpt/config_report.cc
cat config.report
cat <<EOF
...
...
src/bin/Makefile.am
View file @
22362633
# The following build order must be maintained.
SUBDIRS
=
cfgrpt
dhcp4 dhcp6 d2 perfdhcp admin lfc keactrl
SUBDIRS
=
dhcp4 dhcp6 d2 perfdhcp admin lfc keactrl
check-recursive
:
all-recursive
src/bin/cfgrpt/Makefile.am
deleted
100644 → 0
View file @
380d6511
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src/bin
-I
$(top_builddir)
/src/bin
# Get rid of generated message files on a clean
CLEANFILES
=
*
.gcno
*
.gcda
# config_report.cc was generated by configure
DISTCLEANFILES
=
config_report.cc
# convenience archive
noinst_LTLIBRARIES
=
libcfgrpt.la
libcfgrpt_la_SOURCES
=
config_report.h config_report.cc cfgrpt.cc
src/bin/d2/Makefile.am
View file @
22362633
...
...
@@ -106,7 +106,7 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
kea_dhcp_ddnsdir
=
$(pkgdatadir)
kea_dhcp_ddns_DATA
=
dhcp-ddns.spec
src/bin/d2/tests/Makefile.am
View file @
22362633
...
...
@@ -87,7 +87,7 @@ d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.l
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libkea-dns++.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
endif
...
...
src/bin/dhcp4/Makefile.am
View file @
22362633
...
...
@@ -85,7 +85,7 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
kea_dhcp4dir
=
$(pkgdatadir)
kea_dhcp4_DATA
=
dhcp4.spec
src/bin/dhcp4/tests/Makefile.am
View file @
22362633
...
...
@@ -109,7 +109,7 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libkea-util-io.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
endif
...
...
src/bin/dhcp6/Makefile.am
View file @
22362633
...
...
@@ -85,7 +85,7 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
kea_dhcp6dir
=
$(pkgdatadir)
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
22362633
...
...
@@ -111,7 +111,7 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/libkea-log.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libkea-util-io.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
endif
...
...
src/bin/lfc/Makefile.am
View file @
22362633
...
...
@@ -65,6 +65,6 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/cc/libkea-cc.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
kea_lfcdir
=
$(pkgdatadir)
src/bin/lfc/tests/Makefile.am
View file @
22362633
...
...
@@ -58,7 +58,7 @@ lfc_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libkea-cc.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
endif
...
...
src/bin/perfdhcp/Makefile.am
View file @
22362633
...
...
@@ -48,7 +48,7 @@ perfdhcp_LDADD = libperfdhcp.la
perfdhcp_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libkea-exceptions.la
perfdhcp_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libkea-dhcp++.la
perfdhcp_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libkea-asiolink.la
perfdhcp_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
perfdhcp_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
# ... and the documentation
EXTRA_DIST
=
perfdhcp_internals.dox
...
...
src/bin/perfdhcp/tests/Makefile.am
View file @
22362633
...
...
@@ -47,7 +47,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libkea-asiolink.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libkea-dhcp++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/
bin
/cfgrpt/libcfgrpt.la
run_unittests_LDADD
+=
$(top_builddir)
/src/
lib
/cfgrpt/libcfgrpt.la
run_unittests_LDADD
+=
$(GTEST_LDADD)
endif
...
...
src/lib/Makefile.am
View file @
22362633
# The following build order must be maintained.
SUBDIRS
=
exceptions util log hooks cryptolink dns cc asiolink dhcp config stats
\
asiodns testutils dhcp_ddns dhcpsrv
asiodns testutils dhcp_ddns dhcpsrv
cfgrpt
src/
bin
/cfgrpt/.gitignore
→
src/
lib
/cfgrpt/.gitignore
View file @
22362633
File moved
src/lib/cfgrpt/Makefile.am
0 → 100644
View file @
22362633
SUBDIRS
=
.
tests
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src/lib
-I
$(top_builddir)
/src/lib
# Get rid of generated message files on a clean
CLEANFILES
=
*
.gcno
*
.gcda config_report.cc
# config_report.cc is generated below
BUILT_SOURCES
=
config_report.cc
# convenience archive
noinst_LTLIBRARIES
=
libcfgrpt.la
nodist_libcfgrpt_la_SOURCES
=
config_report.cc
libcfgrpt_la_SOURCES
=
config_report.h cfgrpt.cc
# set pathname to the input configuration report
report_file
=
$(abs_top_builddir)
/config.report
# Generate config_report.cc
config_report.cc
:
$(report_file)
${SHELL}
$(top_srcdir)
/tools/mk_cfgrpt.sh
$(report_file)
$(top_builddir)
/src/lib/cfgrpt/config_report.cc
src/
bin
/cfgrpt/cfgrpt.cc
→
src/
lib
/cfgrpt/cfgrpt.cc
View file @
22362633
File moved
src/
bin
/cfgrpt/config_report.h
→
src/
lib
/cfgrpt/config_report.h
View file @
22362633
...
...
@@ -15,6 +15,8 @@
#ifndef CONFIG_REPORT_H
#define CONFIG_REPORT_H
#include <string>
namespace
isc
{
namespace
detail
{
...
...
src/lib/cfgrpt/tests/Makefile.am
0 → 100644
View file @
22362633
SUBDIRS
=
.
AM_CPPFLAGS
=
-I
$(top_builddir)
/src/lib
-I
$(top_srcdir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CPPFLAGS
+=
-DTEST_DATA_DIR
=
\"
$(abs_top_srcdir)
/src/lib/testutils/testdata
\"
AM_CPPFLAGS
+=
-DTEST_DATA_BUILDDIR
=
\"
$(abs_top_builddir)
/src/lib/config/tests
\"
AM_CXXFLAGS
=
$(KEA_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
endif
CLEANFILES
=
*
.gcno
*
.gcda
TESTS_ENVIRONMENT
=
\
$(LIBTOOL)
--mode
=
execute
$(VALGRIND_COMMAND)
TESTS
=
if
HAVE_GTEST
TESTS
+=
run_unittests
run_unittests_SOURCES
=
config_report_unittests.cc run_unittests.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cfgrpt/libcfgrpt.la
endif
noinst_PROGRAMS
=
$(TESTS)
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment