Autofoo tweaks.
Rename CWARNFLAGS to CFLAGS_WARNINGS for consistency with pending changes.
This commit is contained in:
parent
94714f9b72
commit
0dbb2e6c88
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
])
|
||||
|
|
|
@ -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)\" \
|
||||
|
|
Loading…
Reference in New Issue