[pisa-src] r1110 - in trunk: . tools
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 13 Oct 2009 15:02:51 +0200
Author: biurrun
Date: Tue Oct 13 15:02:50 2009
New Revision: 1110
Log:
Merge tools/Makefile.am into Makefile.am.
Death to recursive make: chapter I
Deleted:
trunk/tools/Makefile.am
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/tools/ (props changed)
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Tue Oct 13 14:56:23 2009 (r1109)
+++ trunk/Makefile.am Tue Oct 13 15:02:50 2009 (r1110)
@@ -13,7 +13,12 @@
EXTRA_DIST += tools/writeff.pl tools/tunnel/screamer.rb
EXTRA_DIST += tools/tunnel/seteth1address
-SUBDIRS = libpisa pairing performance pisacd pisand pisasd test pisabeacon
tools
+CFLAGS += -Wall -g
+
+sbin_PROGRAMS = tools/msleep
+tools_msleep_SOURCES = tools/msleep.c
+
+SUBDIRS = libpisa pairing performance pisacd pisand pisasd test pisabeacon
SUBDIRS += community-operator # has to be enabled for compilation on openwrt
pisaincludedir=$(includedir)
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Tue Oct 13 14:56:23 2009 (r1109)
+++ trunk/configure.ac Tue Oct 13 15:02:50 2009 (r1110)
@@ -177,8 +177,6 @@
AC_SUBST(PISA_PISASD_INCLUDES, "$PISA_PISASD")
AC_SUBST(PISA_PISABEACON, "$TOPSRC/pisabeacon")
AC_SUBST(PISA_PISABEACON_INCLUDES, "$PISA_PISABEACON")
-AC_SUBST(PISA_TOOLS, "$TOPSRC/tools")
-AC_SUBST(PISA_TOOLS_INCLUDES, "$PISA_TOOLS")
@@ -211,7 +209,6 @@
test/Makefile
community-operator/Makefile
performance/Makefile
- tools/Makefile
Makefile])
AC_OUTPUT
Other related posts:
- » [pisa-src] r1110 - in trunk: . tools - Diego Biurrun
