[pisa-src] r1127 - in trunk: . pisabeacon
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 13 Oct 2009 17:36:20 +0200
Author: biurrun
Date: Tue Oct 13 17:36:20 2009
New Revision: 1127
Log:
Merge pisabeacon/Makefile.am into Makefile.am.
Death to recursive make: chapter II
Deleted:
trunk/pisabeacon/Makefile.am
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/pisabeacon/ (props changed)
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Tue Oct 13 17:30:57 2009 (r1126)
+++ trunk/Makefile.am Tue Oct 13 17:36:20 2009 (r1127)
@@ -17,11 +17,13 @@
CFLAGS += -Wall -g
-sbin_PROGRAMS = tools/iwlist_parser tools/msleep
+sbin_PROGRAMS = pisabeacon/pisabeacon tools/iwlist_parser tools/msleep
+
+pisabeacon_pisabeacon_SOURCES = pisabeacon/beaconmain.c
tools_iwlist_parser_SOURCES = tools/iwlist_parser.c
tools_msleep_SOURCES = tools/msleep.c
-SUBDIRS = libpisa pairing performance pisacd pisand pisasd test pisabeacon
+SUBDIRS = libpisa pairing performance pisacd pisand pisasd test
SUBDIRS += community-operator # has to be enabled for compilation on openwrt
pisaincludedir=$(includedir)
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Tue Oct 13 17:30:57 2009 (r1126)
+++ trunk/configure.ac Tue Oct 13 17:36:20 2009 (r1127)
@@ -175,10 +175,6 @@
AC_SUBST(PISA_PISAND_INCLUDES, "$PISA_PISAND")
AC_SUBST(PISA_PISASD, "$TOPSRC/pisasd")
AC_SUBST(PISA_PISASD_INCLUDES, "$PISA_PISASD")
-AC_SUBST(PISA_PISABEACON, "$TOPSRC/pisabeacon")
-AC_SUBST(PISA_PISABEACON_INCLUDES, "$PISA_PISABEACON")
-
-
AC_SUBST(PISA_PERFORMANCE, "$TOPSRC/performance")
AC_SUBST(PISA_PERFORMANCE_INCLUDES, "$PISA_PERFORMANCE")
@@ -203,7 +199,6 @@
libpisa/Makefile
pisacd/Makefile
pisand/Makefile
- pisabeacon/Makefile
pairing/Makefile
pisasd/Makefile
test/Makefile
Other related posts:
- » [pisa-src] r1127 - in trunk: . pisabeacon - Diego Biurrun
