Commit 86d41c14 authored by Cosimo Cecchi's avatar Cosimo Cecchi

Split WARNING_CFLAGS into its own variable.

So that we can use e.g. LIBNAUTILUS_EXTENSIONS_CFLAGS when compiling the
gir information.
parent 2617e16a
......@@ -237,6 +237,8 @@ dnl ==========================================================================
dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
WARNING_CFLAGS=""
AC_ARG_ENABLE(more-warnings,
AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
set_more_warnings="$enableval",[
......@@ -277,6 +279,8 @@ else
AC_MSG_RESULT(no)
fi
AC_SUBST(WARNING_CFLAGS)
dnl ===========================================================================
dnl strftime checks
......@@ -327,14 +331,14 @@ AC_SUBST(LIBEGG_LIBS)
dnl libnautilus-extension
LIBNAUTILUS_EXTENSION_MODULES="glib-2.0 gtk+-2.0"
LIBNAUTILUS_EXTENSION_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_EXTENSION_MODULES` $WARNING_CFLAGS"
LIBNAUTILUS_EXTENSION_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_EXTENSION_MODULES`"
AC_SUBST(LIBNAUTILUS_EXTENSION_CFLAGS)
LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
dnl core nautilus
CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
AC_SUBST(CORE_LIBS)
......
......@@ -6,6 +6,7 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Eel\" \
-I$(top_srcdir) \
$(CORE_CFLAGS) \
$(WARNING_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
......
......@@ -8,6 +8,7 @@ INCLUDES=\
-I$(top_srcdir) \
-I$(top_builddir) \
$(LIBNAUTILUS_EXTENSION_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
$(NULL)
......@@ -69,7 +70,10 @@ introspection_files = \
$(libnautilus_extension_la_SOURCES)
Nautilus-2.0.gir: libnautilus-extension.la Makefile
Nautilus_2_0_gir_INCLUDES = Gtk-2.0 Gio-2.0 GLib-2.0
Nautilus_2_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
Nautilus_2_0_gir_CFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(LIBNAUTILUS_EXTENSION_CFLAGS)
Nautilus_2_0_gir_LIBS = libnautilus-extension.la
Nautilus_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
INTROSPECTION_GIRS += Nautilus-2.0.gir
......
......@@ -7,6 +7,7 @@ INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir)/cut-n-paste-code \
$(CORE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(TRACKER_CFLAGS) \
$(BEAGLE_CFLAGS) \
......
......@@ -18,6 +18,7 @@ INCLUDES = \
-I$(top_srcdir)/cut-n-paste-code \
-I$(top_builddir)/libnautilus-private \
$(CORE_CFLAGS) \
$(WARNING_CFLAGS) \
$(EXIF_CFLAGS) \
$(EXEMPI_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
......
......@@ -6,6 +6,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/cut-n-paste-code \
$(CORE_CFLAGS) \
$(WARNING_CFLAGS) \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
-DDATADIR=\""$(datadir)"\" \
$(DISABLE_DEPRECATED_CFLAGS) \
......
......@@ -3,6 +3,7 @@ NULL=
INCLUDES =\
-I$(top_srcdir) \
$(CORE_CFLAGS) \
$(WARNING_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment