diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c795b05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9958a9..df3657e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,17 +29,23 @@ set(
   $ENV{MIDASSYS}/drivers/class/multi.cxx
 )
 
-set(
-  LIBS
-  # -lz          # compression library
-  -lpthread
-  -lutil
-  -lrt         # librt for real time guarantees (really just backwards compat)
-  -ldl         # libdl for dynamic loading
-  $ENV{MIDASSYS}/lib/libmfe.a
-  $ENV{MIDASSYS}/lib/libmidas.a
+set(SYS_LIBS
+    pthread
+    util
+    rt
+    dl
 )
 
+link_directories($ENV{MIDASSYS}/lib)
+# Links to libmfe.a and libmidas.a
+set(MIDAS_LIBS
+    mfe
+    midas
+    mscb
+)
+
+set(LIBS ${SYS_LIBS} ${MIDAS_LIBS})
+
 ################################################################################
 ## make tcpip library configurable
 ################################################################################
@@ -88,7 +94,11 @@ target_include_directories(
   PRIVATE
     $ENV{MIDASSYS}/drivers
     $ENV{MIDASSYS}/include
-    $ENV{MIDASSYS}/mscb/include
+    # This is redundant if MIDASSYS =/ Midas repo, but needed if MIDAS has been
+    # installed in the repo directory, since the CMake file of MIDAS doesn't
+    # copy the headers into $ENV{MIDASSYS}/include in the latter case.
+    $ENV{MIDASSYS}/include/mscb
+
 )
 
 target_link_libraries(