[hipl-commit] [trunk] Rev 4193: Link the core lib against the tool lib directly.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Thu, 8 Apr 2010 19:34:41 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 08/04/2010 at 19:34:41
Revision: 4193
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Link the core lib against the tool lib directly.
This avoids linking all binaries against both libs directly,
resulting in a considerable simplification of the link process.
Modified:
M Makefile.am
=== modified file 'Makefile.am'
--- Makefile.am 2010-04-08 13:29:03 +0000
+++ Makefile.am 2010-04-08 16:33:08 +0000
@@ -258,6 +258,8 @@
lib_core_libhipcore_la_SOURCES += lib/core/hip_capability.c
endif
+lib_core_libhipcore_la_LIBADD = lib/tool/libhiptool.la
+
lib_tool_libhiptool_la_SOURCES = lib/tool/checksum.c \
lib/tool/lutil.c \
lib/tool/nlink.c \
@@ -376,57 +378,32 @@
### *_LDADD ###
-test_conntest_client_opp_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_conntest_client_hip_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_conntest_server_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_cookietest_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_keygentest_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_hashtest_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_dhtteststub_LDADD = lib/dht/libhipdht.la \
- lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_certteststub_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_sqliteteststub_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_hc_performance_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_auth_performance_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
-test_dh_performance_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
+firewall_hipfw_LDADD = lib/core/libhipcore.la
+test_auth_performance_LDADD = lib/core/libhipcore.la
+test_certteststub_LDADD = lib/core/libhipcore.la
+test_conntest_client_hip_LDADD = lib/core/libhipcore.la
+test_conntest_client_opp_LDADD = lib/core/libhipcore.la
+test_conntest_server_LDADD = lib/core/libhipcore.la
+test_cookietest_LDADD = lib/core/libhipcore.la
+test_dh_performance_LDADD = lib/core/libhipcore.la
+test_hashtest_LDADD = lib/core/libhipcore.la
+test_hc_performance_LDADD = lib/core/libhipcore.la
+test_keygentest_LDADD = lib/core/libhipcore.la
+test_sqliteteststub_LDADD = lib/core/libhipcore.la
+tools_pisacert_LDADD = lib/core/libhipcore.la
+
+test_dhtteststub_LDADD = lib/dht/libhipdht.la \
+ lib/core/libhipcore.la
tools_hipconf_LDADD = lib/conf/libhipconf.la \
- lib/core/libhipcore.la \
- lib/tool/libhiptool.la
+ lib/core/libhipcore.la
if HIP_DHT
tools_hipconf_LDADD += lib/dht/libhipdht.la
endif
-tools_pisacert_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
hipd_hipd_LDADD = lib/conf/libhipconf.la \
- lib/core/libhipcore.la \
- lib/tool/libhiptool.la
+ lib/core/libhipcore.la
if HIP_I3
hipd_hipd_LDADD += i3/i3_client/libi3client.a \
@@ -443,9 +420,6 @@
hipd_hipd_LDADD += lib/ipsec/libhipsec.la
endif
-firewall_hipfw_LDADD = lib/core/libhipcore.la \
- lib/tool/libhiptool.la
-
# hard dependencies: libhipgui, libhipcore
# TODO fix dependency between libhipgui and libhipconf if possible
# TODO fix dependency between libhipcore and libhipconf if possible
Other related posts:
- » [hipl-commit] [trunk] Rev 4193: Link the core lib against the tool lib directly. - Diego Biurrun
