mirror of https://github.com/djcb/mu.git
* use AM_CPPFLAGS instead of INCLUDES
This commit is contained in:
parent
4f37e979e1
commit
c5f8ea6451
|
@ -16,7 +16,7 @@
|
|||
|
||||
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
|
||||
|
||||
noinst_PROGRAMS=gmime-test
|
||||
|
|
|
@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
|
|||
# with separate builddir)
|
||||
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
|
||||
# use -Wno-unused-parameters, because some callbacks may not
|
||||
|
@ -54,7 +54,7 @@ mu_guile_TEXINFOS= \
|
|||
|
||||
BUILT_SOURCES=$(XFILES)
|
||||
|
||||
snarfcppopts= $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
|
||||
snarfcppopts= $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS)
|
||||
SUFFIXES = .x .doc
|
||||
.c.x:
|
||||
$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
include $(top_srcdir)/gtest.mk
|
||||
|
||||
INCLUDES=$(XAPIAN_CXXFLAGS) \
|
||||
AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) \
|
||||
$(GMIME_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
-I ${top_srcdir} \
|
||||
|
|
|
@ -26,7 +26,7 @@ else
|
|||
crypto=
|
||||
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
|
||||
# use -Wno-unused-parameters, because some callbacks may not
|
||||
|
|
|
@ -432,8 +432,10 @@ mu_container_dump (MuContainer *c, gboolean recursive)
|
|||
if (!recursive)
|
||||
dump_container (c);
|
||||
else
|
||||
mu_container_foreach (c, (MuContainerForeachFunc)dump_container,
|
||||
NULL);
|
||||
mu_container_foreach
|
||||
(c,
|
||||
(MuContainerForeachFunc)dump_container,
|
||||
NULL);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
include $(top_srcdir)/gtest.mk
|
||||
|
||||
INCLUDES=$(XAPIAN_CXXFLAGS) \
|
||||
AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) \
|
||||
$(GMIME_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
-I ${top_srcdir} \
|
||||
|
|
|
@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
|
|||
# before decending into 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
|
||||
# use -Wno-unused-parameters, because some callbacks may not
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
include $(top_srcdir)/gtest.mk
|
||||
|
||||
INCLUDES=$(XAPIAN_CXXFLAGS) \
|
||||
AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) \
|
||||
$(GMIME_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
-I ${top_srcdir} \
|
||||
|
|
|
@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
|
|||
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
|
||||
# use -Wno-unused-parameters, because some callbacks may not
|
||||
|
|
|
@ -19,7 +19,7 @@ include $(top_srcdir)/gtest.mk
|
|||
# enforce compiling this dir first before decending into tests/
|
||||
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)"' \
|
||||
-DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
|
||||
|
||||
|
|
Loading…
Reference in New Issue