emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* use AM_CPPFLAGS instead of INCLUDES

This commit is contained in:
djcb 2012-12-22 22:54:50 +02:00
parent 4f37e979e1
commit c5f8ea6451
10 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/Makefile.am
View File

@ -16,7 +16,7 @@
include $(top_srcdir)/gtest.mk include $(top_srcdir)/gtest.mk
INCLUDES=$(GMIME_CFLAGS) $(GLIB_CFLAGS) -I${prefix}/include AM_CPPFLAGS=$(GMIME_CFLAGS) $(GLIB_CFLAGS) -I${prefix}/include
AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement -pedantic AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement -pedantic
noinst_PROGRAMS=gmime-test noinst_PROGRAMS=gmime-test

4
guile/Makefile.am
View File

@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
# with separate builddir) # with separate builddir)
SUBDIRS= . mu scripts examples tests SUBDIRS= . mu scripts examples tests
INCLUDES=-I. -I${top_builddir} -I${top_srcdir}/lib ${GUILE_CFLAGS} ${GLIB_CFLAGS} AM_CPPFLAGS=-I. -I${top_builddir} -I${top_srcdir}/lib ${GUILE_CFLAGS} ${GLIB_CFLAGS}
# don't use -Werror, as it might break on other compilers # don't use -Werror, as it might break on other compilers
# use -Wno-unused-parameters, because some callbacks may not # use -Wno-unused-parameters, because some callbacks may not
@ -54,7 +54,7 @@ mu_guile_TEXINFOS= \
BUILT_SOURCES=$(XFILES) BUILT_SOURCES=$(XFILES)
snarfcppopts= $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) snarfcppopts= $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS)
SUFFIXES = .x .doc SUFFIXES = .x .doc
.c.x: .c.x:
$(GUILE_SNARF) -o $@ $< $(snarfcppopts) $(GUILE_SNARF) -o $@ $< $(snarfcppopts)

2
guile/tests/Makefile.am
View File

@ -16,7 +16,7 @@
include $(top_srcdir)/gtest.mk include $(top_srcdir)/gtest.mk
INCLUDES=$(XAPIAN_CXXFLAGS) \ AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) \
$(GMIME_CFLAGS) \ $(GMIME_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-I ${top_srcdir} \ -I ${top_srcdir} \

2
lib/Makefile.am
View File

@ -26,7 +26,7 @@ else
crypto= crypto=
endif endif
INCLUDES=$(XAPIAN_CXXFLAGS) $(GMIME_CFLAGS) $(GLIB_CFLAGS) $(GUILE_CFLAGS) AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) $(GMIME_CFLAGS) $(GLIB_CFLAGS) $(GUILE_CFLAGS)
# don't use -Werror, as it might break on other compilers # don't use -Werror, as it might break on other compilers
# use -Wno-unused-parameters, because some callbacks may not # use -Wno-unused-parameters, because some callbacks may not

6
lib/mu-container.c
View File

@ -432,8 +432,10 @@ mu_container_dump (MuContainer *c, gboolean recursive)
if (!recursive) if (!recursive)
dump_container (c); dump_container (c);
else else
mu_container_foreach (c, (MuContainerForeachFunc)dump_container, mu_container_foreach
NULL); (c,
(MuContainerForeachFunc)dump_container,
NULL);
} }

2
lib/tests/Makefile.am
View File

@ -16,7 +16,7 @@
include $(top_srcdir)/gtest.mk include $(top_srcdir)/gtest.mk
INCLUDES=$(XAPIAN_CXXFLAGS) \ AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) \
$(GMIME_CFLAGS) \ $(GMIME_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-I ${top_srcdir} \ -I ${top_srcdir} \

2
mu/Makefile.am
View File

@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
# before decending into tests/ # before decending into tests/
SUBDIRS= . tests SUBDIRS= . tests
INCLUDES=-I${top_srcdir}/lib $(GLIB_CFLAGS) AM_CPPFLAGS=-I${top_srcdir}/lib $(GLIB_CFLAGS)
# don't use -Werror, as it might break on other compilers # don't use -Werror, as it might break on other compilers
# use -Wno-unused-parameters, because some callbacks may not # use -Wno-unused-parameters, because some callbacks may not

2
mu/tests/Makefile.am
View File

@ -16,7 +16,7 @@
include $(top_srcdir)/gtest.mk include $(top_srcdir)/gtest.mk
INCLUDES=$(XAPIAN_CXXFLAGS) \ AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) \
$(GMIME_CFLAGS) \ $(GMIME_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-I ${top_srcdir} \ -I ${top_srcdir} \

2
toys/msg2pdf/Makefile.am
View File

@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
SUBDIRS= . SUBDIRS= .
INCLUDES=-I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"' AM_CPPFLAGS=-I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"'
# don't use -Werror, as it might break on other compilers # don't use -Werror, as it might break on other compilers
# use -Wno-unused-parameters, because some callbacks may not # use -Wno-unused-parameters, because some callbacks may not

2
toys/mug/Makefile.am
View File

@ -19,7 +19,7 @@ include $(top_srcdir)/gtest.mk
# enforce compiling this dir first before decending into tests/ # enforce compiling this dir first before decending into tests/
SUBDIRS= . SUBDIRS= .
INCLUDES=-I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) \ AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) \
-DICONDIR='"$(icondir)"' -DMUGDIR='"$(abs_srcdir)"' \ -DICONDIR='"$(icondir)"' -DMUGDIR='"$(abs_srcdir)"' \
-DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE