From a5a77965d3397dd15a4f8d59a52ac574942c8c95 Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Wed, 29 Aug 2018 16:17:22 -0700
Subject: [PATCH] make all includes contrib/largeNbDicts

---
 Makefile                      | 1 +
 contrib/largeNbDicts/Makefile | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 853ceee93..45ab20fd8 100644
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,7 @@ contrib: lib
 	$(MAKE) -C contrib/pzstd all
 	$(MAKE) -C contrib/seekable_format/examples all
 	$(MAKE) -C contrib/adaptive-compression all
+	$(MAKE) -C contrib/largeNbDicts all
 
 .PHONY: cleanTabs
 cleanTabs:
diff --git a/contrib/largeNbDicts/Makefile b/contrib/largeNbDicts/Makefile
index f4b060ae0..0f8dbb3a0 100644
--- a/contrib/largeNbDicts/Makefile
+++ b/contrib/largeNbDicts/Makefile
@@ -10,6 +10,8 @@
 PROGDIR = ../../programs
 LIBDIR  = ../../lib
 
+LIBZSTD = $(LIBDIR)/libzstd.a
+
 CPPFLAGS+= -I$(LIBDIR) -I$(LIBDIR)/common -I$(LIBDIR)/dictBuilder -I$(PROGDIR)
 
 CFLAGS  ?= -O3
@@ -25,10 +27,13 @@ default: largeNbDicts
 
 all : largeNbDicts
 
-largeNbDicts: LDFLAGS += -lzstd
-largeNbDicts: bench.o datagen.o xxhash.o largeNbDicts.c
+largeNbDicts: bench.o datagen.o xxhash.o $(LIBZSTD) largeNbDicts.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) -o $@
 
+.PHONY: $(LIBZSTD)
+$(LIBZSTD):
+	$(MAKE) -C $(LIBDIR) libzstd.a
+
 bench.o  : $(PROGDIR)/bench.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -c