From e872bee3a6b5d61b6f70245f16d3faa47566d138 Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Sun, 28 Jun 2015 13:45:31 +0530 Subject: [PATCH 190/190] feature/performace: Fix broken build Fix the build broken because of upstream patch http://review.gluster.org/#/c/9822/ and corresponding downstream patch https://code.engineering.redhat.com/gerrit/51256 BUG: 1231784 Change-Id: Ie172bc0b5c6a9f8feb94c58df82d1fe1b87f2c0e Reviewed-On: http://review.gluster.org/11451 Signed-off-by: Kotresh HR Reviewed-on: https://code.engineering.redhat.com/gerrit/51768 Reviewed-by: Raghavendra Gowdappa Tested-by: Raghavendra Gowdappa --- xlators/performance/io-cache/src/Makefile.am | 2 +- xlators/performance/io-threads/src/Makefile.am | 2 +- xlators/performance/md-cache/src/Makefile.am | 2 +- xlators/performance/open-behind/src/Makefile.am | 2 +- xlators/performance/quick-read/src/Makefile.am | 2 +- xlators/performance/read-ahead/src/Makefile.am | 2 +- xlators/performance/readdir-ahead/src/Makefile.am | 2 +- xlators/performance/symlink-cache/src/Makefile.am | 2 ++ xlators/performance/write-behind/src/Makefile.am | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am index 155be99..2176ea7 100644 --- a/xlators/performance/io-cache/src/Makefile.am +++ b/xlators/performance/io-cache/src/Makefile.am @@ -6,7 +6,7 @@ io_cache_la_LDFLAGS = -module -avoid-version io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = io-cache.h ioc-mem-types.h +noinst_HEADERS = io-cache.h ioc-mem-types.h io-cache-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(CONTRIBDIR)/rbtree diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am index d63042e..36a7331 100644 --- a/xlators/performance/io-threads/src/Makefile.am +++ b/xlators/performance/io-threads/src/Makefile.am @@ -6,7 +6,7 @@ io_threads_la_LDFLAGS = -module -avoid-version io_threads_la_SOURCES = io-threads.c io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = io-threads.h iot-mem-types.h +noinst_HEADERS = io-threads.h iot-mem-types.h io-threads-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am index 6f3d68b..8260b2b 100644 --- a/xlators/performance/md-cache/src/Makefile.am +++ b/xlators/performance/md-cache/src/Makefile.am @@ -6,7 +6,7 @@ md_cache_la_LDFLAGS = -module -avoid-version md_cache_la_SOURCES = md-cache.c md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = md-cache-mem-types.h +noinst_HEADERS = md-cache-mem-types.h md-cache-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(CONTRIBDIR)/rbtree diff --git a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am index 1252857..eb6dfb1 100644 --- a/xlators/performance/open-behind/src/Makefile.am +++ b/xlators/performance/open-behind/src/Makefile.am @@ -6,7 +6,7 @@ open_behind_la_LDFLAGS = -module -avoid-version open_behind_la_SOURCES = open-behind.c open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = open-behind-mem-types.h +noinst_HEADERS = open-behind-mem-types.h open-behind-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am index 4906f40..6344aaf 100644 --- a/xlators/performance/quick-read/src/Makefile.am +++ b/xlators/performance/quick-read/src/Makefile.am @@ -6,7 +6,7 @@ quick_read_la_LDFLAGS = -module -avoid-version quick_read_la_SOURCES = quick-read.c quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = quick-read.h quick-read-mem-types.h +noinst_HEADERS = quick-read.h quick-read-mem-types.h quick-read-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src diff --git a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am index be80ae7..56823b3 100644 --- a/xlators/performance/read-ahead/src/Makefile.am +++ b/xlators/performance/read-ahead/src/Makefile.am @@ -6,7 +6,7 @@ read_ahead_la_LDFLAGS = -module -avoid-version read_ahead_la_SOURCES = read-ahead.c page.c read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = read-ahead.h read-ahead-mem-types.h +noinst_HEADERS = read-ahead.h read-ahead-mem-types.h read-ahead-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src diff --git a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am index 539d6ed..70525f4 100644 --- a/xlators/performance/readdir-ahead/src/Makefile.am +++ b/xlators/performance/readdir-ahead/src/Makefile.am @@ -6,7 +6,7 @@ readdir_ahead_la_LDFLAGS = -module -avoid-version readdir_ahead_la_SOURCES = readdir-ahead.c readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = readdir-ahead.h readdir-ahead-mem-types.h +noinst_HEADERS = readdir-ahead.h readdir-ahead-mem-types.h readdir-ahead-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src diff --git a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am index 4091c32..4be8968 100644 --- a/xlators/performance/symlink-cache/src/Makefile.am +++ b/xlators/performance/symlink-cache/src/Makefile.am @@ -6,6 +6,8 @@ symlink_cache_la_LDFLAGS = -module -avoid-version symlink_cache_la_SOURCES = symlink-cache.c symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +noinst_HEADERS = symlink-cache-messages.h + AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src AM_CFLAGS = -Wall $(GF_CFLAGS) diff --git a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am index 6c829d8..8f2b664 100644 --- a/xlators/performance/write-behind/src/Makefile.am +++ b/xlators/performance/write-behind/src/Makefile.am @@ -6,7 +6,7 @@ write_behind_la_LDFLAGS = -module -avoid-version write_behind_la_SOURCES = write-behind.c write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = write-behind-mem-types.h +noinst_HEADERS = write-behind-mem-types.h write-behind-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -- 1.7.1