diff --git a/NPLib/Core/CMakeLists.txt b/NPLib/Core/CMakeLists.txt
index affedde0f43447f16f89aa852f738794c8f0dc5e..aa1306bd020453719b3d2ef5e08114794d242ae4 100644
--- a/NPLib/Core/CMakeLists.txt
+++ b/NPLib/Core/CMakeLists.txt
@@ -1,4 +1,6 @@
-  
+add_custom_command(OUTPUT TAsciiFileDict.cxx TAsciiFileDict_rdict.pcm TAsciiFile.rootmap COMMAND  ../scripts/build_dict.sh TAsciiFile.h TAsciiFileDict.cxx TAsciiFile.rootmap libNPCore.so)  
+add_custom_command(OUTPUT NPVDetectorDict.cxx NPVDetectorDict_rdict.pcm NPVDetector.rootmap COMMAND  ../scripts/build_dict.sh NPVDetector.h NPVDetectorDict.cxx NPVDetector.rootmap libNPCore.so NPCoreLinkdef.h)  
+
 add_library(NPCore SHARED NPVAnalysis.cxx NPAnalysisFactory.cxx NPCalibrationManager.cxx NPOptionManager.cxx RootOutput.cxx RootInput.cxx TAsciiFile.cxx TAsciiFileDict.cxx NPDetectorManager.cxx NPVDetector.cxx NPVDetectorDict.cxx NPVSpectra.cxx NPDetectorFactory.cxx)
 target_link_libraries(NPCore ${ROOT_LIBRARIES}) 
 install(FILES NPVAnalysis.h NPAnalysisFactory.h  NPCalibrationManager.h NPOptionManager.h RootInput.h RootOutput.h TAsciiFile.h NPDetectorManager.h NPVDetector.h NPGlobalSystemOfUnits.h NPPhysicalConstants.h NPSystemOfUnits.h NPVSpectra.h NPDetectorFactory.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/InitialConditions/CMakeLists.txt b/NPLib/InitialConditions/CMakeLists.txt
index 7ec8654f0546c47412480b043cd64fe9b70d35aa..7ab9fcf83dbe4fb131f65c80e2f2fb157094877b 100644
--- a/NPLib/InitialConditions/CMakeLists.txt
+++ b/NPLib/InitialConditions/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_custom_command(OUTPUT TInitialConditionsDict.cxx TInitialConditionsDict_rdict.pcm TInitialConditions.rootmap COMMAND ../scripts/build_dict.sh TInitialConditions.h TInitialConditionsDict.cxx TInitialConditions.rootmap libNPInitialConditions.so)
 add_library(NPInitialConditions SHARED TInitialConditions.cxx TInitialConditionsDict.cxx )
 target_link_libraries(NPInitialConditions ${ROOT_LIBRARIES} NPCore)
 install(FILES TInitialConditions.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/InteractionCoordinates/CMakeLists.txt b/NPLib/InteractionCoordinates/CMakeLists.txt
index 91f8b3ebb5999caa5adffd549e2cc7774baeb42d..d0a5de25f9bada483787dd19853978d5b6b2c1d7 100644
--- a/NPLib/InteractionCoordinates/CMakeLists.txt
+++ b/NPLib/InteractionCoordinates/CMakeLists.txt
@@ -1,4 +1,5 @@
-add_library(NPInteractionCoordinates SHARED TInteractionCoordinates.cxx TInteractionCoordinatesDict.cxx )
+add_custom_command(OUTPUT TInteractionCoordinatesDict.cxx TInteractionCoordinatesDict_rdict.pcm TInteractionCoordinates.rootmap COMMAND ../scripts/build_dict.sh TInteractionCoordinates.h TInteractionCoordinatesDict.cxx TInteractionCoordinates.rootmap libNPInteractionCoordinates.so)
+ add_library(NPInteractionCoordinates SHARED TInteractionCoordinates.cxx TInteractionCoordinatesDict.cxx )
 target_link_libraries(NPInteractionCoordinates ${ROOT_LIBRARIES} NPCore)
 install(FILES TInteractionCoordinates.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
 install(FILES TInteractionCoordinatesDict_rdict.pcm TInteractionCoordinates.rootmap DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
diff --git a/NPLib/Maya/CMakeLists.txt b/NPLib/Maya/CMakeLists.txt
index 5dbd4ea51a67d358362967462d83ae7fc0dc82cf..4bde46a81a71bfe04110fee728d0637e4a41608a 100644
--- a/NPLib/Maya/CMakeLists.txt
+++ b/NPLib/Maya/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_custom_command(OUTPUT TMayaDataDict.cxx TMayaDataDict_rdict.pcm TMayaData.rootmap COMMAND ../scripts/build_dict.sh TMayaData.h TMayaDataDict.cxx TMayaData.rootmap libNPMaya.dylib DEPENDS TMayaData.h)
+add_custom_command(OUTPUT TMayaHistoDict.cxx TMayaHistoDict_rdict.pcm TMayaHisto.rootmap COMMAND ../scripts/build_dict.sh TMayaHisto.h TMayaHistoDict.cxx TMayaHisto.rootmap libNPMaya.dylib DEPENDS TMayaHisto.h)
+
 
 add_library(NPMaya SHARED TMayaData.cxx TMayaHisto.cxx TMayaDataDict.cxx TMayaHistoDict.cxx ConfigReader.cxx)
 target_link_libraries(NPMaya ${ROOT_LIBRARIES} NPCore) 
diff --git a/NPLib/Physics/CMakeLists.txt b/NPLib/Physics/CMakeLists.txt
index 5b99a66fb3502ea6c0d54fe2129bbe1f0b3adfd1..6cded4e5cb318da59e6d4df55010c4c64b6985e1 100644
--- a/NPLib/Physics/CMakeLists.txt
+++ b/NPLib/Physics/CMakeLists.txt
@@ -1,4 +1,4 @@
-  
+add_custom_command(OUTPUT NPReactionDict.cxx NPReaction.rootmap NPReactionDict_rdict.pcm COMMAND ../scripts/build_dict.sh NPReaction.h NPReactionDict.cxx NPReaction.rootmap libNPPhysics.so NPPhysicsLinkDef.h) 
 add_library(NPPhysics SHARED NPBeam.cxx NPEnergyLoss.cxx NPFunction.cxx NPNucleus.cxx NPReaction.cxx NPReactionDict.cxx)
 target_link_libraries(NPPhysics ${ROOT_LIBRARIES} MathMore NPCore) 
 install(FILES NPBeam.h NPEnergyLoss.h NPFunction.h NPNucleus.h NPReaction.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})