Author: biurrun Date: Tue Oct 13 14:54:52 2009 New Revision: 1108 Log: Move setting of "foreign" automake option to configure.ac. It was previously duplicated in every Makefile.am. Modified: trunk/Makefile.am trunk/community-operator/Makefile.am trunk/configure.ac trunk/libpisa/Makefile.am trunk/pairing/Makefile.am trunk/performance/Makefile.am trunk/pisabeacon/Makefile.am trunk/pisacd/Makefile.am trunk/pisand/Makefile.am trunk/pisasd/Makefile.am trunk/test/Makefile.am trunk/tools/Makefile.am Modified: trunk/Makefile.am ============================================================================== --- trunk/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -1,7 +1,7 @@ # Copyright (c) 2008, Distributed Systems Group, RWTH Aachen # All rights reserved. -AUTOMAKE_OPTIONS = foreign subdir-objects +AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = Modified: trunk/community-operator/Makefile.am ============================================================================== --- trunk/community-operator/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/community-operator/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,8 +3,6 @@ # # Author: Thomas Jansen <mithi@xxxxxxxxx> -AUTOMAKE_OPTIONS = foreign - INCLUDES = -I$(PISA_COMMON_INCLUDES) bin_PROGRAMS = co_server co_client Modified: trunk/configure.ac ============================================================================== --- trunk/configure.ac Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/configure.ac Tue Oct 13 14:54:52 2009 (r1108) @@ -12,7 +12,7 @@ AC_INIT(pisa, [PISA_VERSION], pisa@xxxxxxxxxxxxx) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADERS([include/ac_config.h]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_MACRO_DIR([m4]) Modified: trunk/libpisa/Makefile.am ============================================================================== --- trunk/libpisa/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/libpisa/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,10 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> - - -AUTOMAKE_OPTIONS = foreign - lib_LTLIBRARIES = libpisa.la libpisa_la_SOURCES = arp.c buffer.c config.c conmgr.c crypto.c libpisa_la_SOURCES += ctrlhandler.c debug.c hitlist.c iw.c iwlib.c linkedlist.c Modified: trunk/pairing/Makefile.am ============================================================================== --- trunk/pairing/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/pairing/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,11 +3,6 @@ # # Author: Kate Harrison harriska@xxxxxxxxxxxxx - - - -AUTOMAKE_OPTIONS = foreign - CFLAGS += -Wall -g # add -pedantic if you want it to worry about your commenting style (and other stuff) send_CFLAGS = -DSEND accept_CFLAGS = -DACCEPT Modified: trunk/performance/Makefile.am ============================================================================== --- trunk/performance/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/performance/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,10 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> - - -AUTOMAKE_OPTIONS = foreign - lib_LTLIBRARIES = libperformance.la libperformance_la_SOURCES = pisaperf.c Modified: trunk/pisabeacon/Makefile.am ============================================================================== --- trunk/pisabeacon/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/pisabeacon/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,8 +3,6 @@ # # Author: Tobias Heer <heer@xxxxxxxxxxxxxxxxx> -AUTOMAKE_OPTIONS = foreign - CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) Modified: trunk/pisacd/Makefile.am ============================================================================== --- trunk/pisacd/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/pisacd/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,8 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> -AUTOMAKE_OPTIONS = foreign - CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) Modified: trunk/pisand/Makefile.am ============================================================================== --- trunk/pisand/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/pisand/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,8 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> -AUTOMAKE_OPTIONS = foreign - CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) Modified: trunk/pisasd/Makefile.am ============================================================================== --- trunk/pisasd/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/pisasd/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,8 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> -AUTOMAKE_OPTIONS = foreign - CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) Modified: trunk/test/Makefile.am ============================================================================== --- trunk/test/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/test/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,7 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> -AUTOMAKE_OPTIONS = foreign EXTRA_DIST = CFLAGS += -Wall -g Modified: trunk/tools/Makefile.am ============================================================================== --- trunk/tools/Makefile.am Tue Oct 13 14:43:09 2009 (r1107) +++ trunk/tools/Makefile.am Tue Oct 13 14:54:52 2009 (r1108) @@ -3,8 +3,6 @@ # # Author: Rene Hummen <hummen@xxxxxxxxxxxxxxxxx> -AUTOMAKE_OPTIONS = foreign - CFLAGS += -Wall -g sbin_PROGRAMS = msleep