[sheepdog] [PATCH v4 05/18] sheep: don't compile sheep/farm

Liu Yuan namei.unix at gmail.com
Fri May 17 10:19:18 CEST 2013


On 05/17/2013 02:27 PM, Kai Zhang wrote:
> Signed-off-by: Kai Zhang <kyle at zelin.io>
> ---
>  sheep/Makefile.am |   10 ++++------
>  1 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/sheep/Makefile.am b/sheep/Makefile.am
> index 0854cbc..f45931d 100644
> --- a/sheep/Makefile.am
> +++ b/sheep/Makefile.am
> @@ -37,22 +37,20 @@ if BUILD_ZOOKEEPER
>  sheep_SOURCES		+= cluster/zookeeper.c
>  endif
>  
> -sheep_SOURCES		+= farm/sha1_file.c farm/trunk.c farm/snap.c farm/farm.c
> -
>  if BUILD_TRACE
>  sheep_SOURCES		+= trace/trace.c trace/mcount.S trace/stabs.c trace/graph.c
>  endif
>  
> -sheep_LDADD	  	= ../lib/libsheepdog.a -lpthread -lm\
> +sheep_LDADD		= ../lib/libsheepdog.a -lpthread -lm\

What this line fixes?

>  			  $(libcpg_LIBS) $(libcfg_LIBS) $(libacrd_LIBS) $(LIBS)
>  sheep_DEPENDENCIES	= ../lib/libsheepdog.a
>  
>  
> -noinst_HEADERS		= sheep_priv.h cluster.h farm/farm.h trace/trace.h
> +noinst_HEADERS		= sheep_priv.h cluster.h trace/trace.h
>  
> -EXTRA_DIST		= 
> +EXTRA_DIST		=

ditto.

>  
> -all-local: 
> +all-local:
>  	@echo Built sheep
>  
>  clean-local:
> 

This patch should be included as the first one. For a generic rule,
every patch should be compilable. Patch [1-4] won't compile without this
patch, this should be avoided.

Thanks,
Yuan



More information about the sheepdog mailing list