[hipl-commit] [tiny] Rev 3741: Moved LDADD's for modules to the Makefile.am's.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 30 Mar 2010 11:46:34 +0300

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: 30/03/2010 at 11:46:34
Revision: 3741
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Moved LDADD's for modules to the Makefile.am's.
  
  Since the compile type option is gone, the link command can be placed
  in the Makefile.am. The module-Makefile.am's are only included, if the
  module is enabled.

Modified:
  M  modules/heartbeat/Makefile.am
  M  modules/heartbeat/module_info.xml
  M  modules/heartbeat_update/Makefile.am
  M  modules/heartbeat_update/module_info.xml
  M  modules/update/Makefile.am
  M  modules/update/module_info.xml
  M  process_modules.py

=== modified file 'modules/heartbeat/Makefile.am'
--- modules/heartbeat/Makefile.am       2010-03-08 15:47:13 +0000
+++ modules/heartbeat/Makefile.am       2010-03-30 08:44:33 +0000
@@ -1,2 +1,5 @@
 lib_LTLIBRARIES += modules/heartbeat/hipd/libhipheartbeat.la
+
 modules_heartbeat_hipd_libhipheartbeat_la_SOURCES = 
modules/heartbeat/hipd/heartbeat.c
+
+hipd_hipd_LDADD += modules/heartbeat/hipd/libhipheartbeat.la

=== modified file 'modules/heartbeat/module_info.xml'
--- modules/heartbeat/module_info.xml   2010-03-25 13:50:28 +0000
+++ modules/heartbeat/module_info.xml   2010-03-30 08:44:33 +0000
@@ -9,10 +9,9 @@
     bugaddress="hipl-users@xxxxxxxxxxxxx"
     webpage="http://infrahip.hiit.fi/";>
     
-    <!-- Mandatory: name, header_file, init_function, linkcommand -->
+    <!-- Mandatory: name, header_file, init_function -->
     <application
         name="hipd"
         header_file="modules/heartbeat/hipd/heartbeat.h"
-        init_function="hip_heartbeat_init"
-        linkcommand="hipd_hipd_LDADD += 
modules/heartbeat/hipd/libhipheartbeat.la" />
+        init_function="hip_heartbeat_init" />
 </module>

=== modified file 'modules/heartbeat_update/Makefile.am'
--- modules/heartbeat_update/Makefile.am        2010-03-25 13:50:28 +0000
+++ modules/heartbeat_update/Makefile.am        2010-03-30 08:44:33 +0000
@@ -1,2 +1,5 @@
 lib_LTLIBRARIES += modules/heartbeat_update/hipd/libhiphbupdate.la
+
 modules_heartbeat_update_hipd_libhiphbupdate_la_SOURCES = 
modules/heartbeat_update/hipd/hb_update.c
+
+hipd_hipd_LDADD += modules/heartbeat_update/hipd/libhiphbupdate.la

=== modified file 'modules/heartbeat_update/module_info.xml'
--- modules/heartbeat_update/module_info.xml    2010-03-25 13:50:28 +0000
+++ modules/heartbeat_update/module_info.xml    2010-03-30 08:44:33 +0000
@@ -14,11 +14,10 @@
         <module name="update" minversion="0.0.1" />
     </requires>
 
-    <!-- Mandatory: name, header_file, init_function, linkcommand -->
+    <!-- Mandatory: name, header_file, init_function -->
     <application
         name="hipd"
         header_file="modules/heartbeat_update/hipd/hb_update.h"
-        init_function="hip_hb_update_init"
-        linkcommand="hipd_hipd_LDADD += 
modules/heartbeat_update/hipd/libhiphbupdate.la" />
+        init_function="hip_hb_update_init" />
 </module>
 

=== modified file 'modules/update/Makefile.am'
--- modules/update/Makefile.am  2010-02-18 10:31:28 +0000
+++ modules/update/Makefile.am  2010-03-30 08:44:33 +0000
@@ -1,3 +1,6 @@
 lib_LTLIBRARIES += modules/update/hipd/libhipupdate.la
+
 modules_update_hipd_libhipupdate_la_SOURCES = modules/update/hipd/update.c \
                                               
modules/update/hipd/update_legacy.c
+
+hipd_hipd_LDADD += modules/update/hipd/libhipupdate.la

=== modified file 'modules/update/module_info.xml'
--- modules/update/module_info.xml      2010-02-18 09:35:10 +0000
+++ modules/update/module_info.xml      2010-03-30 08:44:33 +0000
@@ -9,11 +9,10 @@
     bugaddress="hipl-users@xxxxxxxxxxxxx"
     webpage="http://infrahip.hiit.fi/";>
 
-    <!-- Mandatory: name, header_file, init_function, linkcommand -->
+    <!-- Mandatory: name, header_file, init_function -->
     <application
         name="hipd"
         header_file="modules/update/hipd/update.h"
-        init_function="hip_update_init"
-        linkcommand="hipd_hipd_LDADD += modules/update/hipd/libhipupdate.la" />
+        init_function="hip_update_init" />
 </module>
 

=== modified file 'process_modules.py'
--- process_modules.py  2010-03-30 08:38:36 +0000
+++ process_modules.py  2010-03-30 08:44:33 +0000
@@ -64,7 +64,6 @@
         applications.add(name)
         app_info['header_file'] = 
str(current_app.attributes['header_file'].value)
         app_info['init_function'] = 
str(current_app.attributes['init_function'].value)
-        app_info['linkcommand'] = 
str(current_app.attributes['linkcommand'].value)
         module_info['application'][name] = app_info
 
     return (applications, module_name, module_info, required_modules)
@@ -266,12 +265,6 @@
         makefile_modules.write('include ' + path + '\n')
 
     makefile_modules.write('\n')
-    # Write linker commands to Makefile.modules
-    for current_module in enabled_modules:
-        for current_app in module_info[current_module]['application']:
-            linkcommand = 
module_info[current_module]['application'][current_app]['linkcommand']
-            makefile_modules.write(linkcommand + '\n')
-
     makefile_modules.close()
     print '|    created file: ' + file_path

Other related posts:

  • » [hipl-commit] [tiny] Rev 3741: Moved LDADD's for modules to the Makefile.am's. - Tim Just