[pisa-src] r1294 - in trunk/community-operator: Makefile.am co_client.c
- From: Jan Marten <jan.marten@xxxxxxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 22 Oct 2009 17:48:20 +0200
Author: marten
Date: Thu Oct 22 17:48:20 2009
New Revision: 1294
Log:
Copied pisa_cert.c and pisa_cert.h from HIPL source to remove the linking from
the Makefile
Modified:
trunk/community-operator/Makefile.am
trunk/community-operator/co_client.c
Modified: trunk/community-operator/Makefile.am
==============================================================================
--- trunk/community-operator/Makefile.am Thu Oct 22 17:47:23 2009
(r1293)
+++ trunk/community-operator/Makefile.am Thu Oct 22 17:48:20 2009
(r1294)
@@ -20,23 +20,17 @@
INCLUDES += -I@PISA_HIPL_SRCDIR@/libhiptool
INCLUDES += -I@PISA_HIPL_SRCDIR@/libdht
INCLUDES += -I@PISA_HIPL_SRCDIR@/opendht
-INCLUDES += -I@PISA_HIPL_SRCDIR@/firewall
INCLUDES += -I@PISA_HIPL_SRCDIR@/hipd
INCLUDES += -I@PISA_HIPL_SRCDIR@/i3/i3_client
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
co_server_LDADD = @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
co_server_LDADD += @PISA_HIPL_SRCDIR@/libhiptool/.libs/libhiptool.a
-# TODO correct linking
-# pisa_split_cert function is needed in co_client.c
-# Do not know any better way so far.
- co_client_LDADD = @PISA_HIPL_SRCDIR@/firewall/pisa_cert.o
-endif
-
-co_client_SOURCES = co_client.c
+co_client_SOURCES = co_client.c pisa_cert.c
co_server_SOURCES = co_server.c hipl.c
include_HEADERS = hipl.h co_common_packets.h
Modified: trunk/community-operator/co_client.c
==============================================================================
--- trunk/community-operator/co_client.c Thu Oct 22 17:47:23 2009
(r1293)
+++ trunk/community-operator/co_client.c Thu Oct 22 17:48:20 2009
(r1294)
@@ -19,9 +19,7 @@
#include "cfg.h"
#include "debug.h"
-#ifdef CONFIG_PISA_WITH_HIPL
-# include "pisa_cert.h" /* in firewall under the hipl source tree */
-#endif /* CONFIG_PISA_WITH_HIPL */
+#include "pisa_cert.h" // Copied from HIPL firewall directory
#define CERT_FILENAME_FORMAT "%Y%m%d%H%M%S"
Other related posts: