diff options
| author | raveit <[email protected]> | 2013-03-25 18:59:34 +0100 |
|---|---|---|
| committer | raveit <[email protected]> | 2013-03-25 18:59:34 +0100 |
| commit | ecf6b71751f1bdbacff7f29ddd36f44802d53662 (patch) | |
| tree | 653a11a58b90b7b205ac788e2a16affd43db0e74 | |
| parent | 48f3a7a953bce309a4d176415bc5d9558319a548 (diff) | |
| download | mate-control-center-ecf6b71751f1bdbacff7f29ddd36f44802d53662.tar.bz2 mate-control-center-ecf6b71751f1bdbacff7f29ddd36f44802d53662.tar.xz | |
change INCLUDES to AM_CPPFLAGS for automake-1.13
| -rw-r--r-- | capplets/about-me/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/accessibility/at-properties/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/appearance/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/common/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/default-applications/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/display/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/keybindings/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/keyboard/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/mouse/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/network/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/windows/Makefile.am | 2 | ||||
| -rw-r--r-- | font-viewer/Makefile.am | 2 | ||||
| -rw-r--r-- | libslab/Makefile.am | 2 | ||||
| -rw-r--r-- | libwindow-settings/Makefile.am | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am index 8249a385..126dcdd4 100644 --- a/capplets/about-me/Makefile.am +++ b/capplets/about-me/Makefile.am @@ -41,7 +41,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) uidir = $(pkgdatadir)/ui ui_DATA = $(ui_files) -INCLUDES = \ +AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ $(LIBEBOOK_CFLAGS) \ -DDATADIR="\"$(datadir)\"" \ diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index c24d0181..ecff71a1 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -19,7 +19,7 @@ pixmap_DATA = \ uidir = $(pkgdatadir)/ui ui_DATA = at-enable-dialog.ui -INCLUDES = $(AT_CAPPLET_CFLAGS) \ +AM_CPPFLAGS = $(AT_CAPPLET_CFLAGS) \ $(MATECC_CAPPLETS_CFLAGS) \ -DUIDIR=\""$(uidir)"\" \ -DPIXMAPDIR=\""$(pixmapdir)"\" \ diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am index 293c01ea..c28d3815 100644 --- a/capplets/appearance/Makefile.am +++ b/capplets/appearance/Makefile.am @@ -45,7 +45,7 @@ gtkbuilderdir = $(pkgdatadir)/ui pixmapdir = $(pkgdatadir)/pixmaps wallpaperdir = $(datadir)/mate-background-properties -INCLUDES = \ +AM_CPPFLAGS = \ $(MARCO_CFLAGS) \ $(MATECC_CAPPLETS_CFLAGS) \ $(FONT_CAPPLET_CFLAGS) \ diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am index 83faa3a7..e9cb41dd 100644 --- a/capplets/common/Makefile.am +++ b/capplets/common/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = -INCLUDES = \ +AM_CPPFLAGS = \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DGTK_ENGINE_DIR="\"$(GTK_ENGINE_DIR)\"" \ diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 1b70aa5d..c4c49cdc 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -19,7 +19,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = mate-default-applications.pc -INCLUDES = \ +AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ $(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \ -DMATELOCALEDIR=\""$(datadir)/locale"\"\ diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index 70f417c7..972f271d 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -51,7 +51,7 @@ desktopdir = $(datadir)/applications Desktop_in_files = display-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) -INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \ +AM_CPPFLAGS = $(DISPLAY_CAPPLET_CFLAGS) \ $(MATECC_CAPPLETS_CFLAGS) \ -DSBINDIR="\"$(sbindir)\"" \ -DUIDIR="\"$(uidir)\"" \ diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index e15c07f0..e6e6e0ba 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -29,7 +29,7 @@ xml_DATA = $(xml_in_files:.xml.in=.xml) pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = mate-keybindings.pc -INCLUDES = \ +AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index 5705b01f..58cbb1ae 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -30,7 +30,7 @@ desktopdir = $(datadir)/applications Desktop_in_files = keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) -INCLUDES = \ +AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ $(LIBMATEKBDUI_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index c3aa4fc6..72d10297 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -22,7 +22,7 @@ desktopdir = $(datadir)/applications Desktop_in_files = mate-settings-mouse.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) -INCLUDES = \ +AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index 823dfc48..6ec1e224 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -28,7 +28,7 @@ desktopdir = $(datadir)/applications desktop_in_files = mate-network-properties.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -INCLUDES = \ +AM_CPPFLAGS = \ $(MATECC_CAPPLETS_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_UI_DIR="\"$(uidir)\"" diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index a88ad37a..ff357371 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -18,7 +18,7 @@ desktopdir = $(datadir)/applications Desktop_in_files = window-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) -INCLUDES = $(MATECC_CAPPLETS_CFLAGS) \ +AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \ -I$(top_srcdir)/libwindow-settings \ -DMATE_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ -DUIDIR=\""$(uidir)"\" \ diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am index cd941e8c..8ea64917 100644 --- a/font-viewer/Makefile.am +++ b/font-viewer/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = $(FONT_VIEWER_CFLAGS) $(MATECC_CAPPLETS_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \ +AM_CPPFLAGS = $(FONT_VIEWER_CFLAGS) $(MATECC_CAPPLETS_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \ -DMATELOCALEDIR=\"$(datadir)/locale\" bin_PROGRAMS = mate-thumbnail-font mate-font-viewer diff --git a/libslab/Makefile.am b/libslab/Makefile.am index 00ec6fb0..95e42237 100644 --- a/libslab/Makefile.am +++ b/libslab/Makefile.am @@ -1,7 +1,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libslab.pc -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(LIBSLAB_CFLAGS) \ $(WARN_CFLAGS) diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am index c111cc22..f745a43b 100644 --- a/libwindow-settings/Makefile.am +++ b/libwindow-settings/Makefile.am @@ -1,6 +1,6 @@ WM_MODULE_DIR=$(libdir)/window-manager-settings -INCLUDES = \ +AM_CPPFLAGS = \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATE_ICONDIR=\""$(datadir)/pixmaps"\" \ -DG_LOG_DOMAIN=\"capplet-common\" \ |