[pisa-src] r1290 - trunk/community-operator/Makefile.am

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Thu, 22 Oct 2009 16:25:28 +0200

Author: biurrun
Date: Thu Oct 22 16:25:28 2009
New Revision: 1290

Log:
Merge three conditional blocks into one.

Modified:
   trunk/community-operator/Makefile.am

Modified: trunk/community-operator/Makefile.am
==============================================================================
--- trunk/community-operator/Makefile.am        Thu Oct 22 16:16:18 2009        
(r1289)
+++ trunk/community-operator/Makefile.am        Thu Oct 22 16:25:28 2009        
(r1290)
@@ -24,15 +24,10 @@
 INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjnath/include
 INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib/include
 INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib-util/include
-endif
 
-if PISA_WITH_HIPL
 co_server_LDADD  = @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
 co_server_LDADD += @PISA_HIPL_SRCDIR@/libhiptool/.libs/libhiptool.a
-endif
-co_server_SOURCES = co_server.c hipl.c
 
-if PISA_WITH_HIPL
 # TODO correct linking
 # pisa_split_cert function is needed in co_client.c
 # Do not know any better way so far.
@@ -40,5 +35,6 @@
 endif
 
 co_client_SOURCES = co_client.c
+co_server_SOURCES = co_server.c hipl.c
 
 include_HEADERS = hipl.h co_common_packets.h

Other related posts:

  • » [pisa-src] r1290 - trunk/community-operator/Makefile.am - Diego Biurrun