[pisa-src] r1484 - in trunk: Makefile.am configure.ac pisacd pisacd/Makefile.am
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Mon, 02 Nov 2009 15:13:30 +0100
Author: biurrun
Date: Mon Nov 2 15:13:30 2009
New Revision: 1484
Log:
Merge pisacd/Makefile.am into Makefile.am.
Death to recursive make: chapter VI
Deleted:
trunk/pisacd/Makefile.am
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/pisacd/ (props changed)
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Mon Nov 2 14:49:16 2009 (r1483)
+++ trunk/Makefile.am Mon Nov 2 15:13:30 2009 (r1484)
@@ -10,6 +10,7 @@
EXTRA_DIST += docs/architecture.txt docs/config.txt docs/packettype.txt
EXTRA_DIST += libpisa/*.h
EXTRA_DIST += performance/*.h
+EXTRA_DIST += pisacd/pisacd.conf pisacd/*.h
EXTRA_DIST += pisasd/pisasd.conf pisasd/authorized_hosts.conf
pisasd/users.conf pisasd/*.h
EXTRA_DIST += tools/caphip tools/delroute
EXTRA_DIST += tools/NokiaN810_BEX_Perf.sh tools/switch-ip
@@ -26,11 +27,11 @@
EXTRA_DIST += tools/packaging/rh-init.d-pisacd
EXTRA_DIST += tools/packaging/rh-init.d-pisasd
-sysconf_DATA = pisasd/pisasd.conf pisasd/authorized_hosts.conf
pisasd/users.conf
+sysconf_DATA = pisacd/pisacd.conf pisasd/pisasd.conf
pisasd/authorized_hosts.conf pisasd/users.conf
-bin_PROGRAMS = pisasd/pisasdconf
+bin_PROGRAMS = pisacd/pisacdconf pisasd/pisasdconf
sbin_PROGRAMS = pisabeacon/pisabeacon tools/iwlist_parser tools/msleep
-sbin_PROGRAMS += pisasd/pisasd
+sbin_PROGRAMS += pisacd/pisacd pisasd/pisasd
lib_LTLIBRARIES = libpisa/libpisa.la performance/libperformance.la
@@ -44,6 +45,12 @@
endif
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 \
+ pisacd/cdderegister.c pisacd/cdheartbeat.c \
+ pisacd/cdpending.c pisacd/cdregister.c \
+ pisacd/cdservers.c pisacd/cdtimeout.c pisacd/cdtun.c \
+ pisacd/pisacdconf.c pisacd/cdconfhandlers.c
+pisacd_pisacdconf_SOURCES = pisacd/pisaconftool.c pisacd/pisacdconf.c
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
@@ -51,21 +58,26 @@
tools_msleep_SOURCES = tools/msleep.c
if PISA_FORCE_SHLIB
+ pisacd_pisacd_LDFLAGS = -Llibpisa -lpisa
+ pisacd_pisacdconf_LDFLAGS = -Llibpisa -lpisa
pisasd_pisasd_LDFLAGS = -Llibpisa -lpisa
pisasd_pisasdconf_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@
endif
if PISA_PERFORMANCE
+ pisacd_pisacd_LDFLAGS += @PISA_PERFORMANCE_LIB_STATIC@
pisasd_pisasd_LDFLAGS += @PISA_PERFORMANCE_LIB_STATIC@
endif
-SUBDIRS = . pairing pisacd test
+SUBDIRS = . pairing test
SUBDIRS += community-operator # has to be enabled for compilation on openwrt
-pisasd/pisasd pisasd/pisasdconf: libpisa/libpisa.la
+pisacd/pisacd pisacd/pisacdconf pisasd/pisasd pisasd/pisasdconf:
libpisa/libpisa.la
deb rpm:
tools/packaging/create-package.sh $@
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Mon Nov 2 14:49:16 2009 (r1483)
+++ trunk/configure.ac Mon Nov 2 15:13:30 2009 (r1484)
@@ -162,7 +162,6 @@
AH_TEMPLATE([PISA_SYSCONFDIR])
AC_CONFIG_FILES([
- pisacd/Makefile
pairing/Makefile
test/Makefile
community-operator/Makefile
Other related posts:
- » [pisa-src] r1484 - in trunk: Makefile.am configure.ac pisacd pisacd/Makefile.am - Diego Biurrun
