kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=0dbb2e6c88cab3a90180c8368a53b6ef82bf1c2e
commit 0dbb2e6c88cab3a90180c8368a53b6ef82bf1c2e Author: Kim Woelders <[email protected]> Date: Fri Aug 9 09:36:11 2013 +0200 Autofoo tweaks. Rename CWARNFLAGS to CFLAGS_WARNINGS for consistency with pending changes. --- dox/Makefile.am | 2 +- eesh/Makefile.am | 2 +- epp/Makefile.am | 2 +- lib/Makefile.am | 4 ++-- m4/ec_warnflags.m4 | 10 +++++----- src/Makefile.am | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dox/Makefile.am b/dox/Makefile.am index cd1f8d1..d1f3d21 100644 --- a/dox/Makefile.am +++ b/dox/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = edox edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c edox_CPPFLAGS = -I$(top_builddir) $(IMLIB2_CFLAGS) $(X_CFLAGS) \ - $(CWARNFLAGS) -D ENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" + $(CFLAGS_WARNINGS) -D ENLIGHTENMENT_ROOT=\"$(pkgdatadir)\" LDADD = $(IMLIB2_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm diff --git a/eesh/Makefile.am b/eesh/Makefile.am index 6d985cb..3f0ade6 100644 --- a/eesh/Makefile.am +++ b/eesh/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = eesh eesh_SOURCES = E.h comms.c main.c -eesh_CPPFLAGS = -I$(top_builddir) $(X_CFLAGS) $(CWARNFLAGS) +eesh_CPPFLAGS = -I$(top_builddir) $(X_CFLAGS) $(CFLAGS_WARNINGS) LDADD = $(X_LIBS) -lX11 diff --git a/epp/Makefile.am b/epp/Makefile.am index 00726fe..942fde3 100644 --- a/epp/Makefile.am +++ b/epp/Makefile.am @@ -29,7 +29,7 @@ epp_SOURCES = \ cpplib.c \ cppmain.c -epp_CPPFLAGS = -I$(top_builddir) $(CWARNFLAGS) +epp_CPPFLAGS = -I$(top_builddir) $(CFLAGS_WARNINGS) DEFS= \ -DHAVE_STRERROR \ diff --git a/lib/Makefile.am b/lib/Makefile.am index dff1343..c5abdf4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,7 +7,7 @@ if BUILD_LIBHACK LIB_HACK = libhack.la libhack_la_SOURCES = e16_hack.c -libhack_la_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS) $(CWARNFLAGS) +libhack_la_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS) $(CFLAGS_WARNINGS) libhack_la_LIBADD = $(DLOPEN_LIBS) libhack_la_LDFLAGS = -module -avoid-version @@ -19,7 +19,7 @@ if BUILD_LIBTRIP LIB_TRIP = libtrip.la libtrip_la_SOURCES = e16_trip.c -libtrip_la_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS) $(CWARNFLAGS) +libtrip_la_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS) $(CFLAGS_WARNINGS) libtrip_la_LIBADD = $(DLOPEN_LIBS) libtrip_la_LDFLAGS = -module -avoid-version diff --git a/m4/ec_warnflags.m4 b/m4/ec_warnflags.m4 index 813bf15..16f7bf4 100644 --- a/m4/ec_warnflags.m4 +++ b/m4/ec_warnflags.m4 @@ -1,7 +1,7 @@ dnl Copyright (C) 2008 Kim Woelders dnl This code is public domain and can be freely used or copied. -dnl Macro to set compiler warning flags in CWARNFLAGS +dnl Macro to set compiler warning flags in CFLAGS_WARNINGS dnl Provides configure argument --enable-werror to stop compilation on warnings @@ -16,14 +16,14 @@ AC_DEFUN([EC_C_WARNINGS], [ enable_werror=no) if test "x$GCC" = "xyes"; then - CWARNFLAGS="-W -Wall -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings" + CFLAGS_WARNINGS="-W -Wall -Waggregate-return -Wcast-align -Wpointer-arith -Wshadow -Wwrite-strings" ifelse(ec_c_compile_cpp, no, [ - CWARNFLAGS="$CWARNFLAGS -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes" + CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes" ],) if test "x$enable_werror" = "xyes"; then - CWARNFLAGS="$CWARNFLAGS -Werror" + CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Werror" fi fi - AC_SUBST(CWARNFLAGS) + AC_SUBST(CFLAGS_WARNINGS) ]) diff --git a/src/Makefile.am b/src/Makefile.am index df02908..f6f30b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -121,7 +121,7 @@ e16_SOURCES = \ $(SRCS_SNPRINTF) AM_CPPFLAGS = \ - $(CWARNFLAGS) \ + $(CFLAGS_WARNINGS) \ -D LOCALEDIR=\"$(datadir)/locale\" \ -D ENLIGHTENMENT_BIN=\"$(bindir)\" \ -D ENLIGHTENMENT_LIB=\"$(pkglibdir)\" \ --
