From: Nick Terrell <terrelln@fb.com>
Date: Fri, 2 Sep 2016 04:12:39 +0000 (-0700)
Subject: Put libzstd last
X-Git-Tag: v1.1.0~80^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F327%2Fhead;p=thirdparty%2Fzstd.git

Put libzstd last
---

diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
index 2ef10b6ef..6f9231b2a 100644
--- a/contrib/pzstd/Makefile
+++ b/contrib/pzstd/Makefile
@@ -54,7 +54,7 @@ Options.o: Options.h Options.cpp
 main.o: main.cpp *.h utils/*.h
 	$(CXX) $(FLAGS) -c main.cpp -o $@
 
-pzstd: libzstd.a Pzstd.o SkippableFrame.o Options.o main.o
+pzstd: Pzstd.o SkippableFrame.o Options.o main.o libzstd.a 
 	$(CXX) $(FLAGS) $^ -o $@$(EXT)
 
 googletest:
diff --git a/contrib/pzstd/test/Makefile b/contrib/pzstd/test/Makefile
index 730938041..5fd167d18 100644
--- a/contrib/pzstd/test/Makefile
+++ b/contrib/pzstd/test/Makefile
@@ -33,7 +33,7 @@ datagen.o: $(PROGDIR)/datagen.*
 	$(CXX) $(FLAGS) $(PROGDIR)/datagen.c -c -o $@
 
 %: %.cpp *.h datagen.o
-	$(CXX) $(FLAGS) $@.cpp datagen.o $(PZSTDDIR)/libzstd.a $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o -o $@$(EXT) -lgtest -lgtest_main -lpthread
+	$(CXX) $(FLAGS) $@.cpp datagen.o $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o $(PZSTDDIR)/libzstd.a -o $@$(EXT) -lgtest -lgtest_main -lpthread
 
 .PHONY: test clean