[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5149: Merge modularization library into libhipcore.

From: noreply@xxxxxxxxxxxxx
To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
Date: Fri, 12 Nov 2010 16:34:29 -0000

------------------------------------------------------------
revno: 5149
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-11-12 17:31:19 +0100
message:
  Merge modularization library into libhipcore.
  
  The modularization feature is not optional, so it makes no sense to place
  it in a separate library.
modified:
  Makefile.am
  packaging/openwrt/package/Makefile


--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk

Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to 
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription

=== modified file 'Makefile.am'
--- Makefile.am 2010-11-12 16:25:40 +0000
+++ Makefile.am 2010-11-12 16:31:19 +0000
@@ -58,7 +58,6 @@
 
 ### libraries ###
 lib_LTLIBRARIES = lib/core/libhipcore.la
-lib_LTLIBRARIES += lib/modularization/libmod.la
 
 
 ### tests ###
@@ -172,6 +171,7 @@
                                  lib/core/statistics.c      \
                                  lib/core/straddr.c         \
                                  lib/core/transform.c       \
+                                 lib/modularization/lmod.c  \
                                  lib/tool/checksum.c        \
                                  lib/tool/lutil.c           \
                                  lib/tool/nlink.c           \
@@ -182,7 +182,6 @@
 lib_core_libhipcore_la_SOURCES += lib/core/performance.c
 endif
 
-lib_modularization_libmod_la_SOURCES = lib/modularization/lmod.c
 
 check_lib_core_SOURCES =    test/check_lib_core.c          \
                             test/lib/core/hit.c            \
@@ -205,8 +204,7 @@
 
 check_lib_core_LDADD           = lib/core/libhipcore.la
 firewall_hipfw_LDADD          += lib/core/libhipcore.la
-hipd_hipd_LDADD               += lib/modularization/libmod.la \
-                                 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_dh_performance_LDADD      = lib/core/libhipcore.la

=== modified file 'packaging/openwrt/package/Makefile'
--- packaging/openwrt/package/Makefile  2010-10-29 11:31:40 +0000
+++ packaging/openwrt/package/Makefile  2010-11-12 16:31:19 +0000
@@ -97,7 +97,6 @@
 
        $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipcore.so* $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmod.so* $(1)/usr/lib/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipheartbeat.so* 
$(1)/usr/lib/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiphbupdate.so* 
$(1)/usr/lib/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipupdate.so* 
$(1)/usr/lib/

[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5149: Merge modularization library into libhipcore.

Other related posts: