Commit 678b1872 authored by Martyn Russell's avatar Martyn Russell

build: Use AM_CPPFLAGS now INCLUDES is deprecated

parent eb9e8345
......@@ -28,7 +28,7 @@ IGNORE_HFILES = \
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
AM_CPPFLAGS = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(LIBTRACKER_CLIENT_CFLAGS)
......
......@@ -26,7 +26,7 @@ IGNORE_HFILES =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
AM_CPPFLAGS = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(LIBTRACKER_EXTRACT_CFLAGS)
......
......@@ -37,7 +37,7 @@ IGNORE_HFILES= \
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
AM_CPPFLAGS = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(LIBTRACKER_MINER_CFLAGS)
......
......@@ -26,7 +26,7 @@ IGNORE_HFILES =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
AM_CPPFLAGS = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(LIBTRACKER_SPARQL_CFLAGS)
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
noinst_PROGRAMS = ontology-graph ttl2sgml
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-I$(top_srcdir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
$(LIBTRACKER_SPARQL_CFLAGS)
......
......@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
module_flags = -module -avoid-version -no-undefined
modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-I$(top_srcdir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-DSHAREDIR=\""$(datadir)"\"
......
......@@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.decl
modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
INCLUDES = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
$(LIBTRACKER_BUS_CFLAGS)
modules_LTLIBRARIES = libtracker-bus.la
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" \
-I$(top_srcdir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-I$(top_srcdir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-I$(top_srcdir)/src \
......
......@@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.decl
modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
INCLUDES = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
$(LIBTRACKER_DIRECT_CFLAGS)
modules_LTLIBRARIES = libtracker-direct.la
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-I$(top_srcdir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-DNDEBUG \
......
......@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.decl
# $(libtracker_miner_monitor_sources)
include Makefile-shared-sources.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\" \
......@@ -69,7 +69,7 @@ libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \
libtracker_miner_@TRACKER_API_VERSION@_la_LIBADD += \
$(GNOME_KEYRING_LIBS)
INCLUDES += \
AM_CPPFLAGS += \
$(GNOME_KEYRING_CFLAGS)
else
libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \
......@@ -83,7 +83,7 @@ libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \
libtracker_miner_@TRACKER_API_VERSION@_la_LIBADD += \
$(NETWORK_MANAGER_LIBS)
INCLUDES += \
AM_CPPFLAGS += \
$(NETWORK_MANAGER_CFLAGS)
else
libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSPARQL_MODULES_DIR=\""$(modulesdir)"\" \
-I$(top_srcdir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
......@@ -33,7 +33,7 @@ tracker_miner_fs_LDADD = \
$(TRACKER_MINER_FS_LIBS)
if HAVE_MEEGOTOUCH
INCLUDES += $(MEEGOTOUCH_CFLAGS)
AM_CPPFLAGS += $(MEEGOTOUCH_CFLAGS)
tracker_miner_fs_SOURCES += tracker-miner-applications-meego.cpp
tracker_miner_fs_LDADD += $(MEEGOTOUCH_LIBS)
endif
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" \
-I$(top_srcdir)/src \
......
......@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
module_flags = -module -avoid-version -no-undefined
modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......@@ -12,7 +12,7 @@ INCLUDES = \
$(TRACKER_EXTRACT_CFLAGS)
if HAVE_LIBSTREAMANALYZER
INCLUDES += $(LIBSTREAMANALYZER_CFLAGS)
AM_CPPFLAGS += $(LIBSTREAMANALYZER_CFLAGS)
endif
# NOTE:
......@@ -211,7 +211,7 @@ libextract_msoffice_la_LIBADD = \
# PDF
libextract_pdf_la_SOURCES = tracker-extract-pdf.cpp
libextract_pdf_la_CPPFLAGS = $(POPPLER_CFLAGS)
libextract_pdf_la_CXXFLAGS = $(POPPLER_CFLAGS)
libextract_pdf_la_LDFLAGS = $(module_flags)
libextract_pdf_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \
......@@ -333,8 +333,6 @@ tracker_extract_SOURCES = \
tracker-main.h \
tracker-albumart-generic.h
tracker_extract_CFLAGS =
tracker_extract_LDADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
......@@ -343,6 +341,8 @@ tracker_extract_LDADD = \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_LIBS)
tracker_extract_CFLAGS = $(AM_CPPFLAGS)
if HAVE_LIBGSF
tracker_extract_SOURCES += tracker-gsf.c tracker-gsf.h
tracker_extract_CFLAGS += $(LIBGSF_CFLAGS)
......@@ -356,12 +356,12 @@ endif
if HAVE_GDKPIXBUF
tracker_extract_SOURCES += tracker-albumart-pixbuf.c
tracker_extract_CFLAGS += $(GDKPIXBUF_CFLAGS)
tracker_extract_CPPFLAGS = $(GDKPIXBUF_CFLAGS)
tracker_extract_LDADD += $(GDKPIXBUF_LIBS)
else
if HAVE_QT
INCLUDES += $(QT_CFLAGS)
tracker_extract_SOURCES += tracker-albumart-qt.cpp
tracker_extract_CPPFLAGS = $(QT_CFLAGS)
tracker_extract_LDADD += $(QT_LIBS)
else
tracker_extract_SOURCES += tracker-albumart-dummy.c
......
......@@ -9,7 +9,7 @@ desktop_DATA = tracker-preferences.desktop
pkgdata_DATA = tracker-preferences.ui
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" \
-I$(top_srcdir)/src \
......
......@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
module_flags = -module -avoid-version -no-undefined
modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/writeback-modules
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
noinst_LTLIBRARIES = libtracker-testcommon.la
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD) \
-DTEST_TEXT=\""$(top_srcdir)"/tests/libtracker-common/non-utf8.txt\" \
$(LIBTRACKER_COMMON_CFLAGS)
......
......@@ -10,7 +10,7 @@ noinst_PROGRAMS = \
test-class-signal-performance \
test-update-array-performance
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
......@@ -5,7 +5,7 @@ noinst_PROGRAMS = $(TEST_PROGS)
TEST_PROGS += \
tracker-test
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/common \
......
......@@ -8,7 +8,7 @@ TEST_PROGS += \
tracker-file-utils \
tracker-utils
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/common \
......
......@@ -33,7 +33,7 @@ TEST_PROGS += \
tracker-db-journal \
tracker-db-dbus
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DTOP_SRCDIR=\"$(abs_top_srcdir)\" \
-DTOP_BUILDDIR=\"$(abs_top_builddir)\" \
......
......@@ -6,7 +6,7 @@ TEST_PROGS += \
tracker-test-utils \
tracker-test-xmp
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
......@@ -12,7 +12,7 @@ TEST_PROGS += \
tracker-fts-test \
tracker-parser-test
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
......@@ -14,7 +14,7 @@ TEST_PROGS += \
tracker-thumbnailer-test \
tracker-monitor-test
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-DTEST \
-DLIBEXEC_PATH=\""$(libexecdir)"\" \
......
......@@ -5,7 +5,7 @@ noinst_PROGRAMS = $(TEST_PROGS)
TEST_PROGS += \
tracker-test
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
......@@ -5,7 +5,7 @@ noinst_PROGRAMS = $(TEST_PROGS)
TEST_PROGS += \
tracker-test
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
noinst_PROGRAMS = playlist2ttl
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
$(TOTEM_PL_PARSER_CFLAGS)
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
noinst_PROGRAMS = ontology-validator data-validator
INCLUDES = \
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
......
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