Commit d4216cc5 authored by Christian Persch's avatar Christian Persch

build: Don't use INCLUDES

It's deprecated. Instead use *_CPPFLAGS.
parent fc9b6d12
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
# Set the minimum required Windows version to Windows 2000 (0x0500).
if PLATFORM_WIN32
AM_CPPFLAGS = -D_WIN32_WINNT=0x0500
endif
SUBDIRS = \
cut-n-paste \
data \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(BACKEND_CFLAGS) \
$(LIB_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
backend_LTLIBRARIES = libcomicsdocument.la
libcomicsdocument_la_SOURCES = \
comics-document.c \
comics-document.h
libcomicsdocument_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
libcomicsdocument_la_CFLAGS = \
$(BACKEND_CFLAGS) \
$(LIB_CFLAGS) \
$(AM_CFLAGS)
libcomicsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libcomicsdocument_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument3.la \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(BACKEND_CFLAGS) \
$(DJVU_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
backend_LTLIBRARIES = libdjvudocument.la
libdjvudocument_la_SOURCES = \
......@@ -20,6 +9,19 @@ libdjvudocument_la_SOURCES = \
djvu-text-page.c \
djvu-text-page.h
libdjvudocument_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
libdjvudocument_la_CFLAGS = \
$(BACKEND_CFLAGS) \
$(DJVU_CFLAGS) \
$(AM_CFLAGS)
libdjvudocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libdjvudocument_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument3.la \
......
SUBDIRS = mdvi-lib
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-I$(srcdir)/mdvi-lib \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(WARN_CFLAGS) \
$(BACKEND_CFLAGS) \
$(SPECTRE_CFLAGS) \
$(DISABLE_DEPRECATED)
backend_LTLIBRARIES = libdvidocument.la
libdvidocument_la_SOURCES = \
......@@ -23,6 +12,19 @@ libdvidocument_la_SOURCES = \
fonts.c \
fonts.h
libdvidocument_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-I$(srcdir)/mdvi-lib \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
libdvidocument_la_CFLAGS = \
$(BACKEND_CFLAGS) \
$(SPECTRE_CFLAGS) \
$(AM_CFLAGS)
libdvidocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libdvidocument_la_LIBADD = \
mdvi-lib/libmdvi.la \
......
INCLUDES = $(WARN_CFLAGS)
noinst_LTLIBRARIES = libmdvi.la
libmdvi_la_SOURCES = \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(BACKEND_CFLAGS) \
$(POPPLER_CFLAGS) \
$(WARN_CXXFLAGS) \
$(DISABLE_DEPRECATED)
backend_LTLIBRARIES = libpdfdocument.la
libpdfdocument_la_SOURCES = \
ev-poppler.cc \
ev-poppler.h
libpdfdocument_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
libpdfdocument_la_CXXFLAGS = \
$(BACKEND_CFLAGS) \
$(POPPLER_CFLAGS) \
$(AM_CXXFLAGS)
libpdfdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libpdfdocument_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument3.la \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(BACKEND_CFLAGS) \
$(SPECTRE_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
backend_LTLIBRARIES = libpsdocument.la
libpsdocument_la_SOURCES = \
ev-spectre.c \
ev-spectre.h
libpsdocument_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
libpsdocument_la_CFLAGS = \
$(BACKEND_CFLAGS) \
$(SPECTRE_CFLAGS) \
$(AM_CFLAGS)
libpsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libpsdocument_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument3.la \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(BACKEND_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
backend_LTLIBRARIES = libtiffdocument.la
libtiffdocument_la_SOURCES = \
......@@ -15,6 +6,17 @@ libtiffdocument_la_SOURCES = \
tiff2ps.c \
tiff2ps.h
libtiffdocument_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
libtiffdocument_la_CFLAGS = \
$(BACKEND_CFLAGS) \
$(AM_CFLAGS)
libtiffdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libtiffdocument_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument3.la \
......
......@@ -13,8 +13,7 @@ libxpsdocument_la_CPPFLAGS = \
libxpsdocument_la_CFLAGS = \
$(BACKEND_CFLAGS) \
$(GXPS_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
$(AM_CFLAGS)
libxpsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libxpsdocument_la_LIBADD = \
......
......@@ -109,6 +109,8 @@ if test "$with_platform" = "win32"; then
;;
esac
AC_MSG_RESULT([$os_win32])
AM_CFLAGS="$AM_CFLAGS -D_WIN32_WINNT=0x0500"
fi
AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
......@@ -316,7 +318,7 @@ AC_ARG_ENABLE([dbus],
if test "$enable_dbus" = "yes"; then
AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
PKG_CHECK_MODULES([EV_DAEMON], [gio-2.0 >= $GLIB_REQUIRED])
PKG_CHECK_MODULES([EV_DAEMON], [gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0])
fi
AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"])
......
......@@ -6,8 +6,7 @@ libgimpcellrenderertoggle_la_sources = \
libgimpcellrenderertoggle_la_CFLAGS = \
$(SHELL_CORE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED)
$(AM_CFLAGS)
libgimpcellrenderertoggle_la_built_sources = \
gimpwidgetsmarshal.h \
......
......@@ -11,12 +11,10 @@ libsmclient_la_SOURCES = \
libsmclient_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\""EggSMClient"\" \
$(DISABLE_DEPRECATED) \
$(AM_CPPFLAGS)
libsmclient_la_CFLAGS = \
$(SMCLIENT_CFLAGS) \
$(WARNING_CFLAGS) \
$(AM_CFLAGS)
libsmclient_la_LIBADD = \
......
......@@ -8,7 +8,6 @@ libsynctex_la_SOURCES = \
libsynctex_la_CFLAGS = \
$(SHELL_CORE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED)
$(AM_CFLAGS)
-include $(top_srcdir)/git.mk
......@@ -103,9 +103,7 @@ GTKDOC_CFLAGS = \
-DEV_BACKENDSDIR=\"$(backenddir)\" \
-DEVINCE_COMPILATION \
$(AM_CFLAGS) \
$(LIBDOCUMENT_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
$(LIBDOCUMENT_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/libdocument/libevdocument3.la \
......
......@@ -109,9 +109,7 @@ GTKDOC_CFLAGS = \
-DEV_BACKENDSDIR=\"$(backenddir)\" \
-DEVINCE_COMPILATION \
$(AM_CFLAGS) \
$(LIBVIEW_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
$(LIBVIEW_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/libdocument/libevdocument3.la \
......
......@@ -102,8 +102,6 @@ GTKDOC_CFLAGS = \
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
-DEVINCE_COMPILATION \
$(SHELL_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(GTK_PRINT_CFLAGS)
FILTER_OUT = \
......
......@@ -104,8 +104,6 @@ libevdocument3_la_CPPFLAGS = \
libevdocument3_la_CFLAGS = \
$(LIBDOCUMENT_CFLAGS) \
-I$(top_srcdir)/cut-n-paste/synctex \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(AM_CFLAGS)
libevdocument3_la_LDFLAGS = \
......
......@@ -11,9 +11,7 @@ libevmisc_la_CFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-I$(top_srcdir)/libview \
$(SHELL_CORE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED)
$(SHELL_CORE_CFLAGS)
libevmisc_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument3.la \
......
......@@ -66,8 +66,6 @@ libevview3_la_CPPFLAGS = \
libevview3_la_CFLAGS = \
$(LIBVIEW_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(AM_CFLAGS)
libevview3_la_LDFLAGS = \
......
......@@ -22,8 +22,6 @@ evince_previewer_CPPFLAGS = \
evince_previewer_CFLAGS = \
$(PREVIEWER_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(AM_CFLAGS)
evince_previewer_LDFLAGS = $(AM_LDFLAGS)
......
INCLUDES= \
-I$(top_srcdir) \
-I$(top_builddir) \
$(FRONTEND_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS)
noinst_LTLIBRARIES = libevproperties.la
libevproperties_la_SOURCES= \
ev-properties-view.c \
ev-properties-view.h
libevproperties_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(AM_CPPFLAGS)
libevproperties_la_CFLAGS = \
$(FRONTEND_CFLAGS) \
$(AM_CFLAGS)
if ENABLE_NAUTILUS
nautilusextensiondir=$(libdir)/$(NAUTILUS_EXTENSION_DIR)
nautilusextension_LTLIBRARIES = libevince-properties-page.la
libevince_properties_page_la_CFLAGS = -I$(top_srcdir)
libevince_properties_page_la_SOURCES = \
ev-properties-main.c
libevince_properties_page_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(AM_CPPFLAGS)
libevince_properties_page_la_CFLAGS = \
$(FRONTEND_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(AM_CFLAGS)
libevince_properties_page_la_LIBADD = \
libevproperties.la \
$(top_builddir)/libdocument/libevdocument3.la \
......
NULL =
INCLUDES= \
-DGNOMEDATADIR=\"$(datadir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/ \
-I$(top_srcdir)/cut-n-paste/smclient/ \
-I$(top_srcdir)/libdocument \
-I$(top_builddir)/libdocument \
-I$(top_srcdir)/libview \
-I$(top_builddir)/libview \
-I$(top_srcdir)/libmisc \
-I$(top_srcdir)/properties \
-DBINDIR=\""$(bindir)"\" \
-DEVINCE_COMPILATION \
$(SHELL_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
bin_PROGRAMS=evince
if ENABLE_DBUS
......@@ -110,6 +92,26 @@ nodist_evince_SOURCES += \
$(NULL)
endif
evince_CPPFLAGS = \
-DGNOMEDATADIR=\"$(datadir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle \
-I$(top_srcdir)/cut-n-paste/smclient \
-I$(top_srcdir)/libdocument \
-I$(top_builddir)/libdocument \
-I$(top_srcdir)/libview \
-I$(top_builddir)/libview \
-I$(top_srcdir)/libmisc \
-I$(top_srcdir)/properties \
-DBINDIR=\""$(bindir)"\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
evince_CFLAGS = \
$(SHELL_CFLAGS) \
$(AM_CFLAGS)
evince_LDFLAGS = $(AM_LDFLAGS)
if PLATFORM_WIN32
......@@ -152,13 +154,17 @@ nodist_evinced_SOURCES = \
ev-daemon-gdbus-generated.h
$(NULL)
evinced_CPPFLAGS = \
-DBINDIR=\""$(bindir)"\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)
evinced_CFLAGS= \
-I$(top_srcdir) \
-I$(top_builddir) \
-DEVINCE_COMPILATION \
$(EV_DAEMON_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
$(AM_CFLAGS)
evinced_LDADD= \
$(EV_DAEMON_LIBS)
......
......@@ -11,8 +11,6 @@ evince_thumbnailer_CPPFLAGS = \
evince_thumbnailer_CFLAGS = \
$(FRONTEND_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS) \
$(AM_CFLAGS)
evince_thumbnailer_LDFLAGS = $(AM_LDFLAGS)
......
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