Simplified unified CPU/GPU/Kaldi Makefile

Modularize build specifications for each target, where each target adds what it needs to paths. Add rpath to cntkmath and plugins so they do not need LD_LIBRARY_PATH. Remove object files from cntk that were already in cntkmath. Organize build targets into UNIX-like bin and lib directories under a configuration-specific directory. Have .gitignore ignore these directories. Make it easy to keep sources in alphabetic order for easier comparison with the Windows project definition.
thanaphatp · Aug 5, 2015 · 25f8594 · 25f8594
1 parent 38f507d
commit 25f8594
Show file tree

Hide file tree

Showing 2 changed files with 285 additions and 144 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ build/
 [Bb]in/
 [Oo]bj/
 .run-*
+x86_64.*
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ build/ @@
     [Bb]in/
     [Oo]bj/
     .run-*
+    x86_64.*
     # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
     !packages/*/build/
@@ Expand Down @@