[pisa-src] Re: r1032 - in trunk: . pisabeacon
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 06 Oct 2009 22:06:12 +0200
On Tue, Oct 06, 2009 at 09:18:20PM +0200, Tobias Heer wrote:
>
> Log:
> Added a sender/receiver component for testing the beaconing functionality.
> Functionality and code maturity are far from perfect.
Hmmm, looks like you did not doublecheck the diff before committing..
> --- trunk/Makefile.am Tue Oct 6 20:31:25 2009 (r1031)
> +++ trunk/Makefile.am Tue Oct 6 21:18:19 2009 (r1032)
> @@ -5,6 +5,8 @@
>
> +PACKAGING_SCRIPT=test/packaging/create-package.sh
> +
> # For "make dist"
> @@ -13,39 +15,11 @@
> EXTRA_DIST += tools/writeff.pl tools/tunnel/screamer.rb
> EXTRA_DIST += tools/tunnel/seteth1address
>
> -SUBDIRS = libpisa pairing performance pisacd pisand pisasd test
> +SUBDIRS = include libpisa performance pisacd pisand pairing pisasd test
> pisabeacon
> SUBDIRS += community-operator # has to be enabled for compilation on openwrt
>
> -pisaincludedir=$(includedir)
> -pisainclude_HEADERS= \
> - include/ac_config.h \
> - include/arp.h \
> - include/buffer.h \
> - include/checksum.h \
> - include/config.h \
> - include/conmgr.h \
> - include/crypto.h \
> - include/ctrlhandler.h \
> - include/debug.h \
> - include/dhcp.h \
> - include/global.h \
> - include/hitlist.h \
> - include/iwlib.h \
> - include/linkedlist.h \
> - include/log.h \
> - include/nat.h \
> - include/packet.h \
> - include/pisacd.h \
> - include/pisaconf.h \
> - include/pisand.h \
> - include/pisaperf.h \
> - include/pisasd.h \
> - include/socket.h \
> - include/token.h \
> - include/tunnel.h \
> - include/uthash.h \
> - include/util.h \
> - include/wireless.h
> +rpm:
> + ${PACKAGING_SCRIPT} rpm
>
> -deb rpm:
> - test/packaging/create-package.sh $@
> +deb:
> + ${PACKAGING_SCRIPT} deb
This reverts r1023 and r1024. At least 'make dist' will now be broken.
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ trunk/pisabeacon/Makefile.am Tue Oct 6 21:18:19 2009 (r1032)
> @@ -0,0 +1,25 @@
> +
> +INCLUDES = -I$(top_srcdir)/include
That path should not be hardcoded, see r1028:
+INCLUDES = -I$(PISA_COMMON_INCLUDES)
> +#bin_PROGRAMS =
> +#EXTRA_DIST = pisacd.conf
> +#sysconf_DATA = pisacd.conf
> +#include_HEADERS =
debug junk?
> +#sysconfdir = /etc/pisa
This is bad, it reintroduces the bug I just tried to fix: Configuration
file paths must not be hardcoded but set by configure.
Recursive make must be eliminated in PISA. It just leads to bugs
getting copypasted around. I'll get to it.
Diego
Other related posts:
