diff options
| author | Bradley Smith | 2009-11-18 18:28:52 +0000 |
|---|---|---|
| committer | Bradley Smith | 2009-11-18 18:28:52 +0000 |
| commit | e40ee83cfbaba82fa7e6f82bbcbbbc28b20b2aed (patch) | |
| tree | d05d9f42244b0edc447a5feee0628899bb99b8ef | |
| parent | Fix issues when compiling with optimisations. (diff) | |
| download | gnurobots-e40ee83cfbaba82fa7e6f82bbcbbbc28b20b2aed.tar.gz | |
Fix autoconf mess such that you can actually specify CFLAGS to the build.
Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index e49789e..12cfeba 100644 --- a/configure.ac +++ b/configure.ac @@ -91,8 +91,6 @@ You need guile 1.8 to build this program. dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -CFLAGS="-pedantic-errors -Werror -Wall -g" - dnl Done. AC_CONFIG_FILES([Makefile contrib/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 75522e7..75f16de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,16 +17,18 @@ bin_PROGRAMS = gnurobots -INCLUDES = $(GUILE_CFLAGS) $(READLINE_CFLAGS) $(GTK2_CFLAGS) $(VTE_CFLAGS) \ - $(GTHREAD2_CFLAGS) \ - -I$(top_builddir)/include \ - -DPKGLIBDIR=\"$(pkglibdir)\" \ - -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" \ - -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DMAPS_PATH=\"$(mapsdir)\" \ - -DSCRIPTS_PATH=\"$(schemedir)\" +AM_CFLAGS = -pedantic-errors -Werror -Wall + +INCLUDES = $(GUILE_CFLAGS) $(READLINE_CFLAGS) $(GTK2_CFLAGS) \ + $(VTE_CFLAGS) $(GTHREAD2_CFLAGS) \ + -I$(top_builddir)/include \ + -DPKGLIBDIR=\"$(pkglibdir)\" \ + -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" \ + -DPKGDATADIR=\"$(pkgdatadir)\" \ + -DMAPS_PATH=\"$(mapsdir)\" \ + -DSCRIPTS_PATH=\"$(schemedir)\" gnurobots_SOURCES = main.c api.c map.c grobot.c \ - ui-window.c ui-cmdwin.c ui-arena.c + ui-window.c ui-cmdwin.c ui-arena.c gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \ - $(GTK2_LIBS) $(VTE_LIBS) -lutil + $(GTK2_LIBS) $(VTE_LIBS) -lutil |