[pisa-src] r1545 - in trunk: Makefile.am configure.ac pairing pairing/Makefile.am

From: Diego Biurrun <diego@xxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Thu, 05 Nov 2009 15:43:34 +0100
Author: biurrun
Date: Thu Nov  5 15:43:34 2009
New Revision: 1545

Log:
Merge pairing/Makefile.am into Makefile.am.
Death to recursive make: chapter VIII

Deleted:
   trunk/pairing/Makefile.am
Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/pairing/   (props changed)

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am   Thu Nov  5 15:20:44 2009        (r1544)
+++ trunk/Makefile.am   Thu Nov  5 15:43:34 2009        (r1545)
@@ -7,6 +7,7 @@
 # For "make dist"
 EXTRA_DIST  = m4 INSTALL LICENSE docs/*.txt docs/Doxyfile
 EXTRA_DIST += libpisa/*.h
+EXTRA_DIST += pairing/*.h pairing/readme.txt pairing/defaults/*.cfg 
pairing/defaults/sha.txt
 EXTRA_DIST += performance/*.h
 EXTRA_DIST += pisacd/*.h pisacd/*.conf
 EXTRA_DIST += pisasd/*.h pisasd/*.conf
@@ -18,7 +19,8 @@
 
 sysconf_DATA = pisacd/pisacd.conf pisasd/pisasd.conf 
pisasd/authorized_hosts.conf pisasd/users.conf
 
-bin_PROGRAMS = pisacd/pisacdconf pisasd/pisasdconf \
+bin_PROGRAMS = pairing/send pairing/accept pairing/passgen pairing/management \
+               pisacd/pisacdconf pisasd/pisasdconf \
                test/checkhipd test/getns test/ifaddr \
                test/udpclient test/udpserver
 
@@ -35,6 +37,21 @@
 if PISA_LOGGING
 libpisa_libpisa_la_SOURCES += libpisa/log.c
 endif
+
+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 \
+                             $(pairing_COMMON_SRCS)
+
+pairing_accept_SOURCES     = pairing/accept.c pairing/packet_handler_accept.c \
+                             pairing/create_accept_headers.c \
+                             $(pairing_ACCEPT_SEND_SRCS)
+pairing_send_SOURCES       = pairing/send.c pairing/packet_handler_send.c \
+                             pairing/create_send_headers.c \
+                             $(pairing_ACCEPT_SEND_SRCS)
+pairing_management_SOURCES = pairing/management.c $(pairing_COMMON_SRCS)
+pairing_passgen_SOURCES    = pairing/passgen.c pairing/hash.c
+
 performance_libperformance_la_SOURCES  = performance/pisaperf.c
 pisabeacon_pisabeacon_SOURCES = pisabeacon/beaconmain.c
 pisacd_pisacd_SOURCES = pisacd/cdmain.c pisacd/cdconf.c pisacd/cdctx.c \
@@ -54,7 +71,13 @@
 tools_iwlist_parser_SOURCES = tools/iwlist_parser.c
 tools_msleep_SOURCES = tools/msleep.c
 
+pairing_send_CFLAGS = -DSEND
+pairing_accept_CFLAGS = -DACCEPT
+
 if PISA_FORCE_SHLIB
+  pairing_accept_LDFLAGS     = -Llibpisa -lpisa
+  pairing_management_LDFLAGS = -Llibpisa -lpisa
+  pairing_send_LDFLAGS       = -Llibpisa -lpisa
   pisacd_pisacd_LDFLAGS = -Llibpisa -lpisa
   pisacd_pisacdconf_LDFLAGS = -Llibpisa -lpisa
   pisasd_pisasd_LDFLAGS = -Llibpisa -lpisa
@@ -62,6 +85,9 @@
   test_checkhipd_LDFLAGS    = -Llibpisa -lpisa
   test_getns_LDFLAGS        = -Llibpisa -lpisa
 else
+  pairing_accept_LDFLAGS     = @PISA_LIBPISA_LIB_STATIC@
+  pairing_management_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+  pairing_send_LDFLAGS       = @PISA_LIBPISA_LIB_STATIC@
   pisacd_pisacd_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
   pisacd_pisacdconf_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
   pisasd_pisasd_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
@@ -77,7 +103,7 @@
   pisacd/pisacd pisasd/pisasd: performance/libperformance.la
 endif
 
-SUBDIRS  = . community-operator pairing
+SUBDIRS  = . community-operator
 
 # 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  Thu Nov  5 15:20:44 2009        (r1544)
+++ trunk/configure.ac  Thu Nov  5 15:43:34 2009        (r1545)
@@ -131,7 +131,7 @@
 else
         # HIPL generates many warnings, so we cannot enable -Werror with it.
         # FIXME: Disable -Werror until it builds with OpenWrt.
-        #AC_SUBST(AM_CFLAGS, "$AM_CFLAGS -Werror")
+        AC_SUBST(AM_CFLAGS, "$AM_CFLAGS -Werror")
        AC_MSG_WARN("HIPL source tree cannot be found. So you could encounter 
some problems when hipl-related parts of codes are executed.")
        AC_MSG_WARN("Try giving a correct path to the hipl source tree with the 
--with-hipl option. You can see usage with ./configure -h.")
        pisa_with_hipl=no
@@ -158,7 +158,6 @@
 AH_TEMPLATE([PISA_SYSCONFDIR])
 
 AC_CONFIG_FILES([
-                pairing/Makefile
                 community-operator/Makefile
                 Makefile])
[pisa-src] r1545 - in trunk: Makefile.am configure.ac pairing pairing/Makefile.am

Other related posts:
