[pisa-src] r1549 - in trunk: Makefile.am community-operator community-operator/Makefile.am configure.ac
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Fri, 06 Nov 2009 13:37:34 +0100
Author: biurrun
Date: Fri Nov 6 13:37:33 2009
New Revision: 1549
Log:
Merge community-operator/Makefile.am into Makefile.am.
Death to recursive make: chapter IX
Deleted:
trunk/community-operator/Makefile.am
Modified:
trunk/Makefile.am
trunk/community-operator/ (props changed)
trunk/configure.ac
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Fri Nov 6 12:26:29 2009 (r1548)
+++ trunk/Makefile.am Fri Nov 6 13:37:33 2009 (r1549)
@@ -6,6 +6,7 @@
# For "make dist"
EXTRA_DIST = m4 INSTALL LICENSE docs/*.txt docs/Doxyfile
+EXTRA_DIST += community-operator/*.h
EXTRA_DIST += libpisa/*.h
EXTRA_DIST += pairing/*.h pairing/readme.txt pairing/defaults/*.cfg
pairing/defaults/sha.txt
EXTRA_DIST += performance/*.h
@@ -19,7 +20,8 @@
sysconf_DATA = pisacd/pisacd.conf pisasd/pisasd.conf
pisasd/authorized_hosts.conf pisasd/users.conf
-bin_PROGRAMS = pairing/send pairing/accept pairing/passgen pairing/management \
+bin_PROGRAMS = community-operator/co_client \
+ pairing/send pairing/accept pairing/passgen pairing/management \
pisacd/pisacdconf pisasd/pisasdconf \
test/checkhipd test/getns test/ifaddr \
test/udpclient test/udpserver
@@ -38,6 +40,11 @@
libpisa_libpisa_la_SOURCES += libpisa/log.c
endif
+community_operator_co_client_SOURCES = community-operator/co_client.c \
+ community-operator/pisa_cert.c
+community_operator_co_server_SOURCES = community-operator/co_server.c \
+ community-operator/hipl.c
+
pairing_COMMON_SRCS = pairing/common.c pairing/common_headers.c \
pairing/libconfig_wrapper.c
pairing_ACCEPT_SEND_SRCS = pairing/hash.c pairing/packet_handler.c \
@@ -75,6 +82,8 @@
pairing_accept_CFLAGS = -DACCEPT
if PISA_FORCE_SHLIB
+ community_operator_co_client_LDFLAGS = -Llibpisa -lpisa
+ community_operator_co_server_LDFLAGS = -Llibpisa -lpisa
pairing_accept_LDFLAGS = -Llibpisa -lpisa
pairing_management_LDFLAGS = -Llibpisa -lpisa
pairing_send_LDFLAGS = -Llibpisa -lpisa
@@ -85,6 +94,8 @@
test_checkhipd_LDFLAGS = -Llibpisa -lpisa
test_getns_LDFLAGS = -Llibpisa -lpisa
else
+ community_operator_co_client_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+ community_operator_co_server_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
pairing_accept_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
pairing_management_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
pairing_send_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
@@ -103,7 +114,26 @@
pisacd/pisacd pisasd/pisasd: performance/libperformance.la
endif
-SUBDIRS = . community-operator
+if PISA_WITH_HIPL
+bin_PROGRAMS += community-operator/co_server
+community_operator_co_server_LDFLAGS += -lm
+
+# Ugly hacks due to dependencies on internal HIPL stuff.
+community_operator_co_server_CPPFLAGS = -I@PISA_HIPL_SRCDIR@
+community_operator_co_server_CPPFLAGS += -I@PISA_HIPL_SRCDIR@/libinet6/include
+community_operator_co_server_CPPFLAGS += -I@PISA_HIPL_SRCDIR@/libinet6
+community_operator_co_server_CPPFLAGS += -I@PISA_HIPL_SRCDIR@/libhiptool
+community_operator_co_server_CPPFLAGS += -I@PISA_HIPL_SRCDIR@/libdht
+community_operator_co_server_CPPFLAGS += -I@PISA_HIPL_SRCDIR@/opendht
+community_operator_co_server_CPPFLAGS += -I@PISA_HIPL_SRCDIR@/hipd
+community_operator_co_server_CPPFLAGS += -I@PISA_HIPL_SRCDIR@/i3/i3_client
+community_operator_co_server_CPPFLAGS +=
-I@PISA_HIPL_SRCDIR@/pjproject/pjnath/include
+community_operator_co_server_CPPFLAGS +=
-I@PISA_HIPL_SRCDIR@/pjproject/pjlib/include
+community_operator_co_server_CPPFLAGS +=
-I@PISA_HIPL_SRCDIR@/pjproject/pjlib-util/include
+endif
+
+community_operator_co_server_LDADD =
@PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
+community_operator_co_server_LDADD +=
@PISA_HIPL_SRCDIR@/libhiptool/.libs/libhiptool.a
# Make sure that libpisa is built first. The dependency is partially fake,
# but should do no harm apart from potentially slowing down parallel builds.
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Fri Nov 6 12:26:29 2009 (r1548)
+++ trunk/configure.ac Fri Nov 6 13:37:33 2009 (r1549)
@@ -157,8 +157,6 @@
AC_DEFINE_UNQUOTED(PISA_SYSCONFDIR, "$(eval echo $sysconfdir)")
AH_TEMPLATE([PISA_SYSCONFDIR])
-AC_CONFIG_FILES([
- community-operator/Makefile
- Makefile])
+AC_CONFIG_FILES([Makefile])
AC_OUTPUT
Other related posts:
