wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #26 from infirit/master 

Make automake happy: INCLUDES -> AM_CPPFLAGS
This commit is contained in:
Stefano Karapetsas 2013-08-03 01:48:25 -07:00
parent d5249f5fe6 06ae9932b0
commit 8e0336cb25
16 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin-loaders/c/Makefile.am
View File

@ -2,7 +2,7 @@
loaderdir = $(libdir)/pluma/plugin-loaders loaderdir = $(libdir)/pluma/plugin-loaders
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
plugin-loaders/python/Makefile.am
View File

@ -3,7 +3,7 @@
SUBDIRS = bindings SUBDIRS = bindings
loaderdir = $(libdir)/pluma/plugin-loaders loaderdir = $(libdir)/pluma/plugin-loaders
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir)/pluma \ -I$(top_srcdir)/pluma \

2
plugins/changecase/Makefile.am
View File

@ -1,7 +1,7 @@
# changecase plugin # changecase plugin
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
plugins/checkupdate/Makefile.am
View File

@ -2,7 +2,7 @@
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(LIBSOUP_CFLAGS) \ $(LIBSOUP_CFLAGS) \

2
plugins/docinfo/Makefile.am
View File

@ -1,7 +1,7 @@
# docinfo plugin # docinfo plugin
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
plugins/filebrowser/Makefile.am
View File

@ -2,7 +2,7 @@
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
plugins/modelines/Makefile.am
View File

@ -1,7 +1,7 @@
# Modelines Plugin # Modelines Plugin
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
plugins/sort/Makefile.am
View File

@ -1,7 +1,7 @@
# sort plugin # sort plugin
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
plugins/spell/Makefile.am
View File

@ -1,7 +1,7 @@
# Spell checker plugin # Spell checker plugin
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(ENCHANT_CFLAGS) \ $(ENCHANT_CFLAGS) \

2
plugins/taglist/Makefile.am
View File

@ -11,7 +11,7 @@ taglist_in_files = \
taglist_DATA = $(taglist_in_files:.tags.xml.in=.tags.gz) taglist_DATA = $(taglist_in_files:.tags.xml.in=.tags.gz)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
plugins/time/Makefile.am
View File

@ -1,7 +1,7 @@
# time plugin # time plugin
plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \

2
pluma/Makefile.am
View File

@ -9,7 +9,7 @@ bin_PROGRAMS = pluma
noinst_LTLIBRARIES = libpluma.la noinst_LTLIBRARIES = libpluma.la
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(srcdir) \ -I$(srcdir) \
-I$(srcdir)/smclient \ -I$(srcdir)/smclient \

2
pluma/dialogs/Makefile.am
View File

@ -1,6 +1,6 @@
uidir = $(datadir)/pluma/ui/ uidir = $(datadir)/pluma/ui/
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir)/pluma \ -I$(top_srcdir)/pluma \

2
pluma/osx/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir)/pluma \ -I$(top_srcdir)/pluma \

2
pluma/smclient/Makefile.am
View File

@ -14,7 +14,7 @@ platform_sources = eggsmclient-xsmp.c
endif endif
endif endif
INCLUDES = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\""EggSMClient"\" \ -DG_LOG_DOMAIN=\""EggSMClient"\" \
$(PLUMA_CFLAGS) \ $(PLUMA_CFLAGS) \
$(platform_defines) \ $(platform_defines) \

2
tests/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/pluma $(PLUMA_DEBUG_FLAGS) $(PLUMA_CFLAGS) AM_CPPFLAGS = -g -I$(top_srcdir) -I$(top_srcdir)/pluma $(PLUMA_DEBUG_FLAGS) $(PLUMA_CFLAGS)
noinst_PROGRAMS = $(TEST_PROGS) noinst_PROGRAMS = $(TEST_PROGS)
progs_ldadd = $(top_builddir)/pluma/libpluma.la progs_ldadd = $(top_builddir)/pluma/libpluma.la