diff options
Diffstat (limited to 'xlators/experimental')
| -rw-r--r-- | xlators/experimental/dht2/dht2-client/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/experimental/dht2/dht2-server/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/experimental/fdl/src/Makefile.am | 11 | ||||
| -rw-r--r-- | xlators/experimental/jbr-client/src/Makefile.am | 12 | ||||
| -rw-r--r-- | xlators/experimental/jbr-server/src/Makefile.am | 12 | ||||
| -rw-r--r-- | xlators/experimental/posix2/common/src/Makefile.am | 5 | ||||
| -rw-r--r-- | xlators/experimental/posix2/ds/src/Makefile.am | 4 | ||||
| -rw-r--r-- | xlators/experimental/posix2/mds/src/Makefile.am | 4 |
8 files changed, 32 insertions, 20 deletions
diff --git a/xlators/experimental/dht2/dht2-client/src/Makefile.am b/xlators/experimental/dht2/dht2-client/src/Makefile.am index 39132994d08..a16b9df2f76 100644 --- a/xlators/experimental/dht2/dht2-client/src/Makefile.am +++ b/xlators/experimental/dht2/dht2-client/src/Makefile.am @@ -14,6 +14,8 @@ AM_CFLAGS = -Wall $(GF_CFLAGS) AM_CPPFLAGS = $(GF_CPPFLAGS) AM_CPPFLAGS += -I$(top_srcdir)/xlators/experimental/dht2/dht2-common/src/ AM_CPPFLAGS += -I$(top_srcdir)/libglusterfs/src +AM_CPPFLAGS += -I$(top_srcdir)/rpc/xdr/src +AM_CPPFLAGS += -I$(top_builddir)/rpc/xdr/src AM_CPPFLAGS += -I$(top_srcdir)/xlators/lib/src CLEANFILES = diff --git a/xlators/experimental/dht2/dht2-server/src/Makefile.am b/xlators/experimental/dht2/dht2-server/src/Makefile.am index 4f721551020..808c724ec9e 100644 --- a/xlators/experimental/dht2/dht2-server/src/Makefile.am +++ b/xlators/experimental/dht2/dht2-server/src/Makefile.am @@ -14,6 +14,8 @@ AM_CFLAGS = -Wall $(GF_CFLAGS) AM_CPPFLAGS = $(GF_CPPFLAGS) AM_CPPFLAGS += -I$(top_srcdir)/xlators/experimental/dht2/dht2-common/src/ AM_CPPFLAGS += -I$(top_srcdir)/libglusterfs/src +AM_CPPFLAGS += -I$(top_srcdir)/rpc/xdr/src +AM_CPPFLAGS += -I$(top_builddir)/rpc/xdr/src AM_CPPFLAGS += -I$(top_srcdir)/xlators/lib/src CLEANFILES = diff --git a/xlators/experimental/fdl/src/Makefile.am b/xlators/experimental/fdl/src/Makefile.am index aed0204284f..9ec9d4f06ff 100644 --- a/xlators/experimental/fdl/src/Makefile.am +++ b/xlators/experimental/fdl/src/Makefile.am @@ -11,19 +11,20 @@ sbin_PROGRAMS = gf_logdump gf_recon gf_logdump_SOURCES = logdump.c nodist_gf_logdump_SOURCES = libfdl.c gf_logdump_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\ - $(top_builddir)/api/src/libgfapi.la + $(top_builddir)/api/src/libgfapi.la # Eventually recon(ciliation) code will move elsewhere, but for now it's # easier to have it next to the similar logdump code. gf_recon_SOURCES = recon.c nodist_gf_recon_SOURCES = librecon.c gf_recon_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\ - $(top_builddir)/api/src/libgfapi.la + $(top_builddir)/api/src/libgfapi.la AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ - -I$(top_srcdir)/api/src -fPIC \ - -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \ - -DDATADIR=\"$(localstatedir)\" + -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ + -I$(top_srcdir)/api/src -fPIC \ + -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \ + -DDATADIR=\"$(localstatedir)\" AM_CFLAGS = -Wall $(GF_CFLAGS) diff --git a/xlators/experimental/jbr-client/src/Makefile.am b/xlators/experimental/jbr-client/src/Makefile.am index 58f399f0607..a20c9944b92 100644 --- a/xlators/experimental/jbr-client/src/Makefile.am +++ b/xlators/experimental/jbr-client/src/Makefile.am @@ -7,13 +7,13 @@ CLEANFILES = $(nodist_jbrc_la_SOURCES) jbrc_la_LDFLAGS = -module -avoid-version jbrc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = \ - $(top_srcdir)/xlators/lib/src/libxlator.h \ - $(top_srcdir)/glusterfsd/src/glusterfsd.h \ - jbrc.h jbr-messages.h +noinst_HEADERS = $(top_srcdir)/xlators/lib/src/libxlator.h \ + $(top_srcdir)/glusterfsd/src/glusterfsd.h \ + jbrc.h jbr-messages.h -AM_CPPFLAGS = $(GF_CPPFLAGS) \ - -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src \ +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ + -I$(top_srcdir)/xlators/lib/src \ + -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ -I$(top_srcdir)/rpc/rpc-lib/src AM_CFLAGS = -Wall $(GF_CFLAGS) diff --git a/xlators/experimental/jbr-server/src/Makefile.am b/xlators/experimental/jbr-server/src/Makefile.am index 66f73ba8c96..5d6209d709a 100644 --- a/xlators/experimental/jbr-server/src/Makefile.am +++ b/xlators/experimental/jbr-server/src/Makefile.am @@ -12,12 +12,12 @@ noinst_HEADERS = jbr-internal.h \ $(top_srcdir)/xlators/lib/src/libxlator.h \ $(top_srcdir)/glusterfsd/src/glusterfsd.h -AM_CPPFLAGS = $(GF_CPPFLAGS) \ - -I$(top_srcdir)/libglusterfs/src \ - -I$(top_srcdir)/xlators/lib/src \ - -I$(top_srcdir)/rpc/rpc-lib/src -DSBIN_DIR=\"$(sbindir)\" \ - -I$(top_srcdir)/api/src -DJBR_SCRIPT_PREFIX=\"$(jbrdir)\" \ - -I$(top_srcdir)/xlators/experimental/jbr-client/src/ +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ + -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ + -I$(top_srcdir)/xlators/lib/src -I$(top_srcdir)/rpc/rpc-lib/src \ + -DSBIN_DIR=\"$(sbindir)\" -I$(top_srcdir)/api/src \ + -DJBR_SCRIPT_PREFIX=\"$(jbrdir)\" \ + -I$(top_srcdir)/xlators/experimental/jbr-client/src/ AM_CFLAGS = -Wall $(GF_CFLAGS) diff --git a/xlators/experimental/posix2/common/src/Makefile.am b/xlators/experimental/posix2/common/src/Makefile.am index 465f2f2ba32..07533d2bf37 100644 --- a/xlators/experimental/posix2/common/src/Makefile.am +++ b/xlators/experimental/posix2/common/src/Makefile.am @@ -9,5 +9,8 @@ libposix2common_la_CFLAGS = -Wall $(GF_CFLAGS) libposix2common_la_CPPFLAGS = $(GF_CPPFLAGS) libposix2common_la_CPPFLAGS += -I$(top_srcdir)/libglusterfs/src +libposix2common_la_CPPFLAGS += -I$(top_srcdir)/rpc/xdr/src +libposix2common_la_CPPFLAGS += -I$(top_builddir)/rpc/xdr/src -CLEANFILES =
\ No newline at end of file + +CLEANFILES = diff --git a/xlators/experimental/posix2/ds/src/Makefile.am b/xlators/experimental/posix2/ds/src/Makefile.am index d29c5e135a2..7b9e2739fc8 100644 --- a/xlators/experimental/posix2/ds/src/Makefile.am +++ b/xlators/experimental/posix2/ds/src/Makefile.am @@ -14,5 +14,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) AM_CPPFLAGS += -I$(top_srcdir)/xlators/storage/posix2/common/src AM_CPPFLAGS += -I$(top_srcdir)/libglusterfs/src AM_CPPFLAGS += -I$(top_srcdir)/xlators/lib/src +AM_CPPFLAGS += -I$(top_srcdir)/rpc/xdr/src +AM_CPPFLAGS += -I$(top_builddir)/rpc/xdr/src -CLEANFILES =
\ No newline at end of file +CLEANFILES = diff --git a/xlators/experimental/posix2/mds/src/Makefile.am b/xlators/experimental/posix2/mds/src/Makefile.am index ddd49ef0012..fce1871b01a 100644 --- a/xlators/experimental/posix2/mds/src/Makefile.am +++ b/xlators/experimental/posix2/mds/src/Makefile.am @@ -14,5 +14,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) AM_CPPFLAGS += -I$(top_srcdir)/xlators/storage/posix2/common/src AM_CPPFLAGS += -I$(top_srcdir)/libglusterfs/src AM_CPPFLAGS += -I$(top_srcdir)/xlators/lib/src +AM_CPPFLAGS += -I$(top_srcdir)/rpc/xdr/src +AM_CPPFLAGS += -I$(top_builddir)/rpc/xdr/src -CLEANFILES =
\ No newline at end of file +CLEANFILES = |