[pisa-src] r1497 - in trunk: Makefile.am configure.ac test test/Makefile.am

From: Diego Biurrun <diego@xxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Mon, 02 Nov 2009 19:33:23 +0100
Author: biurrun
Date: Mon Nov  2 19:33:23 2009
New Revision: 1497

Log:
Merge test/Makefile.am into Makefile.am.
Death to recursive make: chapter VII

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

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am   Mon Nov  2 19:31:00 2009        (r1496)
+++ trunk/Makefile.am   Mon Nov  2 19:33:23 2009        (r1497)
@@ -18,7 +18,10 @@
 
 sysconf_DATA = pisacd/pisacd.conf pisasd/pisasd.conf 
pisasd/authorized_hosts.conf pisasd/users.conf
 
-bin_PROGRAMS = pisacd/pisacdconf pisasd/pisasdconf
+bin_PROGRAMS = pisacd/pisacdconf pisasd/pisasdconf \
+               test/checkhipd test/getns test/ifaddr \
+               test/udpclient test/udpserver
+
 sbin_PROGRAMS = pisabeacon/pisabeacon tools/iwlist_parser tools/msleep
 sbin_PROGRAMS += pisacd/pisacd pisasd/pisasd
 
@@ -43,6 +46,11 @@
 pisasd_pisasd_SOURCES = pisasd/sdmain.c pisasd/sdclients.c pisasd/sdconf.c 
pisasd/sdctx.c pisasd/sdderegister.c \
                         pisasd/sdheartbeat.c pisasd/sdregister.c 
pisasd/sdtun.c pisasd/pisasdconf.c pisasd/sdnat.c
 pisasd_pisasdconf_SOURCES = pisasd/pisaconftool.c pisasd/pisasdconf.c
+test_checkhipd_SOURCES  = test/checkhipd.c
+test_getns_SOURCES      = test/getns.c
+test_ifaddr_SOURCES     = test/ifaddr.c
+test_udpserver_SOURCES  = test/udpserver.c
+test_udpclient_SOURCES  = test/udpclient.c
 tools_iwlist_parser_SOURCES = tools/iwlist_parser.c
 tools_msleep_SOURCES = tools/msleep.c
 
@@ -51,11 +59,15 @@
   pisacd_pisacdconf_LDFLAGS = -Llibpisa -lpisa
   pisasd_pisasd_LDFLAGS = -Llibpisa -lpisa
   pisasd_pisasdconf_LDFLAGS = -Llibpisa -lpisa
+  test_checkhipd_LDFLAGS    = -Llibpisa -lpisa
+  test_getns_LDFLAGS        = -Llibpisa -lpisa
 else
   pisacd_pisacd_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
   pisacd_pisacdconf_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
   pisasd_pisasd_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
   pisasd_pisasdconf_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+  test_checkhipd_LDFLAGS    = @PISA_LIBPISA_LIB_STATIC@
+  test_getns_LDFLAGS        = @PISA_LIBPISA_LIB_STATIC@
 endif
 
 if PISA_PERFORMANCE
@@ -65,7 +77,7 @@
   pisacd/pisacd pisasd/pisasd: performance/libperformance.la
 endif
 
-SUBDIRS  = . community-operator pairing test
+SUBDIRS  = . community-operator pairing
 
 # 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  Mon Nov  2 19:31:00 2009        (r1496)
+++ trunk/configure.ac  Mon Nov  2 19:33:23 2009        (r1497)
@@ -163,7 +163,6 @@
 
 AC_CONFIG_FILES([
                 pairing/Makefile
-                test/Makefile
                 community-operator/Makefile
                 Makefile])
[pisa-src] r1497 - in trunk: Makefile.am configure.ac test test/Makefile.am

Other related posts:
