27 files changed, 10 insertions, 22 deletions
diff --git a/externals/jemalloc/CMakeLists.txt b/externals/jemalloc/CMakeLists.txt
index c3e4e81782c..1e32407b456 100644
--- a/externals/jemalloc/CMakeLists.txt
+++ b/externals/jemalloc/CMakeLists.txt
@@ -1,27 +1,15 @@
-SET(jmalloc_STAT_SRC
-  arena.c  
-  chunk.c      
-  chunk_mmap.c  
-  ckh.c  
-  extent.c  
-  huge.c      
-  mb.c     
-  prof.c   
-  tcache.c
-  base.c   
-  chunk_dss.c  
-  chunk_swap.c 
-  ctl.c  
-  hash.c    
-  jemalloc.c  
-  mutex.c  
-  stats.c
-  )
+
+file(GLOB sources *.c)
+set(jemalloc_STAT_SRC
+  ${sources}
+)
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/dep/include
-  )
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/internal
+)
 
 add_definitions(-D_GNU_SOURCE -D_REENTRANT)
 
-add_library(jmalloc STATIC ${jmalloc_STAT_SRC})
-\ No newline at end of file
+add_library(jemalloc STATIC ${sources})
diff --git a/externals/jemalloc/include/internal/arena.h b/externals/jemalloc/jemalloc/internal/arena.h
index bb4ce2a54f7..bb4ce2a54f7 100644
--- a/externals/jemalloc/include/internal/arena.h
+++ b/externals/jemalloc/jemalloc/internal/arena.h
diff --git a/externals/jemalloc/include/internal/base.h b/externals/jemalloc/jemalloc/internal/base.h
index e353f309bd2..e353f309bd2 100644
--- a/externals/jemalloc/include/internal/base.h
+++ b/externals/jemalloc/jemalloc/internal/base.h
diff --git a/externals/jemalloc/include/internal/chunk.h b/externals/jemalloc/jemalloc/internal/chunk.h
index 1f6abf782f1..1f6abf782f1 100644
--- a/externals/jemalloc/include/internal/chunk.h
+++ b/externals/jemalloc/jemalloc/internal/chunk.h
diff --git a/externals/jemalloc/include/internal/chunk_dss.h b/externals/jemalloc/jemalloc/internal/chunk_dss.h
index 6be4ad1f212..6be4ad1f212 100644
--- a/externals/jemalloc/include/internal/chunk_dss.h
+++ b/externals/jemalloc/jemalloc/internal/chunk_dss.h
diff --git a/externals/jemalloc/include/internal/chunk_mmap.h b/externals/jemalloc/jemalloc/internal/chunk_mmap.h
index 8fb90b77c9b..8fb90b77c9b 100644
--- a/externals/jemalloc/include/internal/chunk_mmap.h
+++ b/externals/jemalloc/jemalloc/internal/chunk_mmap.h
diff --git a/externals/jemalloc/include/internal/chunk_swap.h b/externals/jemalloc/jemalloc/internal/chunk_swap.h
index d50cb197449..d50cb197449 100644
--- a/externals/jemalloc/include/internal/chunk_swap.h
+++ b/externals/jemalloc/jemalloc/internal/chunk_swap.h
diff --git a/externals/jemalloc/include/internal/ckh.h b/externals/jemalloc/jemalloc/internal/ckh.h
index c39ea5c75ef..c39ea5c75ef 100644
--- a/externals/jemalloc/include/internal/ckh.h
+++ b/externals/jemalloc/jemalloc/internal/ckh.h
diff --git a/externals/jemalloc/include/internal/ctl.h b/externals/jemalloc/jemalloc/internal/ctl.h
index 7bbf21e0e85..7bbf21e0e85 100644
--- a/externals/jemalloc/include/internal/ctl.h
+++ b/externals/jemalloc/jemalloc/internal/ctl.h
diff --git a/externals/jemalloc/include/internal/extent.h b/externals/jemalloc/jemalloc/internal/extent.h
index 33a4e9a3852..33a4e9a3852 100644
--- a/externals/jemalloc/include/internal/extent.h
+++ b/externals/jemalloc/jemalloc/internal/extent.h
diff --git a/externals/jemalloc/include/internal/hash.h b/externals/jemalloc/jemalloc/internal/hash.h
index d12cdb8359f..d12cdb8359f 100644
--- a/externals/jemalloc/include/internal/hash.h
+++ b/externals/jemalloc/jemalloc/internal/hash.h
diff --git a/externals/jemalloc/include/internal/huge.h b/externals/jemalloc/jemalloc/internal/huge.h
index 3cf32f7506d..3cf32f7506d 100644
--- a/externals/jemalloc/include/internal/huge.h
+++ b/externals/jemalloc/jemalloc/internal/huge.h
diff --git a/externals/jemalloc/include/internal/jemalloc_internal.h b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h
index 03782dd6690..03782dd6690 100644
--- a/externals/jemalloc/include/internal/jemalloc_internal.h
+++ b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h
diff --git a/externals/jemalloc/include/internal/jemalloc_internal.h.in b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
index 2c3f32f126d..2c3f32f126d 100644
--- a/externals/jemalloc/include/internal/jemalloc_internal.h.in
+++ b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
diff --git a/externals/jemalloc/include/internal/mb.h b/externals/jemalloc/jemalloc/internal/mb.h
index 1707aa91d68..1707aa91d68 100644
--- a/externals/jemalloc/include/internal/mb.h
+++ b/externals/jemalloc/jemalloc/internal/mb.h
diff --git a/externals/jemalloc/include/internal/mutex.h b/externals/jemalloc/jemalloc/internal/mutex.h
index 108bfa8abfd..108bfa8abfd 100644
--- a/externals/jemalloc/include/internal/mutex.h
+++ b/externals/jemalloc/jemalloc/internal/mutex.h
diff --git a/externals/jemalloc/include/internal/prof.h b/externals/jemalloc/jemalloc/internal/prof.h
index 6e71552d85e..6e71552d85e 100644
--- a/externals/jemalloc/include/internal/prof.h
+++ b/externals/jemalloc/jemalloc/internal/prof.h
diff --git a/externals/jemalloc/include/internal/ql.h b/externals/jemalloc/jemalloc/internal/ql.h
index a9ed2393f0c..a9ed2393f0c 100644
--- a/externals/jemalloc/include/internal/ql.h
+++ b/externals/jemalloc/jemalloc/internal/ql.h
diff --git a/externals/jemalloc/include/internal/qr.h b/externals/jemalloc/jemalloc/internal/qr.h
index fe22352fedd..fe22352fedd 100644
--- a/externals/jemalloc/include/internal/qr.h
+++ b/externals/jemalloc/jemalloc/internal/qr.h
diff --git a/externals/jemalloc/include/internal/rb.h b/externals/jemalloc/jemalloc/internal/rb.h
index ee9b009d235..ee9b009d235 100644
--- a/externals/jemalloc/include/internal/rb.h
+++ b/externals/jemalloc/jemalloc/internal/rb.h
diff --git a/externals/jemalloc/include/internal/stats.h b/externals/jemalloc/jemalloc/internal/stats.h
index cbf035ff2b9..cbf035ff2b9 100644
--- a/externals/jemalloc/include/internal/stats.h
+++ b/externals/jemalloc/jemalloc/internal/stats.h
diff --git a/externals/jemalloc/include/internal/tcache.h b/externals/jemalloc/jemalloc/internal/tcache.h
index c76597fafab..c76597fafab 100644
--- a/externals/jemalloc/include/internal/tcache.h
+++ b/externals/jemalloc/jemalloc/internal/tcache.h
diff --git a/externals/jemalloc/include/internal/totally_not_p_r_n.h b/externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
index 0709d708012..0709d708012 100644
--- a/externals/jemalloc/include/internal/totally_not_p_r_n.h
+++ b/externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
diff --git a/externals/jemalloc/include/jemalloc.h b/externals/jemalloc/jemalloc/jemalloc.h
index d9bafbfff55..d9bafbfff55 100644
--- a/externals/jemalloc/include/jemalloc.h
+++ b/externals/jemalloc/jemalloc/jemalloc.h
diff --git a/externals/jemalloc/include/jemalloc.h.in b/externals/jemalloc/jemalloc/jemalloc.h.in
index 8ef8183686e..8ef8183686e 100644
--- a/externals/jemalloc/include/jemalloc.h.in
+++ b/externals/jemalloc/jemalloc/jemalloc.h.in
diff --git a/externals/jemalloc/include/jemalloc_defs.h b/externals/jemalloc/jemalloc/jemalloc_defs.h
index e8acaed3abd..e8acaed3abd 100644
--- a/externals/jemalloc/include/jemalloc_defs.h
+++ b/externals/jemalloc/jemalloc/jemalloc_defs.h
diff --git a/externals/jemalloc/include/jemalloc_defs.h.in b/externals/jemalloc/jemalloc/jemalloc_defs.h.in
index 8b98d670acc..8b98d670acc 100644
--- a/externals/jemalloc/include/jemalloc_defs.h.in
+++ b/externals/jemalloc/jemalloc/jemalloc_defs.h.in