[hipl-commit] [trunk] Rev 4150: Remove some redundant Makefile conditionals.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 7 Apr 2010 16:38:51 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 07/04/2010 at 16:38:51
Revision: 4150
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Remove some redundant Makefile conditionals.
  
  It is not necessary to conditionally declare _LDADD variables when
  the same condition already checks if those components are built or not.

Modified:
  M  Makefile.am

=== modified file 'Makefile.am'
--- Makefile.am 2010-04-07 13:18:17 +0000
+++ Makefile.am 2010-04-07 13:36:38 +0000
@@ -436,8 +436,6 @@
 test_hashtest_LDADD += lib/performance/libperformance.la
 endif
 
-
-if HIP_DHT
 test_dhtteststub_LDADD = lib/dht/libhipdht.la \
                          lib/core/libhipcore.la \
                          lib/tool/libhiptool.la
@@ -445,7 +443,6 @@
 if HIP_PERFORMANCE
 test_dhtteststub_LDADD += lib/performance/libperformance.la
 endif
-endif # HIP_DHT
 
 test_certteststub_LDADD = lib/core/libhipcore.la \
                           lib/tool/libhiptool.la
@@ -523,7 +520,6 @@
 hipd_hipd_LDADD += lib/ipsec/libhipsec.la
 endif
 
-if HIP_FIREWALL
 firewall_hipfw_LDADD = lib/core/libhipcore.la \
                        lib/tool/libhiptool.la
 
@@ -531,9 +527,6 @@
 firewall_hipfw_LDADD += lib/performance/libperformance.la
 endif
 
-endif # HIP_FIREWALL
-
-if HIP_AGENT
 # hard dependencies: libhipgui, libhipcore
 # TODO fix dependency between libhipgui and libhipconf if possible
 # TODO fix dependency between libhipcore and libhipconf if possible
@@ -558,13 +551,10 @@
 agent_hipagent_LDFLAGS = $(GTKLDADD)     \
                          $(GTHREADLDADD) \
                          $(GOBJECTLDADD)
-endif #HIP_AGENT
 
-if HIP_I3
 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
-endif # HIP_I3
 
 CLEANFILES = tools/hipdnsproxy tools/hipdnskeyparse

Other related posts:

  • » [hipl-commit] [trunk] Rev 4150: Remove some redundant Makefile conditionals. - Diego Biurrun