[pisa-src] r1552 - trunk/Makefile.am
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Fri, 06 Nov 2009 15:22:00 +0100
Author: biurrun
Date: Fri Nov 6 15:22:00 2009
New Revision: 1552
Log:
whitespace cosmetics: List one source file per line, some prettyprinting.
Modified:
trunk/Makefile.am
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Fri Nov 6 14:58:43 2009 (r1551)
+++ trunk/Makefile.am Fri Nov 6 15:22:00 2009 (r1552)
@@ -2,109 +2,180 @@
# All rights reserved.
AUTOMAKE_OPTIONS = subdir-objects
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
# For "make dist"
-EXTRA_DIST = INSTALL LICENSE docs/*.txt docs/Doxyfile
-EXTRA_DIST += community-operator/*.h
-EXTRA_DIST += libpisa/*.h
-EXTRA_DIST += pairing/*.h pairing/readme.txt pairing/defaults/*
-EXTRA_DIST += performance/*.h
-EXTRA_DIST += pisacd/*.h pisacd/*.conf
-EXTRA_DIST += pisasd/*.h pisasd/*.conf
-EXTRA_DIST += tools/*.sh tools/packaging/*.sh tools/tunnel/*.sh
-EXTRA_DIST += tools/writeff.pl tools/tunnel/screamer.rb
-EXTRA_DIST += tools/packaging/debbuild
-EXTRA_DIST += tools/packaging/*-init.d-*
-EXTRA_DIST += tools/packaging/pisa-*.spec
-
-sysconf_DATA = pisacd/pisacd.conf pisasd/pisasd.conf
pisasd/authorized_hosts.conf pisasd/users.conf
+EXTRA_DIST = INSTALL \
+ LICENSE \
+ community-operator/*.h \
+ docs/*.txt \
+ docs/Doxyfile \
+ libpisa/*.h \
+ pairing/*.h \
+ pairing/readme.txt \
+ pairing/defaults/* \
+ performance/*.h \
+ pisacd/*.conf \
+ pisacd/*.h \
+ pisasd/*.conf \
+ pisasd/*.h \
+ tools/*.sh \
+ tools/packaging/*.sh \
+ tools/packaging/*-init.d-* \
+ tools/packaging/debbuild \
+ tools/packaging/pisa-*.spec \
+ tools/tunnel/*.sh \
+ tools/writeff.pl \
+ tools/tunnel/screamer.rb
+
+sysconf_DATA = pisacd/pisacd.conf \
+ pisasd/pisasd.conf \
+ pisasd/authorized_hosts.conf \
+ pisasd/users.conf
bin_PROGRAMS = community-operator/co_client \
- pairing/send pairing/accept pairing/passgen pairing/management \
- pisacd/pisacdconf pisasd/pisasdconf \
- test/checkhipd test/getns test/ifaddr \
- test/udpclient test/udpserver
-
-sbin_PROGRAMS = pisabeacon/pisabeacon tools/iwlist_parser tools/msleep
-sbin_PROGRAMS += pisacd/pisacd pisasd/pisasd
+ pairing/accept \
+ pairing/management \
+ pairing/passgen \
+ pairing/send \
+ pisacd/pisacdconf \
+ pisasd/pisasdconf \
+ test/checkhipd \
+ test/getns \
+ test/ifaddr \
+ test/udpclient \
+ test/udpserver
+
+sbin_PROGRAMS = pisabeacon/pisabeacon \
+ pisacd/pisacd \
+ pisasd/pisasd \
+ tools/iwlist_parser \
+ tools/msleep
lib_LTLIBRARIES = libpisa/libpisa.la
-libpisa_libpisa_la_SOURCES = libpisa/arp.c libpisa/cfg.c libpisa/conmgr.c \
+libpisa_libpisa_la_SOURCES = libpisa/arp.c \
+ libpisa/cfg.c \
+ libpisa/conmgr.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
+ libpisa/debug.c \
+ libpisa/hitlist.c \
+ libpisa/nat.c \
+ libpisa/packet.c \
+ libpisa/pisaconf.c \
+ libpisa/scheduler.c \
+ libpisa/tunnel.c \
+ libpisa/util.c
+
if PISA_LOGGING
libpisa_libpisa_la_SOURCES += libpisa/log.c
endif
community_operator_co_client_SOURCES = community-operator/co_client.c \
community-operator/pisa_cert.c
+
community_operator_co_server_SOURCES = community-operator/co_server.c \
community-operator/hipl.c
-pairing_COMMON_SRCS = pairing/common.c pairing/common_headers.c \
+pairing_COMMON_SRCS = pairing/common.c \
+ pairing/common_headers.c \
pairing/libconfig_wrapper.c
-pairing_ACCEPT_SEND_SRCS = pairing/hash.c pairing/packet_handler.c \
- $(pairing_COMMON_SRCS)
-pairing_accept_SOURCES = pairing/accept.c pairing/packet_handler_accept.c \
+pairing_ACCEPT_SEND_SRCS = $(pairing_COMMON_SRCS) \
+ pairing/hash.c \
+ pairing/packet_handler.c
+
+pairing_accept_SOURCES = $(pairing_ACCEPT_SEND_SRCS) \
+ pairing/accept.c \
pairing/create_accept_headers.c \
- $(pairing_ACCEPT_SEND_SRCS)
-pairing_send_SOURCES = pairing/send.c pairing/packet_handler_send.c \
+ pairing/packet_handler_accept.c
+
+pairing_send_SOURCES = $(pairing_ACCEPT_SEND_SRCS) \
pairing/create_send_headers.c \
- $(pairing_ACCEPT_SEND_SRCS)
-pairing_management_SOURCES = pairing/management.c $(pairing_COMMON_SRCS)
-pairing_passgen_SOURCES = pairing/passgen.c pairing/hash.c
+ pairing/packet_handler_send.c \
+ pairing/send.c
+
+pairing_management_SOURCES = $(pairing_COMMON_SRCS) \
+ pairing/management.c
+
+pairing_passgen_SOURCES = pairing/hash.c \
+ pairing/passgen.c
+
+performance_libperformance_la_SOURCES = performance/pisaperf.c
-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
-test_checkhipd_SOURCES = test/checkhipd.c
-test_getns_SOURCES = test/getns.c
-test_ifaddr_SOURCES = test/ifaddr.c
-test_udpserver_SOURCES = test/udpserver.c
-test_udpclient_SOURCES = test/udpclient.c
+
+pisacd_pisacd_SOURCES = pisacd/cdconf.c \
+ pisacd/cdconfhandlers.c \
+ pisacd/cdctx.c \
+ pisacd/cdderegister.c \
+ pisacd/cdheartbeat.c \
+ pisacd/cdmain.c \
+ pisacd/cdpending.c \
+ pisacd/cdregister.c \
+ pisacd/cdservers.c \
+ pisacd/cdtimeout.c \
+ pisacd/cdtun.c \
+ pisacd/pisacdconf.c
+
+pisacd_pisacdconf_SOURCES = pisacd/pisacdconf.c \
+ pisacd/pisaconftool.c
+
+pisasd_pisasd_SOURCES = pisasd/pisasdconf.c \
+ pisasd/sdclients.c \
+ pisasd/sdconf.c \
+ pisasd/sdctx.c \
+ pisasd/sdderegister.c \
+ pisasd/sdheartbeat.c \
+ pisasd/sdmain.c \
+ pisasd/sdnat.c \
+ pisasd/sdregister.c \
+ pisasd/sdtun.c
+
+pisasd_pisasdconf_SOURCES = pisasd/pisaconftool.c \
+ pisasd/pisasdconf.c
+
+test_checkhipd_SOURCES = test/checkhipd.c
+
+test_getns_SOURCES = test/getns.c
+
+test_ifaddr_SOURCES = test/ifaddr.c
+
+test_udpserver_SOURCES = test/udpserver.c
+
+test_udpclient_SOURCES = test/udpclient.c
+
tools_iwlist_parser_SOURCES = tools/iwlist_parser.c
-tools_msleep_SOURCES = tools/msleep.c
-pairing_send_CFLAGS = -DSEND
+tools_msleep_SOURCES = tools/msleep.c
+
+pairing_send_CFLAGS = -DSEND
pairing_accept_CFLAGS = -DACCEPT
if PISA_FORCE_SHLIB
community_operator_co_client_LDFLAGS = -Llibpisa -lpisa
community_operator_co_server_LDFLAGS = -Llibpisa -lpisa
- pairing_accept_LDFLAGS = -Llibpisa -lpisa
- pairing_management_LDFLAGS = -Llibpisa -lpisa
- pairing_send_LDFLAGS = -Llibpisa -lpisa
- pisacd_pisacd_LDFLAGS = -Llibpisa -lpisa
- pisacd_pisacdconf_LDFLAGS = -Llibpisa -lpisa
- pisasd_pisasd_LDFLAGS = -Llibpisa -lpisa
- pisasd_pisasdconf_LDFLAGS = -Llibpisa -lpisa
- test_checkhipd_LDFLAGS = -Llibpisa -lpisa
- test_getns_LDFLAGS = -Llibpisa -lpisa
+ pairing_accept_LDFLAGS = -Llibpisa -lpisa
+ pairing_management_LDFLAGS = -Llibpisa -lpisa
+ pairing_send_LDFLAGS = -Llibpisa -lpisa
+ pisacd_pisacd_LDFLAGS = -Llibpisa -lpisa
+ pisacd_pisacdconf_LDFLAGS = -Llibpisa -lpisa
+ pisasd_pisasd_LDFLAGS = -Llibpisa -lpisa
+ pisasd_pisasdconf_LDFLAGS = -Llibpisa -lpisa
+ test_checkhipd_LDFLAGS = -Llibpisa -lpisa
+ test_getns_LDFLAGS = -Llibpisa -lpisa
else
community_operator_co_client_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
community_operator_co_server_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
- pairing_accept_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
- pairing_management_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
- pairing_send_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
- 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@
- test_checkhipd_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
- test_getns_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+ pairing_accept_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+ pairing_management_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+ pairing_send_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+ 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@
+ test_checkhipd_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
+ test_getns_LDFLAGS = @PISA_LIBPISA_LIB_STATIC@
endif
if PISA_PERFORMANCE
Other related posts:
- » [pisa-src] r1552 - trunk/Makefile.am - Diego Biurrun
