[pisa-src] r1392 - in trunk: Makefile.am configure.ac libpisa libpisa/Makefile.am
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 29 Oct 2009 11:39:01 +0100
Author: biurrun
Date: Thu Oct 29 11:39:01 2009
New Revision: 1392
Log:
Merge libpisa/Makefile.am into Makefile.am.
Death to recursive make: chapter IV
Deleted:
trunk/libpisa/Makefile.am
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/libpisa/ (props changed)
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Wed Oct 28 16:38:21 2009 (r1391)
+++ trunk/Makefile.am Thu Oct 29 11:39:01 2009 (r1392)
@@ -18,13 +18,22 @@
sbin_PROGRAMS = pisabeacon/pisabeacon tools/iwlist_parser tools/msleep
-lib_LTLIBRARIES = performance/libperformance.la
+lib_LTLIBRARIES = libpisa/libpisa.la performance/libperformance.la
+
+libpisa_libpisa_la_SOURCES = libpisa/arp.c libpisa/config.c libpisa/conmgr.c \
+ libpisa/crypto.c libpisa/ctrlhandler.c \
+ libpisa/debug.c libpisa/hitlist.c libpisa/nat.c \
+ libpisa/packet.c libpisa/tunnel.c libpisa/util.c
\
+ libpisa/pisaconf.c libpisa/scheduler.c
+if PISA_LOGGING
+libpisa_libpisa_la_SOURCES += libpisa/log.c
+endif
performance_libperformance_la_SOURCES = performance/pisaperf.c
pisabeacon_pisabeacon_SOURCES = pisabeacon/beaconmain.c
tools_iwlist_parser_SOURCES = tools/iwlist_parser.c
tools_msleep_SOURCES = tools/msleep.c
-SUBDIRS = . libpisa pairing pisacd pisasd test
+SUBDIRS = . pairing pisacd pisasd test
SUBDIRS += community-operator # has to be enabled for compilation on openwrt
deb rpm:
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Wed Oct 28 16:38:21 2009 (r1391)
+++ trunk/configure.ac Thu Oct 29 11:39:01 2009 (r1392)
@@ -162,7 +162,6 @@
AH_TEMPLATE([PISA_SYSCONFDIR])
AC_CONFIG_FILES([
- libpisa/Makefile
pisacd/Makefile
pairing/Makefile
pisasd/Makefile
Other related posts:
- » [pisa-src] r1392 - in trunk: Makefile.am configure.ac libpisa libpisa/Makefile.am - Diego Biurrun
