diff --git a/ext/liblinear_src/blas/blas.a b/ext/liblinear_src/blas/blas.a deleted file mode 100644 index 2ef5d59..0000000 Binary files a/ext/liblinear_src/blas/blas.a and /dev/null differ diff --git a/ext/liblinear_src/blas/daxpy.o b/ext/liblinear_src/blas/daxpy.o deleted file mode 100644 index 6c0bc51..0000000 Binary files a/ext/liblinear_src/blas/daxpy.o and /dev/null differ diff --git a/ext/liblinear_src/blas/ddot.o b/ext/liblinear_src/blas/ddot.o deleted file mode 100644 index d4b86aa..0000000 Binary files a/ext/liblinear_src/blas/ddot.o and /dev/null differ diff --git a/ext/liblinear_src/blas/dnrm2.o b/ext/liblinear_src/blas/dnrm2.o deleted file mode 100644 index f7925e3..0000000 Binary files a/ext/liblinear_src/blas/dnrm2.o and /dev/null differ diff --git a/ext/liblinear_src/blas/dscal.o b/ext/liblinear_src/blas/dscal.o deleted file mode 100644 index dcf8092..0000000 Binary files a/ext/liblinear_src/blas/dscal.o and /dev/null differ diff --git a/ext/liblinear_src/linear.o b/ext/liblinear_src/linear.o deleted file mode 100644 index b7d6948..0000000 Binary files a/ext/liblinear_src/linear.o and /dev/null differ diff --git a/ext/liblinear_src/tron.o b/ext/liblinear_src/tron.o deleted file mode 100644 index 72bfee2..0000000 Binary files a/ext/liblinear_src/tron.o and /dev/null differ diff --git a/make.go b/ext/make.go similarity index 87% rename from make.go rename to ext/make.go index 24c6553..74b2551 100644 --- a/make.go +++ b/ext/make.go @@ -36,7 +36,7 @@ func main() { os.Setenv("RM", cmd_rm) log.Println("Compiling") - cmd := exec.Command(*cmd_make, "-C", "ext/liblinear_src") + cmd := exec.Command(*cmd_make, "-C", "liblinear_src") cmd.Stdout = os.Stdout err := cmd.Run() @@ -45,17 +45,17 @@ func main() { return } - os.Mkdir("ext/lib", os.ModeDir | 0777) + os.Mkdir("lib", os.ModeDir | 0777) log.Println("Installing libs") if runtime.GOOS == "windows" { - err = copyFile("ext/liblinear_src/linear.dll", "ext/lib/linear.dll") + err = copyFile("liblinear_src/linear.dll", "ext/lib/linear.dll") if err != nil { log.Println(err.Error()) return } } else { - err = copyFile("ext/liblinear_src/liblinear.so", "ext/lib/liblinear.so") + err = copyFile("liblinear_src/liblinear.so", "ext/lib/liblinear.so") if err != nil { log.Println(err.Error()) return @@ -63,9 +63,9 @@ func main() { } log.Println("Cleaning") - exec.Command(*cmd_make, "-C", "ext/liblinear_src", "clean").Run() + exec.Command(*cmd_make, "-C", "liblinear_src", "clean").Run() - lib_path, err := filepath.Abs("ext/lib") + lib_path, err := filepath.Abs("lib") var target_envir string switch runtime.GOOS { case "darwin":