[hipl-commit] [trunk] Rev 4203: Combine libhipconf, libhipdht, libhiptool into one convenience library.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Fri, 9 Apr 2010 15:33:19 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 09/04/2010 at 15:33:19
Revision: 4203
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Combine libhipconf, libhipdht, libhiptool into one convenience library.
Right now these libraries have circular dependencies. Until these have been
fixed, it is simpler to directly combine the libraries into one instead of
manually tracking the dependencies.
This change also fixes building with --enable-shared.
Modified:
M Makefile.am
=== modified file 'Makefile.am'
--- Makefile.am 2010-04-09 09:59:18 +0000
+++ Makefile.am 2010-04-09 12:27:18 +0000
@@ -71,9 +71,8 @@
### libraries ###
-lib_LTLIBRARIES = lib/conf/libhipconf.la \
- lib/core/libhipcore.la \
- lib/tool/libhiptool.la
+lib_LTLIBRARIES = lib/core/libhipcore.la
+
if HIP_PFKEY
lib_LTLIBRARIES += lib/ipsec/libhipsec.la
endif
@@ -82,10 +81,6 @@
lib_LTLIBRARIES += lib/opphip/libopphip.la
endif
-if HIP_DHT
-lib_LTLIBRARIES += lib/dht/libhipdht.la
-endif
-
if HIP_AGENT
lib_LTLIBRARIES += lib/gui/libhipgui.la
endif
@@ -223,9 +218,11 @@
lib/gui/tools.c \
lib/gui/widgets.c
-lib_conf_libhipconf_la_SOURCES = lib/conf/hipconf.c
-lib_core_libhipcore_la_SOURCES = lib/core/builder.c \
+# TODO: libhipcore, libhipconf, libhipdht and libhiptool have circular
+# dependencies. This needs to be addressed at some point.
+lib_core_libhipcore_la_SOURCES = lib/conf/hipconf.c \
+ lib/core/builder.c \
lib/core/certtools.c \
lib/core/crypto.c \
lib/core/debug.c \
@@ -247,7 +244,16 @@
lib/core/solve.c \
lib/core/sqlitedbapi.c \
lib/core/straddr.c \
- lib/core/transform.c
+ lib/core/transform.c \
+ lib/tool/checksum.c \
+ lib/tool/lutil.c \
+ lib/tool/nlink.c \
+ lib/tool/pk.c
+
+if HIP_DHT
+lib_core_libhipcore_la_SOURCES += lib/dht/libhipdht.c \
+ lib/dht/libhipdhtxml.c
+endif
if HIP_PERFORMANCE
lib_core_libhipcore_la_SOURCES += lib/performance/performance.c
@@ -257,26 +263,16 @@
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 \
- lib/tool/pk.c
-
# don't use libipsec, but xfrmapi
if HIP_PFKEY
-lib_tool_libhiptool_la_SOURCES += lib/tool/pfkeysadb.c
+lib_core_libhipcore_la_SOURCES += lib/tool/pfkeysadb.c
else
-lib_tool_libhiptool_la_SOURCES += lib/tool/xfrmapi.c
+lib_core_libhipcore_la_SOURCES += lib/tool/xfrmapi.c
endif # HIPPFKEY
lib_opphip_libopphip_la_SOURCES = lib/opphip/wrap.c \
lib/opphip/wrap_db.c
-lib_dht_libhipdht_la_SOURCES = lib/dht/libhipdht.c \
- lib/dht/libhipdhtxml.c
-
i3_libi3_la_SOURCES = i3/aeshash/aescrypp.c \
i3/aeshash/aescrypt.c \
i3/aeshash/aeshash.c \
@@ -370,6 +366,7 @@
### library dependencies ###
firewall_hipfw_LDADD = lib/core/libhipcore.la
+hipd_hipd_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
@@ -377,48 +374,24 @@
test_conntest_server_LDADD = lib/core/libhipcore.la
test_cookietest_LDADD = lib/core/libhipcore.la
test_dh_performance_LDADD = lib/core/libhipcore.la
+test_dhtteststub_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_hipconf_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
-
-if HIP_DHT
-tools_hipconf_LDADD += lib/dht/libhipdht.la
-endif
-
-hipd_hipd_LDADD = lib/conf/libhipconf.la \
- lib/core/libhipcore.la
-
if HIP_I3
hipd_hipd_LDADD += i3/libi3.la
endif
-if HIP_DHT
-hipd_hipd_LDADD += lib/dht/libhipdht.la
-endif
-
if HIP_PFKEY
hipd_hipd_LDADD += lib/ipsec/libhipsec.la
endif
-# hard dependencies: libhipgui, libhipcore
-# TODO fix dependency between libhipgui and libhipconf if possible
-# TODO fix dependency between libhipcore and libhipconf if possible
-# TODO fix dependency between libhipconf and libhipdht if possible
-# TODO fix dependency between (libhipconf, libhipcore) and libhiptool if
possible
agent_hipagent_LDADD = lib/gui/libhipgui.la \
- lib/conf/libhipconf.la \
lib/core/libhipcore.la
-if HIP_DHT
-agent_hipagent_LDADD += lib/dht/libhipdht.la
-endif
agent_hipagent_LDFLAGS = `pkg-config --libs gtk+-2.0 gthread-2.0`
Other related posts:
- » [hipl-commit] [trunk] Rev 4203: Combine libhipconf, libhipdht, libhiptool into one convenience library. - Diego Biurrun
