Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Adam Osuchowski
Kea
Commits
eaff4546
Commit
eaff4546
authored
Sep 18, 2013
by
Kean Johnston
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[3170] fix rulkes that were breaking parallel builds
parent
e4fe1a79
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
107 additions
and
44 deletions
+107
-44
src/bin/auth/Makefile.am
src/bin/auth/Makefile.am
+9
-3
src/bin/d2/Makefile.am
src/bin/d2/Makefile.am
+5
-2
src/bin/dhcp4/Makefile.am
src/bin/dhcp4/Makefile.am
+5
-2
src/bin/dhcp6/Makefile.am
src/bin/dhcp6/Makefile.am
+5
-2
src/bin/resolver/Makefile.am
src/bin/resolver/Makefile.am
+5
-3
src/lib/asiodns/Makefile.am
src/lib/asiodns/Makefile.am
+5
-2
src/lib/cache/Makefile.am
src/lib/cache/Makefile.am
+5
-2
src/lib/cc/Makefile.am
src/lib/cc/Makefile.am
+5
-2
src/lib/config/Makefile.am
src/lib/config/Makefile.am
+5
-2
src/lib/datasrc/Makefile.am
src/lib/datasrc/Makefile.am
+10
-2
src/lib/datasrc/memory/Makefile.am
src/lib/datasrc/memory/Makefile.am
+5
-2
src/lib/dhcp_ddns/Makefile.am
src/lib/dhcp_ddns/Makefile.am
+5
-2
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/Makefile.am
+5
-2
src/lib/dns/Makefile.am
src/lib/dns/Makefile.am
+6
-2
src/lib/hooks/Makefile.am
src/lib/hooks/Makefile.am
+5
-2
src/lib/log/tests/Makefile.am
src/lib/log/tests/Makefile.am
+5
-2
src/lib/nsas/Makefile.am
src/lib/nsas/Makefile.am
+5
-2
src/lib/resolve/Makefile.am
src/lib/resolve/Makefile.am
+5
-2
src/lib/server_common/Makefile.am
src/lib/server_common/Makefile.am
+5
-2
src/lib/util/tests/Makefile.am
src/lib/util/tests/Makefile.am
+1
-2
src/lib/util/threads/tests/Makefile.am
src/lib/util/threads/tests/Makefile.am
+1
-2
No files found.
src/bin/auth/Makefile.am
View file @
eaff4546
...
...
@@ -20,7 +20,7 @@ CLEANFILES = *.gcno *.gcda auth.spec spec_config.h
CLEANFILES
+=
auth_messages.h auth_messages.cc
CLEANFILES
+=
gen-statisticsitems.py
# auto-generated by gen-statisticsitems.py
CLEANFILES
+=
statistics.cc statistics_items.h b10-auth.xml tests/statistics_unittest.cc
CLEANFILES
+=
statistics.cc statistics_items.h b10-auth.xml tests/statistics_unittest.cc
s-genstats s-messages
man_MANS
=
b10-auth.8
DISTCLEANFILES
=
$(man_MANS)
...
...
@@ -49,14 +49,20 @@ gen-statisticsitems.py: gen-statisticsitems.py.pre
$(SED)
-e
"s|@@LOCALSTATEDIR@@|
$(localstatedir)
|"
gen-statisticsitems.py.pre
>
$@
chmod
+x
$@
auth.spec b10-auth.xml statistics_items.h statistics.cc tests/statistics_unittest.cc
:
Makefile gen-statisticsitems.py
auth.spec b10-auth.xml statistics_items.h statistics.cc tests/statistics_unittest.cc
:
Makefile s-genstats
s-genstats
:
gen-statisticsitems.py
./gen-statisticsitems.py
touch
$@
spec_config.h
:
spec_config.h.pre
$(SED)
-e
"s|@@LOCALSTATEDIR@@|
$(localstatedir)
|"
spec_config.h.pre
>
$@
auth_messages.h auth_messages.cc
:
auth_messages.mes
auth_messages.h auth_messages.cc
:
s-messages
s-messages
:
auth_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/bin/auth/auth_messages.mes
touch
$@
BUILT_SOURCES
=
spec_config.h auth_messages.h auth_messages.cc
# auto-generated by gen-statisticsitems.py
...
...
src/bin/d2/Makefile.am
View file @
eaff4546
...
...
@@ -16,7 +16,7 @@ endif
pkglibexecdir
=
$(libexecdir)
/@PACKAGE@
CLEANFILES
=
*
.gcno
*
.gcda spec_config.h d2_messages.h d2_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda spec_config.h d2_messages.h d2_messages.cc
s-messages
man_MANS
=
b10-dhcp-ddns.8
DISTCLEANFILES
=
$(man_MANS)
...
...
@@ -39,8 +39,11 @@ endif
spec_config.h
:
spec_config.h.pre
$(SED)
-e
"s|@@LOCALSTATEDIR@@|
$(localstatedir)
|"
spec_config.h.pre
>
$@
d2_messages.h d2_messages.cc
:
d2_messages.mes
d2_messages.h d2_messages.cc
:
s-messages
s-messages
:
d2_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/bin/d2/d2_messages.mes
touch
$@
BUILT_SOURCES
=
spec_config.h d2_messages.h d2_messages.cc
...
...
src/bin/dhcp4/Makefile.am
View file @
eaff4546
...
...
@@ -16,7 +16,7 @@ endif
pkglibexecdir
=
$(libexecdir)
/@PACKAGE@
CLEANFILES
=
*
.gcno
*
.gcda spec_config.h dhcp4_messages.h dhcp4_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda spec_config.h dhcp4_messages.h dhcp4_messages.cc
s-messages
man_MANS
=
b10-dhcp4.8
DISTCLEANFILES
=
$(man_MANS)
...
...
@@ -39,8 +39,11 @@ endif
spec_config.h
:
spec_config.h.pre
$(SED)
-e
"s|@@LOCALSTATEDIR@@|
$(localstatedir)
|"
spec_config.h.pre
>
$@
dhcp4_messages.h dhcp4_messages.cc
:
dhcp4_messages.mes
dhcp4_messages.h dhcp4_messages.cc
:
s-messages
s-messages
:
dhcp4_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/bin/dhcp4/dhcp4_messages.mes
touch
$@
BUILT_SOURCES
=
spec_config.h dhcp4_messages.h dhcp4_messages.cc
...
...
src/bin/dhcp6/Makefile.am
View file @
eaff4546
...
...
@@ -17,7 +17,7 @@ endif
pkglibexecdir
=
$(libexecdir)
/@PACKAGE@
CLEANFILES
=
spec_config.h dhcp6_messages.h dhcp6_messages.cc
CLEANFILES
=
spec_config.h dhcp6_messages.h dhcp6_messages.cc
s-messages
man_MANS
=
b10-dhcp6.8
DISTCLEANFILES
=
$(man_MANS)
...
...
@@ -41,8 +41,11 @@ endif
spec_config.h
:
spec_config.h.pre
$(SED)
-e
"s|@@LOCALSTATEDIR@@|
$(localstatedir)
|"
spec_config.h.pre
>
$@
dhcp6_messages.h dhcp6_messages.cc
:
dhcp6_messages.mes
dhcp6_messages.h dhcp6_messages.cc
:
s-messages
s-messages
:
dhcp6_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/bin/dhcp6/dhcp6_messages.mes
touch
$@
BUILT_SOURCES
=
spec_config.h dhcp6_messages.h dhcp6_messages.cc
...
...
src/bin/resolver/Makefile.am
View file @
eaff4546
...
...
@@ -20,7 +20,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES
=
*
.gcno
*
.gcda
CLEANFILES
+=
resolver.spec spec_config.h
CLEANFILES
+=
resolver_messages.cc resolver_messages.h
CLEANFILES
+=
resolver_messages.cc resolver_messages.h
s-messages
man_MANS
=
b10-resolver.8
DISTCLEANFILES
=
$(man_MANS)
...
...
@@ -46,9 +46,11 @@ spec_config.h: spec_config.h.pre
$(SED)
-e
"s|@@LOCALSTATEDIR@@|
$(localstatedir)
|"
spec_config.h.pre
>
$@
# Define rule to build logging source files from message file
resolver_messages.h resolver_messages.cc
:
resolver_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/bin/resolver/resolver_messages.mes
resolver_messages.h resolver_messages.cc
:
s-messages
s-messages
:
resolver_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/bin/resolver/resolver_messages.mes
touch
$@
BUILT_SOURCES
=
spec_config.h resolver_messages.cc resolver_messages.h
...
...
src/lib/asiodns/Makefile.am
View file @
eaff4546
...
...
@@ -8,11 +8,14 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
CLEANFILES
=
*
.gcno
*
.gcda asiodns_messages.h asiodns_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda asiodns_messages.h asiodns_messages.cc
s-messages
# Define rule to build logging source files from message file
asiodns_messages.h asiodns_messages.cc
:
asiodns_messages.mes
asiodns_messages.h asiodns_messages.cc
:
s-messages
s-messages
:
asiodns_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/asiodns/asiodns_messages.mes
touch
$@
BUILT_SOURCES
=
asiodns_messages.h asiodns_messages.cc
...
...
src/lib/cache/Makefile.am
View file @
eaff4546
...
...
@@ -36,9 +36,12 @@ nodist_libb10_cache_la_SOURCES = cache_messages.cc cache_messages.h
BUILT_SOURCES
=
cache_messages.cc cache_messages.h
cache_messages.cc cache_messages.h
:
cache_messages.mes
cache_messages.cc cache_messages.h
:
s-messages
s-messages
:
cache_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/cache/cache_messages.mes
touch
$@
CLEANFILES
=
*
.gcno
*
.gcda cache_messages.cc cache_messages.h
CLEANFILES
=
*
.gcno
*
.gcda cache_messages.cc cache_messages.h
s-messages
EXTRA_DIST
=
cache_messages.mes
src/lib/cc/Makefile.am
View file @
eaff4546
...
...
@@ -29,13 +29,16 @@ nodist_libb10_cc_la_SOURCES += proto_defs.h
libb10_cc_la_LIBADD
=
$(top_builddir)
/src/lib/log/libb10-log.la
CLEANFILES
=
*
.gcno
*
.gcda session_config.h cc_messages.cc cc_messages.h
\
proto_defs.h
proto_defs.h
s-messages
session_config.h
:
session_config.h.pre
$(SED)
-e
"s|@@LOCALSTATEDIR@@|
$(localstatedir)
|"
session_config.h.pre
>
$@
cc_messages.cc cc_messages.h
:
cc_messages.mes
cc_messages.cc cc_messages.h
:
s-messages
s-messages
:
cc_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/cc/cc_messages.mes
touch
$@
BUILT_SOURCES
=
session_config.h cc_messages.cc cc_messages.h proto_defs.h
...
...
src/lib/config/Makefile.am
View file @
eaff4546
...
...
@@ -6,8 +6,11 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
# Define rule to build logging source files from message file
config_messages.h config_messages.cc
:
config_messages.mes
config_messages.h config_messages.cc
:
s-messages
s-messages
:
config_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/config/config_messages.mes
touch
$@
BUILT_SOURCES
=
config_messages.h config_messages.cc
...
...
@@ -27,4 +30,4 @@ nodist_libb10_cfgclient_la_SOURCES = config_messages.h config_messages.cc
# The message file should be in the distribution.
EXTRA_DIST
=
config_messages.mes
CLEANFILES
=
*
.gcno
*
.gcda config_messages.h config_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda config_messages.h config_messages.cc
s-messages
src/lib/datasrc/Makefile.am
View file @
eaff4546
...
...
@@ -22,6 +22,7 @@ CLEANFILES = *.gcno *.gcda datasrc_messages.h datasrc_messages.cc
CLEANFILES
+=
sqlite3_datasrc_messages.h sqlite3_datasrc_messages.cc
CLEANFILES
+=
datasrc_config.h
CLEANFILES
+=
static.zone
CLEANFILES
+=
s-messages1 s-messages2
lib_LTLIBRARIES
=
libb10-datasrc.la
libb10_datasrc_la_SOURCES
=
exceptions.h
...
...
@@ -65,10 +66,17 @@ libb10_datasrc_la_LIBADD += $(SQLITE_LIBS)
BUILT_SOURCES
=
datasrc_config.h datasrc_messages.h datasrc_messages.cc
BUILT_SOURCES
+=
sqlite3_datasrc_messages.h sqlite3_datasrc_messages.cc
datasrc_messages.h datasrc_messages.cc
:
Makefile datasrc_messages.mes
datasrc_messages.h datasrc_messages.cc
:
s-messages1
s-messages1
:
Makefile datasrc_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/datasrc/datasrc_messages.mes
sqlite3_datasrc_messages.h sqlite3_datasrc_messages.cc
:
Makefile sqlite3_datasrc_messages.mes
touch
$@
sqlite3_datasrc_messages.h sqlite3_datasrc_messages.cc
:
s-messages2
s-messages2
:
Makefile sqlite3_datasrc_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/datasrc/sqlite3_datasrc_messages.mes
touch
$@
EXTRA_DIST
=
datasrc_messages.mes sqlite3_datasrc_messages.mes static.zone.pre
...
...
src/lib/datasrc/memory/Makefile.am
View file @
eaff4546
...
...
@@ -40,8 +40,11 @@ nodist_libdatasrc_memory_la_SOURCES = memory_messages.h memory_messages.cc
EXTRA_DIST
=
rdata_serialization_priv.cc
BUILT_SOURCES
=
memory_messages.h memory_messages.cc
memory_messages.h memory_messages.cc
:
Makefile memory_messages.mes
memory_messages.h memory_messages.cc
:
s-messages
s-messages
:
Makefile memory_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/datasrc/memory/memory_messages.mes
touch
$@
EXTRA_DIST
+=
memory_messages.mes
CLEANFILES
+=
memory_messages.h memory_messages.cc
CLEANFILES
+=
memory_messages.h memory_messages.cc
s-messages
src/lib/dhcp_ddns/Makefile.am
View file @
eaff4546
...
...
@@ -12,8 +12,11 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
# Define rule to build logging source files from message file
dhcp_ddns_messages.h dhcp_ddns_messages.cc
:
dhcp_ddns_messages.mes
dhcp_ddns_messages.h dhcp_ddns_messages.cc
:
s-messages
s-messages
:
dhcp_ddns_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
touch
$@
# Tell automake that the message files are built as part of the build process
# (so that they are built before the main library is built).
...
...
@@ -23,7 +26,7 @@ BUILT_SOURCES = dhcp_ddns_messages.h dhcp_ddns_messages.cc
EXTRA_DIST
=
dhcp_ddns_messages.mes libdhcp_ddns.dox
# Get rid of generated message files on a clean
CLEANFILES
=
*
.gcno
*
.gcda dhcp_ddns_messages.h dhcp_ddns_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda dhcp_ddns_messages.h dhcp_ddns_messages.cc
s-messages
lib_LTLIBRARIES
=
libb10-dhcp_ddns.la
libb10_dhcp_ddns_la_SOURCES
=
...
...
src/lib/dhcpsrv/Makefile.am
View file @
eaff4546
...
...
@@ -11,8 +11,11 @@ endif
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
# Define rule to build logging source files from message file
dhcpsrv_messages.h dhcpsrv_messages.cc
:
dhcpsrv_messages.mes
dhcpsrv_messages.h dhcpsrv_messages.cc
:
s-messages
s-messages
:
dhcpsrv_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/dhcpsrv/dhcpsrv_messages.mes
touch
$@
# Tell Automake that the dhcpsrv_messages.{cc,h} source files are created in the
# build process, so it must create these before doing anything else. Although
...
...
@@ -29,7 +32,7 @@ BUILT_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc
AM_CXXFLAGS
+=
$(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
# Make sure the generated files are deleted in a "clean" operation
CLEANFILES
=
*
.gcno
*
.gcda dhcpsrv_messages.h dhcpsrv_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda dhcpsrv_messages.h dhcpsrv_messages.cc
s-messages
lib_LTLIBRARIES
=
libb10-dhcpsrv.la
libb10_dhcpsrv_la_SOURCES
=
...
...
src/lib/dns/Makefile.am
View file @
eaff4546
...
...
@@ -7,7 +7,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
CLEANFILES
=
*
.gcno
*
.gcda
CLEANFILES
+=
rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc
CLEANFILES
+=
rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc
s-rdatacode
# These two are created with rrtype/class.h, so not explicitly listed in
# BUILT_SOURCES.
CLEANFILES
+=
python/rrtype_constants_inc.cc
...
...
@@ -157,8 +157,12 @@ nodist_libb10_dns___la_SOURCES = rdataclass.cc rrparamregistry.cc
rrclass.h
:
rrclass-placeholder.h
rrtype.h
:
rrtype-placeholder.h
rrparamregistry.cc
:
rrparamregistry-placeholder.cc
rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc
:
Makefile
s-rdatacode
:
$(PYTHON)
./gen-rdatacode.py
touch
$@
rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc
:
Makefile s-rdatacode
libdns___includedir
=
$(includedir)
/
$(PACKAGE_NAME)
/dns
libdns___include_HEADERS
=
\
...
...
src/lib/hooks/Makefile.am
View file @
eaff4546
...
...
@@ -12,8 +12,11 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
# Define rule to build logging source files from message file
hooks_messages.h hooks_messages.cc
:
hooks_messages.mes
hooks_messages.h hooks_messages.cc
:
s-messages
s-messages
:
hooks_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/hooks/hooks_messages.mes
touch
$@
# Tell automake that the message files are built as part of the build process
# (so that they are built before the main library is built).
...
...
@@ -23,7 +26,7 @@ BUILT_SOURCES = hooks_messages.h hooks_messages.cc
EXTRA_DIST
=
hooks_messages.mes
# Get rid of generated message files on a clean
CLEANFILES
=
*
.gcno
*
.gcda hooks_messages.h hooks_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda hooks_messages.h hooks_messages.cc
s-messages
lib_LTLIBRARIES
=
libb10-hooks.la
libb10_hooks_la_SOURCES
=
...
...
src/lib/log/tests/Makefile.am
View file @
eaff4546
...
...
@@ -14,10 +14,13 @@ CLEANFILES = *.gcno *.gcda *.lock
EXTRA_DIST
=
log_test_messages.mes
BUILT_SOURCES
=
log_test_messages.h log_test_messages.cc
log_test_messages.h log_test_messages.cc
:
log_test_messages.mes
log_test_messages.h log_test_messages.cc
:
s-messages
s-messages
:
log_test_messages.mes
$(AM_V_GEN)
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/log/tests/log_test_messages.mes
touch
$@
CLEANFILES
+=
log_test_messages.h log_test_messages.cc
CLEANFILES
+=
log_test_messages.h log_test_messages.cc
s-messages
noinst_PROGRAMS
=
logger_example
logger_example_SOURCES
=
logger_example.cc
...
...
src/lib/nsas/Makefile.am
View file @
eaff4546
...
...
@@ -22,8 +22,11 @@ AM_CXXFLAGS += -Wno-unused-parameter
endif
# Define rule to build logging source files from message file
nsas_messages.h nsas_messages.cc
:
nsas_messages.mes
nsas_messages.h nsas_messages.cc
:
s-messages
s-messages
:
nsas_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/nsas/nsas_messages.mes
touch
$@
# What is being built.
lib_LTLIBRARIES
=
libb10-nsas.la
...
...
@@ -59,4 +62,4 @@ nodist_libb10_nsas_la_SOURCES = nsas_messages.h nsas_messages.cc
EXTRA_DIST
=
nsas_messages.mes
# Make sure that the generated files are got rid of in a clean operation
CLEANFILES
=
*
.gcno
*
.gcda nsas_messages.h nsas_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda nsas_messages.h nsas_messages.cc
s-messages
src/lib/resolve/Makefile.am
View file @
eaff4546
...
...
@@ -8,8 +8,11 @@ AM_CPPFLAGS += $(SQLITE_CFLAGS)
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
# Define rule to build logging source files from message file
resolve_messages.h resolve_messages.cc
:
resolve_messages.mes
resolve_messages.h resolve_messages.cc
:
s-messages
s-messages
:
resolve_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/resolve/resolve_messages.mes
touch
$@
# Tell Automake that the nsasdef.{cc,h} source files are created in the build
# process, so it must create these before doing anything else. Although they
...
...
@@ -19,7 +22,7 @@ resolve_messages.h resolve_messages.cc: resolve_messages.mes
# present when they are compiled), the safest option is to create it first.
BUILT_SOURCES
=
resolve_messages.h resolve_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda resolve_messages.cc resolve_messages.h
CLEANFILES
=
*
.gcno
*
.gcda resolve_messages.cc resolve_messages.h
s-messages
lib_LTLIBRARIES
=
libb10-resolve.la
libb10_resolve_la_SOURCES
=
resolve.h resolve.cc
...
...
src/lib/server_common/Makefile.am
View file @
eaff4546
...
...
@@ -33,9 +33,12 @@ libb10_server_common_la_LIBADD += $(top_builddir)/src/lib/acl/libb10-acl.la
libb10_server_common_la_LIBADD
+=
$(top_builddir)
/src/lib/dns/libb10-dns++.la
libb10_server_common_la_LIBADD
+=
$(top_builddir)
/src/lib/util/io/libb10-util-io.la
BUILT_SOURCES
=
server_common_messages.h server_common_messages.cc
server_common_messages.h server_common_messages.cc
:
server_common_messages.mes
server_common_messages.h server_common_messages.cc
:
s-messages
s-messages
:
server_common_messages.mes
$(top_builddir)
/src/lib/log/compiler/message
$(top_srcdir)
/src/lib/server_common/server_common_messages.mes
touch
$@
EXTRA_DIST
=
server_common_messages.mes
CLEANFILES
=
*
.gcno
*
.gcda server_common_messages.h server_common_messages.cc
CLEANFILES
=
*
.gcno
*
.gcda server_common_messages.h server_common_messages.cc
s-messages
src/lib/util/tests/Makefile.am
View file @
eaff4546
...
...
@@ -50,8 +50,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(top_builddir)
/src/lib/util/libb10-util.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libb10-util-io.la
run_unittests_LDADD
+=
\
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libb10-exceptions.la
run_unittests_LDADD
+=
$(GTEST_LDADD)
endif
...
...
src/lib/util/threads/tests/Makefile.am
View file @
eaff4546
...
...
@@ -29,8 +29,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(PTHREAD_LDFLAGS)
run_unittests_LDADD
=
$(top_builddir)
/src/lib/util/threads/libb10-threads.la
run_unittests_LDADD
+=
\
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(GTEST_LDADD)
endif
...
...
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