Author: biurrun Date: Thu Oct 15 16:15:24 2009 New Revision: 1173 Log: Globally set default CFLAGS in configure.ac instead of duplicating them in each Makefile.am per subdirectory. Modified: trunk/Makefile.am trunk/configure.ac trunk/libpisa/Makefile.am trunk/pairing/Makefile.am trunk/pisacd/Makefile.am trunk/pisand/Makefile.am trunk/pisasd/Makefile.am trunk/test/Makefile.am Modified: trunk/Makefile.am ============================================================================== --- trunk/Makefile.am Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/Makefile.am Thu Oct 15 16:15:24 2009 (r1173) @@ -15,8 +15,6 @@ EXTRA_DIST += tools/trigger-hipupdate.sh EXTRA_DIST += tools/tunnel/seteth1address -CFLAGS += -Wall - sbin_PROGRAMS = pisabeacon/pisabeacon tools/iwlist_parser tools/msleep pisabeacon_pisabeacon_SOURCES = pisabeacon/beaconmain.c Modified: trunk/configure.ac ============================================================================== --- trunk/configure.ac Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/configure.ac Thu Oct 15 16:15:24 2009 (r1173) @@ -174,6 +174,7 @@ # Our configuration files should be located in a subdirectory of their own. AC_SUBST(sysconfdir, ${sysconfdir}/pisa) +AC_SUBST(CFLAGS, "-g -O2 -Wall") # This is needed to export the _expanded_ value of the variable to ac_config.h. AC_DEFINE_UNQUOTED(PISA_SYSCONFDIR, "$(eval echo $sysconfdir)") Modified: trunk/libpisa/Makefile.am ============================================================================== --- trunk/libpisa/Makefile.am Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/libpisa/Makefile.am Thu Oct 15 16:15:24 2009 (r1173) @@ -11,5 +11,3 @@ if PISA_LOGGING libpisa_la_SOURCES += log.c endif - -CFLAGS += -Wall Modified: trunk/pairing/Makefile.am ============================================================================== --- trunk/pairing/Makefile.am Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/pairing/Makefile.am Thu Oct 15 16:15:24 2009 (r1173) @@ -3,7 +3,6 @@ # # Author: Kate Harrison harriska@xxxxxxxxxxxxx -CFLAGS += -Wall # add -pedantic if you want it to worry about your commenting style (and other stuff) send_CFLAGS = -DSEND accept_CFLAGS = -DACCEPT bin_PROGRAMS = send accept passgen management Modified: trunk/pisacd/Makefile.am ============================================================================== --- trunk/pisacd/Makefile.am Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/pisacd/Makefile.am Thu Oct 15 16:15:24 2009 (r1173) @@ -3,8 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> -CFLAGS += -Wall - bin_PROGRAMS = pisacdconf sbin_PROGRAMS = pisacd Modified: trunk/pisand/Makefile.am ============================================================================== --- trunk/pisand/Makefile.am Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/pisand/Makefile.am Thu Oct 15 16:15:24 2009 (r1173) @@ -3,8 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> -CFLAGS += -Wall - sbin_PROGRAMS = pisand EXTRA_DIST = pisand.conf Modified: trunk/pisasd/Makefile.am ============================================================================== --- trunk/pisasd/Makefile.am Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/pisasd/Makefile.am Thu Oct 15 16:15:24 2009 (r1173) @@ -3,8 +3,6 @@ # # Author: Dongsu Park <dpark1978@xxxxxxxxx> -CFLAGS += -Wall - bin_PROGRAMS = pisasdconf sbin_PROGRAMS = pisasd Modified: trunk/test/Makefile.am ============================================================================== --- trunk/test/Makefile.am Thu Oct 15 15:48:43 2009 (r1172) +++ trunk/test/Makefile.am Thu Oct 15 16:15:24 2009 (r1173) @@ -5,8 +5,6 @@ EXTRA_DIST = -CFLAGS += -Wall - INCLUDES = -I@PISA_PISACD_INCLUDES@ INCLUDES += -I@PISA_PISAND_INCLUDES@ INCLUDES += -I@PISA_PISASD_INCLUDES@