From ed8e46ae6a9f32a8e49c69a14b81acbcef3928b1 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Mon, 23 Apr 2018 16:31:15 +0100
Subject: Simplify Makevars file

Removed explicitly building the static
library. Hopefully more robust against
parallel makes.
---
 src/Makevars | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/Makevars b/src/Makevars
index 7ad378d..7576a24 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,6 +1,6 @@
 PKG_CFLAGS = -DCOLUMN_MAJOR_ORDER -DVERSION=0.2.1
 PKG_CPPFLAGS = -Igensvm/include/
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -Lgensvm/lib -lgensvm
+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 SOURCES = \
 	gensvm/src/gensvm_base.c \
@@ -34,23 +34,14 @@ SOURCES = \
         gensvm/src/gensvm_zv.c
 
 
-OBJECTS = gensvm_wrapper.o $(SOURCES:.c=.o) gensvm/lib/libgensvm.a
+OBJECTS = gensvm_wrapper.o $(SOURCES:.c=.o)
 
-.PHONY: all libgensvm clean
+.PHONY: all clean
 
 all: $(SHLIB)
 	mv $(SHLIB) gensvm_wrapper$(SHLIB_EXT)
 
-$(SHLIB): gensvm/lib/libgensvm.a
-
-gensvm/lib/libgensvm.a:
-	$(AR) rcs $@ $(SOURCES:.c=.o)
-
-libgensvm:
-	(cd gensvm; $(MAKE))
-
 clean:
 	rm -f $(SOURCES:.c=.o)
-	rm -f gensvm/lib/libgensvm.a
 
 shlib-clean: clean
-- 
cgit v1.2.3