make all includes contrib/largeNbDicts

diff --git a/Makefile b/Makefile
index 853ceee932571fb3161467db2fcce41e80f4311b..45ab20fd8e12c30f05c9040e044384cf47b93240 100644 (file)
--- 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 f4b060ae0aaf492070f631e412bcaf672bbe9542..0f8dbb3a06b6edfa2419cf951e5423f0703c9df3 100644 (file)
--- 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