rename some cmake build targets

23 files changed, 62 insertions, 65 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58ec770337d..608b881a281 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -873,7 +873,7 @@ ENDIF(WITH_RAYOPTIMIZATION)
 IF(WITH_IMAGE_OPENJPEG)
 	set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 	set(OPENJPEG_INC ${OPENJPEG})
-	set(OPENJPEG_LIb extern_libopenjpeg)
+	set(OPENJPEG_LIb extern_openjpeg)
 ENDIF(WITH_IMAGE_OPENJPEG)
 
 #-----------------------------------------------------------------------------
diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt
index 0a985aceb37..d7b25ed1412 100644
--- a/extern/libopenjpeg/CMakeLists.txt
+++ b/extern/libopenjpeg/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC . src)
 
 FILE(GLOB SRC *.c except t1_generate_luts.c)
 ADD_DEFINITIONS(-DWITH_OPENJPEG)
-BLENDERLIB(extern_libopenjpeg "${SRC}" "${INC}")
+BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
 #, libtype=['international','player'], priority=[5, 210])
diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt
index 235cd8c7f8e..15aa5264e37 100644
--- a/extern/lzma/CMakeLists.txt
+++ b/extern/lzma/CMakeLists.txt
@@ -28,7 +28,4 @@ SET(INC . )
 
 FILE(GLOB SRC ./*.c)
 
-
-
-BLENDERLIB(bf_lzma "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+BLENDERLIB(extern_lzma "${SRC}" "${INC}")
diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt
index b640cf658da..8bc887c923e 100644
--- a/extern/lzo/CMakeLists.txt
+++ b/extern/lzo/CMakeLists.txt
@@ -30,5 +30,5 @@ FILE(GLOB SRC minilzo/*.c)
 
 
 
-BLENDERLIB(bf_minilzo "${SRC}" "${INC}")
+BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
 #, libtype='blender', priority = 0 )
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 7e226145adc..b1ded10e539 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -69,4 +69,4 @@ ENDIF(WITH_PYTHON)
 
 SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
 
-BLENDERLIB(bf_audaspace "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}")
diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt
index e06b19a5d39..99923bc99dc 100644
--- a/intern/boolop/CMakeLists.txt
+++ b/intern/boolop/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC . intern extern ../moto/include ../container ../memutil ../../source/ble
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(blender_bop "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
 #, libtype='common', priority=5 )
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt
index c95752ed5ed..4f87e161030 100644
--- a/intern/bsp/CMakeLists.txt
+++ b/intern/bsp/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC intern ../container ../moto/include ../memutil)
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(blender_BSP "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
 #, libtype='core', priority=15 )
diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt
index 5835d561abd..462b62ae8bb 100644
--- a/intern/container/CMakeLists.txt
+++ b/intern/container/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC .)
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(blender_CTR "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
 #, libtype=['intern'], priority = 10 )
diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt
index e7aff161692..7fdf08978a4 100644
--- a/intern/decimation/CMakeLists.txt
+++ b/intern/decimation/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC . ../moto/include ../container ../memutil)
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(bf_decimation "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
 #, libtype=['core','common','player'], priority = [10, 20, 25] )
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index e45a210bd88..d0e100907b1 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -37,5 +37,5 @@ IF(WITH_OPENMP)
 		ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
-BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
 #, libtype='blender', priority=0 )
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index c262ea8aadd..c6ffd4b1913 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -90,5 +90,5 @@ ELSEIF(UNIX)
 
 ENDIF(APPLE)
 
-BLENDERLIB(bf_ghost "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}")
 
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 21f43b7320e..642b04fdb60 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -28,10 +28,10 @@ SET(INC .)
 
 FILE(GLOB SRC intern/*.c)
 
-BLENDERLIB(bf_guardedalloc "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}")
 
 # Override C++ alloc optional
 IF(WITH_CXX_GUARDEDALLOC)
 	FILE(GLOB SRC cpp/*.cpp)
-	BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}")
+	BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
 ENDIF(WITH_CXX_GUARDEDALLOC)
diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt
index 3c345ae7e6a..8ea05ac994d 100644
--- a/intern/iksolver/CMakeLists.txt
+++ b/intern/iksolver/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC intern ../moto/include ../memutil)
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(bf_IK "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_ik "${SRC}" "${INC}")
 #, libtype=['blender'], priority = [10] )
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index 7b442446d62..39443bd2b22 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC ../../extern/Eigen2)
 
 FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp)
 
-BLENDERLIB(bf_ITASC "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
 #, libtype=['blender'], priority = [10] )
diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt
index 51391bd3006..3dc725acb50 100644
--- a/intern/memutil/CMakeLists.txt
+++ b/intern/memutil/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC . ..)
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(bf_memutil "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}")
 #, libtype=['intern', 'player'], priority = [0, 180] )
diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt
index a5ed0f729de..3d6d3d1a783 100644
--- a/intern/moto/CMakeLists.txt
+++ b/intern/moto/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC include)
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(bf_moto "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_moto "${SRC}" "${INC}")
 #, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )
diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt
index d76abe12a00..0551c94e586 100644
--- a/intern/opennl/CMakeLists.txt
+++ b/intern/opennl/CMakeLists.txt
@@ -28,6 +28,6 @@ SET(INC extern superlu)
 
 FILE(GLOB SRC intern/*.c superlu/*.c)
 
-BLENDERLIB(blender_ONL "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
 #, libtype='core', priority=55 )
 
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 8579c76b322..f099efd2bb8 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -38,5 +38,5 @@ IF(WITH_FFTW3)
 ENDIF(WITH_FFTW3)
 
 
-BLENDERLIB(bf_smoke "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
 #, libtype='blender', priority = 0 )
diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt
index c726f7483e5..7aeace4ca83 100644
--- a/intern/string/CMakeLists.txt
+++ b/intern/string/CMakeLists.txt
@@ -28,5 +28,5 @@ SET(INC .)
 
 FILE(GLOB SRC intern/*.cpp)
 
-BLENDERLIB(bf_string "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
 #, libtype=['core', 'player'], priority = [30,10] )
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index b6985458d0c..1a91abfbec8 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -31,4 +31,4 @@ SET(INC
 	${PYTHON_INC}
 )
 
-BLENDERLIB(bf_gen_python "${SRC}" "${INC}")
+BLENDERLIB(bf_python_ext "${SRC}" "${INC}")
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 2047ab29d24..1b6a29b616a 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -54,4 +54,4 @@ IF(APPLE)
 	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
 ENDIF(APPLE)
 
-BLENDERLIB_NOLIST(blender_render "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}")
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 566bc88e46d..8fcea674ebb 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -64,8 +64,8 @@ IF(UNIX)
 	SET(BLENDER_SORTED_LIBS
 		gp_ghost 
 		gp_common 
-		bf_string 
-		bf_ghost 
+		bf_intern_string 
+		bf_intern_ghost 
 		bf_rna
 		bf_blenkernel
 		bf_blenloader 
@@ -82,11 +82,11 @@ IF(UNIX)
 		bf_expressions 
 		bf_scenegraph
         	bf_ikplugin
-        	bf_ITASC
-        	bf_IK
-        	bf_smoke
+        	bf_intern_itasc
+        	bf_intern_ik
+        	bf_intern_smoke
 		bf_modifiers
-		bf_moto 
+		bf_intern_moto 
 		bf_kernel 
 		bf_nodes
 		bf_gpu
@@ -96,20 +96,20 @@ IF(UNIX)
 		bf_ngnetwork 
 		bf_loopbacknetwork 
 		extern_bullet 
-		bf_guardedalloc 
-		bf_memutil 
+		bf_intern_guardedalloc 
+		bf_intern_memutil 
 		bf_python
-		bf_gen_python
+		bf_python_ext
 		bf_blenlib 
 		bf_cineon
 		bf_openexr 
-		extern_libopenjpeg 
+		extern_openjpeg 
 		bf_dds
 		bf_readblenfile 
 		bf_dna
 		bf_videotex
 		bf_blenfont
-		bf_audaspace
+		bf_intern_audaspace
 		blenkernel_blc
 		extern_binreloc
 		extern_glew
@@ -120,7 +120,7 @@ IF(UNIX)
 	ENDIF(WITH_QUICKTIME)
 
 	IF(WITH_CXX_GUARDEDALLOC)
-		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp)
 	ENDIF(WITH_CXX_GUARDEDALLOC)
 
 	FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 4088369a05b..9920752f9d2 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -383,10 +383,10 @@ ADD_DEPENDENCIES(blender makesdna)
 
 FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager blender_render)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
 
 IF(WITH_FLUID)
-	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
+	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_intern_elbeem)
 ENDIF(WITH_FLUID)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -436,11 +436,11 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
         bf_editor_animation
         bf_editor_datafiles
 
-		blender_BSP 
-		blender_render 
-		blender_ONL 
+		bf_intern_bsp 
+		bf_render 
+		bf_intern_opennl 
 		bf_python 
-		bf_gen_python 
+		bf_python_ext 
 		bf_ikplugin
 		bf_modifiers
 		bf_blenkernel
@@ -448,8 +448,8 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		bf_gpu
 		bf_blenloader
 		bf_blenlib
-		bf_ghost
-		bf_string
+		bf_intern_ghost
+		bf_intern_string
 		bf_blenpluginapi 
 		bf_imbuf 
 		bf_avi 
@@ -458,24 +458,24 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		bf_dds
 		bf_readblenfile
 		bf_collada
-		blender_BSP 
-		blender_bop 
+		bf_intern_bsp 
+		bf_intern_bop 
 		bf_kernel 
-		bf_decimation 
-		bf_elbeem 
-		bf_IK 
-		bf_memutil 
-		bf_guardedalloc 
-		blender_CTR 
-		bf_moto 
+		bf_intern_decimate 
+		bf_intern_elbeem 
+		bf_intern_ik 
+		bf_intern_memutil 
+		bf_intern_guardedalloc 
+		bf_intern_ctr 
+		bf_intern_moto 
 		bf_windowmanager
 		bf_blroutines 
 		bf_converter 
 		bf_dummy 
 		bf_bullet 
-		bf_smoke
-		bf_minilzo
-		bf_lzma
+		bf_intern_smoke
+		extern_minilzo
+		extern_lzma
 		bf_common 
 		bf_ketsji 
 		bf_logic 
@@ -483,32 +483,32 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		bf_oglrasterizer 
 		bf_expressions 
 		bf_scenegraph 
-		bf_moto 
+		bf_intern_moto 
 		bf_blroutines 
 		kx_network 
 		bf_kernel 
 		bf_ngnetwork 
 		extern_bullet 
 		bf_loopbacknetwork 
-		bf_ITASC
+		bf_intern_itasc
 		bf_common 
-		bf_moto 
+		bf_intern_moto 
 		bf_python
-		bf_gen_python
+		bf_python_ext
 		extern_binreloc
 		extern_glew
-		extern_libopenjpeg
+		extern_openjpeg
 		bf_videotex
 		bf_rna
 		bf_dna
 		bf_blenfont
-		bf_audaspace
-		bf_decimation
+		bf_intern_audaspace
+		bf_intern_decimate
 
 	)
 
 	IF(WITH_CXX_GUARDEDALLOC)
-		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp)
 	ENDIF(WITH_CXX_GUARDEDALLOC)
 
 	IF(WITH_QUICKTIME)