From 7a36e06984f98153e8b27f5d82603fb7d1227cc8 Mon Sep 17 00:00:00 2001
From: MITSUNARI Shigeo <herumi@nifty.com>
Date: Thu, 13 Dec 2018 11:45:32 +0900
Subject: bn_c_impl.hpp is in public

---
 CMakeLists.txt     | 5 +----
 Makefile           | 2 +-
 setvar.bat         | 4 ++--
 src/bls_c_impl.hpp | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31130fb..8371a0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(LIBS mcl gmp gmpxx crypto pthread)
 
-set(MCL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../mcl/" CACHE PATH "mcl source dir")
-include_directories(
-	${MCL_DIR}/src ./include/
-)
+include_directories(include/)
 
 add_library(bls_c256 SHARED src/bls_c256.cpp)
 add_library(bls_c384 SHARED src/bls_c384.cpp)
diff --git a/Makefile b/Makefile
index 8b4aa3e..59ae1fa 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ SRC_SRC=bls_c256.cpp bls_c384.cpp bls_c384_256.cpp
 TEST_SRC=bls256_test.cpp bls384_test.cpp bls384_256_test.cpp bls_c256_test.cpp bls_c384_test.cpp bls_c384_256_test.cpp
 SAMPLE_SRC=bls256_smpl.cpp bls384_smpl.cpp
 
-CFLAGS+=-I$(MCL_DIR)/include -I./ -I$(MCL_DIR)/src
+CFLAGS+=-I$(MCL_DIR)/include
 ifneq ($(MCL_MAX_BIT_SIZE),)
   CFLAGS+=-DMCL_MAX_BIT_SIZE=$(MCL_MAX_BIT_SIZE)
 endif
diff --git a/setvar.bat b/setvar.bat
index 5f1e75b..0ff286a 100755
--- a/setvar.bat
+++ b/setvar.bat
@@ -1,6 +1,6 @@
 @echo off
 call ..\mcl\setvar.bat
-set CFLAGS=%CFLAGS% /I ..\mcl\include /I .\ /I../mcl/src
+set CFLAGS=%CFLAGS% /I ..\mcl\include /I ./
 set LDFLAGS=%LDFLAGS% /LIBPATH:..\mcl\lib
 echo CFLAGS=%CFLAGS%
-echo LDFLAGS=%LDFLAGS%
\ No newline at end of file
+echo LDFLAGS=%LDFLAGS%
diff --git a/src/bls_c_impl.hpp b/src/bls_c_impl.hpp
index dc4c998..46b3aad 100644
--- a/src/bls_c_impl.hpp
+++ b/src/bls_c_impl.hpp
@@ -4,7 +4,7 @@
 #include <bls/bls.h>
 
 #if 1
-#include "bn_c_impl.hpp"
+#include "mcl/impl/bn_c_impl.hpp"
 #else
 #if MCLBN_FP_UNIT_SIZE == 4 && MCLBN_FR_UNIT_SIZE == 4
 #include <mcl/bn256.hpp>
-- 
cgit v1.2.3