From 8bd4e5824246f3b9eb070664c29047d79b075529 Mon Sep 17 00:00:00 2001 From: Stefan Eilemann Date: Fri, 2 May 2014 14:10:48 +0200 Subject: [PATCH] Fix out of source builds Signed-off-by: Stefan Eilemann --- src/erasure-code/jerasure/Makefile.am | 26 +++++++++++++------------- src/rgw/Makefile.am | 3 +-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am index e16fe07af29d1..9c31336cdee72 100644 --- a/src/erasure-code/jerasure/Makefile.am +++ b/src/erasure-code/jerasure/Makefile.am @@ -34,11 +34,11 @@ jerasure_sources = \ libec_jerasure_generic_la_SOURCES = ${jerasure_sources} libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include + -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ + -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include + -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ + -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 if LINUX @@ -53,15 +53,15 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \ ${INTEL_SSE2_FLAGS} \ ${INTEL_SSE3_FLAGS} \ ${INTEL_SSSE3_FLAGS} \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include + -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ + -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ ${INTEL_SSE_FLAGS} \ ${INTEL_SSE2_FLAGS} \ ${INTEL_SSE3_FLAGS} \ ${INTEL_SSSE3_FLAGS} \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include + -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ + -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 if LINUX @@ -78,8 +78,8 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS} \ ${INTEL_SSSE3_FLAGS} \ ${INTEL_SSE4_1_FLAGS} \ ${INTEL_SSE4_2_FLAGS} \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include + -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ + -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ ${INTEL_SSE_FLAGS} \ ${INTEL_SSE2_FLAGS} \ @@ -87,8 +87,8 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ ${INTEL_SSSE3_FLAGS} \ ${INTEL_SSE4_1_FLAGS} \ ${INTEL_SSE4_2_FLAGS} \ - -Ierasure-code/jerasure/gf-complete/include \ - -Ierasure-code/jerasure/jerasure/include + -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ + -I$(srcdir)/erasure-code/jerasure/jerasure/include libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 if LINUX @@ -99,7 +99,7 @@ erasure_codelib_LTLIBRARIES += libec_jerasure_sse4.la libec_jerasure_la_SOURCES = \ erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc -libec_jerasure_la_CFLAGS = ${AM_CFLAGS} +libec_jerasure_la_CFLAGS = ${AM_CFLAGS} libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS} libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am index b93af6d3867ec..f31ded37eeeba 100644 --- a/src/rgw/Makefile.am +++ b/src/rgw/Makefile.am @@ -73,7 +73,7 @@ radosgw_SOURCES = \ rgw/rgw_civetweb.cc \ civetweb/src/civetweb.c \ rgw/rgw_main.cc -radosgw_CFLAGS = -Icivetweb/include +radosgw_CFLAGS = -I$(srcdir)/civetweb/include radosgw_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL) bin_PROGRAMS += radosgw @@ -160,4 +160,3 @@ noinst_HEADERS += \ civetweb/civetweb.h \ civetweb/include/civetweb.h \ civetweb/src/md5.h - -- 2.39.5