packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using explicit WARN_CFLAGS 

The rationale is documented well in the automake manual.
This commit is contained in:
Colin Walters 2011-11-11 06:53:44 -05:00
parent cd17e9a2a3
commit f5cf1a54de
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-libostree.am
View File

@ -31,5 +31,5 @@ libostree_la_SOURCES = libostree/ostree.h \
libostree/ostree-checkout.c \ libostree/ostree-checkout.c \
libostree/ostree-checkout.h \ libostree/ostree-checkout.h \
$(NULL) $(NULL)
libostree_la_CFLAGS = -I$(srcdir)/libotutil -I$(srcdir)/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS) libostree_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libotutil -I$(srcdir)/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
libostree_la_LIBADD = libotutil.la $(OT_COREBIN_DEP_LIBS) libostree_la_LIBADD = libotutil.la $(OT_COREBIN_DEP_LIBS)

2
Makefile-ostree.am
View File

@ -34,5 +34,5 @@ ostree_SOURCES = ostree/main.c \
ostree/ot-builtin-rev-parse.c \ ostree/ot-builtin-rev-parse.c \
ostree/ot-builtin-show.c \ ostree/ot-builtin-show.c \
$(NULL) $(NULL)
ostree_CFLAGS = -I$(srcdir)/libotutil -I$(srcdir)/libostree -I$(srcdir)/ostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS) ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libotutil -I$(srcdir)/libostree -I$(srcdir)/ostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
ostree_LDADD = libotutil.la libostree.la $(OT_COREBIN_DEP_LIBS) ostree_LDADD = libotutil.la libostree.la $(OT_COREBIN_DEP_LIBS)

2
Makefile-otutil.am
View File

@ -32,5 +32,5 @@ libotutil_la_SOURCES = \
libotutil/ot-glib-compat.h \ libotutil/ot-glib-compat.h \
libotutil/otutil.h \ libotutil/otutil.h \
$(NULL) $(NULL)
libotutil_la_CFLAGS = -I$(srcdir)/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(GIO_UNIX_CFLAGS) libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(GIO_UNIX_CFLAGS)
libotutil_la_LIBADD = $(GIO_UNIX_LIBS) libotutil_la_LIBADD = $(GIO_UNIX_LIBS)

1
Makefile.am
View File

@ -17,6 +17,7 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"'
AM_CFLAGS = $(WARN_CFLAGS)
NULL = NULL =
BUILT_SOURCES = BUILT_SOURCES =

10
configure.ac
View File

@ -13,16 +13,10 @@ AM_PROG_CC_C_O
changequote(,)dnl changequote(,)dnl
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
case " $CFLAGS " in WARN_CFLAGS="-Wall -Werror=missing-prototypes"
*[\ \ ]-Wall[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wall" ;;
esac
case " $CFLAGS " in
*[\ \ ]-Werror=missing-prototypes[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Werror=missing-prototypes" ;;
esac
fi fi
changequote([,])dnl changequote([,])dnl
AC_SUBST(WARN_CFLAGS)
# Initialize libtool # Initialize libtool
AC_PROG_LIBTOOL AC_PROG_LIBTOOL