[hipl-commit] [trunk] Rev 4201: Consistently link all i3 programs against libchord.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 9 Apr 2010 12:21:28 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 09/04/2010 at 12:21:28
Revision: 4201
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Consistently link all i3 programs against libchord.
  
  Some programs were being linked against the convenience lib, for others the
  sources of the convenience lib were declared as sources. Consistently
  handling this in only one way simplifies the build system.

Modified:
  M  Makefile.am

=== modified file 'Makefile.am'
--- Makefile.am 2010-04-09 09:12:32 +0000
+++ Makefile.am 2010-04-09 09:19:59 +0000
@@ -301,16 +301,6 @@
                               i3/utils/gen_utils.c
 
 
-i3_chord_chord_getfingers_SOURCES = i3/chord/chord_getfingers.c   \
-                                    ${i3_chord_libchord_a_SOURCES}
-
-i3_chord_chord_traceroute_SOURCES = i3/chord/chord_traceroute.c   \
-                                    ${i3_chord_libchord_a_SOURCES}
-
-i3_chord_gen_conf_SOURCES      = i3/chord/gen_conf.c
-i3_chord_gen_conf_same_SOURCES = i3/chord/gen_conf_same.c
-i3_chord_test_SOURCES          = i3/chord/test.c
-
 i3_i3_libi3_a_SOURCES = i3/i3/i3_addr.c     \
                         i3/i3/i3_api.c      \
                         i3/i3/i3_config.c   \
@@ -350,6 +340,12 @@
                               i3/utils/inetfns.c        \
                               i3/utils/netwrap_posix.c
 
+i3_chord_chord_getfingers_SOURCES = i3/chord/chord_getfingers.c
+i3_chord_chord_traceroute_SOURCES = i3/chord/chord_traceroute.c
+i3_chord_gen_conf_SOURCES         = i3/chord/gen_conf.c
+i3_chord_gen_conf_same_SOURCES    = i3/chord/gen_conf_same.c
+i3_chord_test_SOURCES             = i3/chord/test.c
+
 ############################ NOTE ##################################
 #
 # Note: when you upgrade this library, please do the following:
@@ -436,9 +432,11 @@
 
 agent_hipagent_LDFLAGS = `pkg-config --libs gtk+-2.0 gthread-2.0`
 
-i3_chord_gen_conf_LDADD       = i3/chord/libchord.a
-i3_chord_gen_conf_same_LDADD  = i3/chord/libchord.a
-i3_chord_test_LDADD           = i3/chord/libchord.a
+i3_chord_chord_getfingers_LDADD = i3/chord/libchord.a
+i3_chord_chord_traceroute_LDADD = i3/chord/libchord.a
+i3_chord_gen_conf_LDADD         = i3/chord/libchord.a
+i3_chord_gen_conf_same_LDADD    = i3/chord/libchord.a
+i3_chord_test_LDADD             = i3/chord/libchord.a
 
 CLEANFILES = tools/hipdnsproxy tools/hipdnskeyparse

Other related posts:

  • » [hipl-commit] [trunk] Rev 4201: Consistently link all i3 programs against libchord. - Diego Biurrun