diff --git a/src/algorithms/acquisition/CMakeLists.txt b/src/algorithms/acquisition/CMakeLists.txt
index d91502f0f..579bf4ba0 100644
--- a/src/algorithms/acquisition/CMakeLists.txt
+++ b/src/algorithms/acquisition/CMakeLists.txt
@@ -18,5 +18,7 @@
 
 add_subdirectory(adapters)
 add_subdirectory(gnuradio_blocks)
-#add_subdirectory(libs)
+if(ENABLE_FPGA)
+	add_subdirectory(libs)
+endif(ENABLE_FPGA)
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index 134db4b19..667e6f70f 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -67,7 +67,11 @@ add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS}) 
 #target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES}
 #target_link_libraries(acq_gr_blocks acquisition_lib gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES})
-target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES})
+if(ENABLE_FPGA)
+	target_link_libraries(acq_gr_blocks acquisition_lib gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES})
+else(ENABLE_FPGA)
+	target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES})
+endif(ENABLE_FPGA)
 if(NOT VOLK_GNSSSDR_FOUND)
     add_dependencies(acq_gr_blocks volk_gnsssdr_module)
 endif(NOT VOLK_GNSSSDR_FOUND)
diff --git a/src/algorithms/acquisition/libs/gps_fpga_acquisition_8sc.cc b/src/algorithms/acquisition/libs/gps_fpga_acquisition_8sc.cc
index fcc6c1c43..39eb8f2cc 100644
--- a/src/algorithms/acquisition/libs/gps_fpga_acquisition_8sc.cc
+++ b/src/algorithms/acquisition/libs/gps_fpga_acquisition_8sc.cc
@@ -299,14 +299,12 @@ void gps_fpga_acquisition_8sc::open_device()
     if ((d_fd = open(d_device_name.c_str(), O_RDWR | O_SYNC )) == -1)
         {
             LOG(WARNING) << "Cannot open deviceio" << d_device_name;
-            printf("kk\n");
         }
     d_map_base = (volatile unsigned *)mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, d_fd,0);
 
     if (d_map_base == (void *) -1)
         {
             LOG(WARNING) << "Cannot map the FPGA acquisition module into user memory";
-            printf("kk^2\n");
         }
 
     // sanity check : check test register
@@ -331,7 +329,6 @@ void gps_fpga_acquisition_8sc::open_device()
 }
 void gps_fpga_acquisition_8sc::close_device()
 {
-	printf("CLOSE DEVICE\n");
     if (munmap((void*)d_map_base, PAGE_SIZE) == -1)
         {
             printf("Failed to unmap memory uio\n");