Author: tjansen Date: Mon Oct 12 12:46:41 2009 New Revision: 1088 Log: Add to CFLAGS in Makefile.am, do not overwrite them. To build PISA with profiling support, we need an easy way to pass -pg in CFLAGS. "CFLAGS=-pg ./configure" builds with profiling support. For more detailed instructions please read the documentation in the wiki: https://plain.ds-group.info/projects/pisa/cgi-bin/trac.cgi/wiki/DocProfiling Modified: trunk/libpisa/Makefile.am trunk/pairing/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/libpisa/Makefile.am ============================================================================== --- trunk/libpisa/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/libpisa/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -17,4 +17,4 @@ endif INCLUDES = -I$(PISA_COMMON_INCLUDES) -I$(PISA_LIBPISA_INCLUDES) -CFLAGS = -Wall -g +CFLAGS += -Wall -g -pg Modified: trunk/pairing/Makefile.am ============================================================================== --- trunk/pairing/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/pairing/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = foreign -CFLAGS = -Wall -g # add -pedantic if you want it to worry about your commenting style (and other stuff) +CFLAGS += -Wall -g # 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/pisabeacon/Makefile.am ============================================================================== --- trunk/pisabeacon/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/pisabeacon/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -CFLAGS = -Wall -g +CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) sbin_PROGRAMS = pisabeacon Modified: trunk/pisacd/Makefile.am ============================================================================== --- trunk/pisacd/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/pisacd/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -CFLAGS = -Wall -g +CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) bin_PROGRAMS = pisacdconf Modified: trunk/pisand/Makefile.am ============================================================================== --- trunk/pisand/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/pisand/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -CFLAGS = -Wall -g +CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) sbin_PROGRAMS = pisand Modified: trunk/pisasd/Makefile.am ============================================================================== --- trunk/pisasd/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/pisasd/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -CFLAGS = -Wall -g +CFLAGS += -Wall -g -pg INCLUDES = -I$(PISA_COMMON_INCLUDES) bin_PROGRAMS = pisasdconf @@ -18,7 +18,7 @@ pisaconfdir = . LDADD = -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -pg if PISA_FORCE_SHLIB LDADD += -lpisa -lconfig Modified: trunk/test/Makefile.am ============================================================================== --- trunk/test/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/test/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = -CFLAGS = -Wall -g +CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) INCLUDES += -I@PISA_PISACD_INCLUDES@ Modified: trunk/tools/Makefile.am ============================================================================== --- trunk/tools/Makefile.am Mon Oct 12 12:04:18 2009 (r1087) +++ trunk/tools/Makefile.am Mon Oct 12 12:46:41 2009 (r1088) @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign -CFLAGS = -Wall -g +CFLAGS += -Wall -g INCLUDES = -I$(PISA_COMMON_INCLUDES) sbin_PROGRAMS = msleep