From 2ebe1cf7329107949f3a5b17a9e53f32accf13c1 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Thu, 1 Sep 2016 21:12:39 -0700 Subject: [PATCH] Put libzstd last --- contrib/pzstd/Makefile | 2 +- contrib/pzstd/test/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.47.2