Browse Source

Rearrangment of library to support building inside of a project or independently.

master
kevin 1 year ago
parent
commit
f36c81aae3
100 changed files with 376 additions and 65 deletions
  1. 107
    65
      Makefile.am
  2. 40
    0
      build/clean.sh
  3. 18
    0
      build/linux/debug/build.sh
  4. 24
    0
      build/linux/release/build.sh
  5. 20
    0
      build/osx/debug/build.sh
  6. 19
    0
      build/osx/release/build.sh
  7. 129
    0
      configure.ac
  8. 8
    0
      m4/os_64.m4
  9. 11
    0
      m4/os_type.m4
  10. 0
    0
      src/app/cmDspPgmJsonToDot.c
  11. 0
    0
      src/app/cmDspPgmJsonToDot.h
  12. 0
    0
      src/app/cmMidiScoreFollow.c
  13. 0
    0
      src/app/cmMidiScoreFollow.h
  14. 0
    0
      src/app/cmOnset.c
  15. 0
    0
      src/app/cmOnset.h
  16. 0
    0
      src/app/cmPickup.c
  17. 0
    0
      src/app/cmPickup.h
  18. 0
    0
      src/app/cmScore.c
  19. 0
    0
      src/app/cmScore.h
  20. 0
    0
      src/app/cmScoreMatchGraphic.c
  21. 0
    0
      src/app/cmScoreMatchGraphic.css
  22. 0
    0
      src/app/cmScoreMatchGraphic.h
  23. 0
    0
      src/app/cmScoreProc.c
  24. 0
    0
      src/app/cmScoreProc.h
  25. 0
    0
      src/app/cmSdb.c
  26. 0
    0
      src/app/cmSdb.h
  27. 0
    0
      src/app/cmTakeSeqBldr.c
  28. 0
    0
      src/app/cmTakeSeqBldr.h
  29. 0
    0
      src/app/cmTimeLine.c
  30. 0
    0
      src/app/cmTimeLine.h
  31. 0
    0
      src/app/cmXScore.c
  32. 0
    0
      src/app/cmXScore.h
  33. 0
    0
      src/cmApBuf.c
  34. 0
    0
      src/cmApBuf.h
  35. 0
    0
      src/cmArray.c
  36. 0
    0
      src/cmArray.h
  37. 0
    0
      src/cmAudDsp.c
  38. 0
    0
      src/cmAudDsp.h
  39. 0
    0
      src/cmAudDspIF.c
  40. 0
    0
      src/cmAudDspIF.h
  41. 0
    0
      src/cmAudDspLocal.c
  42. 0
    0
      src/cmAudDspLocal.h
  43. 0
    0
      src/cmAudLabelFile.c
  44. 0
    0
      src/cmAudLabelFile.h
  45. 0
    0
      src/cmAudioAggDev.c
  46. 0
    0
      src/cmAudioAggDev.h
  47. 0
    0
      src/cmAudioBuf.c
  48. 0
    0
      src/cmAudioBuf.h
  49. 0
    0
      src/cmAudioFile.c
  50. 0
    0
      src/cmAudioFile.h
  51. 0
    0
      src/cmAudioFileDev.c
  52. 0
    0
      src/cmAudioFileDev.h
  53. 0
    0
      src/cmAudioFileMgr.c
  54. 0
    0
      src/cmAudioFileMgr.h
  55. 0
    0
      src/cmAudioNrtDev.c
  56. 0
    0
      src/cmAudioNrtDev.h
  57. 0
    0
      src/cmAudioPort.c
  58. 0
    0
      src/cmAudioPort.h
  59. 0
    0
      src/cmAudioPortFile.c
  60. 0
    0
      src/cmAudioPortFile.h
  61. 0
    0
      src/cmAudioSys.c
  62. 0
    0
      src/cmAudioSys.h
  63. 0
    0
      src/cmAudioSysMsg.h
  64. 0
    0
      src/cmComplexTypes.c
  65. 0
    0
      src/cmComplexTypes.h
  66. 0
    0
      src/cmCsv.c
  67. 0
    0
      src/cmCsv.h
  68. 0
    0
      src/cmCtx.c
  69. 0
    0
      src/cmCtx.h
  70. 0
    0
      src/cmDList.c
  71. 0
    0
      src/cmDList.h
  72. 0
    0
      src/cmDListTpl.h
  73. 0
    0
      src/cmData.c
  74. 0
    0
      src/cmData.h
  75. 0
    0
      src/cmDevCfg.c
  76. 0
    0
      src/cmDevCfg.h
  77. 0
    0
      src/cmDocMain.h
  78. 0
    0
      src/cmErr.c
  79. 0
    0
      src/cmErr.h
  80. 0
    0
      src/cmExec.c
  81. 0
    0
      src/cmExec.h
  82. 0
    0
      src/cmFeatFile.c
  83. 0
    0
      src/cmFeatFile.h
  84. 0
    0
      src/cmFile.c
  85. 0
    0
      src/cmFile.h
  86. 0
    0
      src/cmFileSys.c
  87. 0
    0
      src/cmFileSys.h
  88. 0
    0
      src/cmFloatTypes.h
  89. 0
    0
      src/cmFrameFile.c
  90. 0
    0
      src/cmFrameFile.h
  91. 0
    0
      src/cmGlobal.c
  92. 0
    0
      src/cmGlobal.h
  93. 0
    0
      src/cmGnuPlot.c
  94. 0
    0
      src/cmGnuPlot.h
  95. 0
    0
      src/cmGr.c
  96. 0
    0
      src/cmGr.h
  97. 0
    0
      src/cmGrDevCtx.c
  98. 0
    0
      src/cmGrDevCtx.h
  99. 0
    0
      src/cmGrPage.c
  100. 0
    0
      src/cmGrPage.h

+ 107
- 65
Makefile.am View File

@@ -3,111 +3,153 @@
3 3
 cmHDR = 
4 4
 cmSRC = 
5 5
 
6
-cmHDR += src/libcm/cmErr.h src/libcm/cmCtx.h src/libcm/cmRpt.h src/libcm/cmRptFile.h src/libcm/cmGlobal.h src/libcm/cmComplexTypes.h src/libcm/cmFloatTypes.h src/libcm/cmPrefix.h
7
-cmSRC += src/libcm/cmErr.c src/libcm/cmCtx.c src/libcm/cmRpt.c src/libcm/cmRptFile.c src/libcm/cmGlobal.c src/libcm/cmComplexTypes.c
6
+cmHDR += src/cmErr.h src/cmCtx.h src/cmRpt.h src/cmRptFile.h src/cmGlobal.h src/cmComplexTypes.h src/cmFloatTypes.h src/cmPrefix.h
7
+cmSRC += src/cmErr.c src/cmCtx.c src/cmRpt.c src/cmRptFile.c src/cmGlobal.c src/cmComplexTypes.c
8 8
 
9
-cmHDR += src/libcm/cmSerialize.h src/libcm/cmSymTbl.h src/libcm/cmHashTbl.h src/libcm/cmFileSys.h src/libcm/cmFile.h 
10
-cmSRC += src/libcm/cmSerialize.c src/libcm/cmSymTbl.c src/libcm/cmHashTbl.c src/libcm/cmFileSys.c src/libcm/cmFile.c 
9
+cmHDR += src/cmSerialize.h src/cmSymTbl.h src/cmHashTbl.h src/cmFileSys.h src/cmFile.h 
10
+cmSRC += src/cmSerialize.c src/cmSymTbl.c src/cmHashTbl.c src/cmFileSys.c src/cmFile.c 
11 11
 
12
-cmHDR += src/libcm/cmMem.h src/libcm/cmTime.h src/libcm/cmExec.h src/libcm/cmPgmOpts.h
13
-cmSRC += src/libcm/cmMem.c src/libcm/cmTime.c src/libcm/cmExec.c src/libcm/cmPgmOpts.c
12
+cmHDR += src/cmMem.h src/cmTime.h src/cmExec.h src/cmPgmOpts.h
13
+cmSRC += src/cmMem.c src/cmTime.c src/cmExec.c src/cmPgmOpts.c
14 14
 
15
-cmHDR += src/libcm/cmData.h src/libcm/cmLib.h src/libcm/cmText.h src/libcm/cmTextTemplate.h
16
-cmSRC += src/libcm/cmData.c src/libcm/cmLib.c src/libcm/cmText.c src/libcm/cmTextTemplate.c
15
+cmHDR += src/cmData.h src/cmLib.h src/cmText.h src/cmTextTemplate.h
16
+cmSRC += src/cmData.c src/cmLib.c src/cmText.c src/cmTextTemplate.c
17 17
 
18
-cmHDR += src/libcm/cmMath.h src/libcm/cmGnuPlot.h src/libcm/cmKeyboard.h  src/libcm/cmStrStream.h
19
-cmSRC += src/libcm/cmMath.c src/libcm/cmGnuPlot.c src/libcm/cmKeyboard.c  src/libcm/cmStrStream.c
18
+cmHDR += src/cmMath.h src/cmGnuPlot.h src/cmKeyboard.h  src/cmStrStream.h
19
+cmSRC += src/cmMath.c src/cmGnuPlot.c src/cmKeyboard.c  src/cmStrStream.c
20 20
 
21
-cmHDR += src/libcm/cmLinkedHeap.h src/libcm/cmMallocDebug.h src/libcm/cmLex.h src/libcm/cmJson.h src/libcm/cmXml.h 
22
-cmSRC += src/libcm/cmLinkedHeap.c src/libcm/cmMallocDebug.c src/libcm/cmLex.c src/libcm/cmJson.c src/libcm/cmXml.c 
21
+cmHDR += src/cmLinkedHeap.h src/cmMallocDebug.h src/cmLex.h src/cmJson.h src/cmXml.h 
22
+cmSRC += src/cmLinkedHeap.c src/cmMallocDebug.c src/cmLex.c src/cmJson.c src/cmXml.c 
23 23
 
24
-cmHDR += src/libcm/cmPrefs.h src/libcm/cmStack.h src/libcm/cmArray.h src/libcm/cmSvgWriter.h
25
-cmSRC += src/libcm/cmPrefs.c src/libcm/cmStack.c src/libcm/cmArray.c src/libcm/cmSvgWriter.c
24
+cmHDR += src/cmPrefs.h src/cmStack.h src/cmArray.h src/cmSvgWriter.h
25
+cmSRC += src/cmPrefs.c src/cmStack.c src/cmArray.c src/cmSvgWriter.c
26 26
 
27
-cmHDR += src/libcm/cmUdpPort.h src/libcm/cmUdpNet.h src/libcm/cmVirtNet.h
28
-cmSRC += src/libcm/cmUdpPort.c src/libcm/cmUdpNet.c src/libcm/cmVirtNet.c
27
+cmHDR += src/cmUdpPort.h src/cmUdpNet.h src/cmVirtNet.h
28
+cmSRC += src/cmUdpPort.c src/cmUdpNet.c src/cmVirtNet.c
29 29
 
30
-cmHDR += src/libcm/cmAudioPort.h src/libcm/cmApBuf.h src/libcm/cmAudioAggDev.h src/libcm/cmAudioNrtDev.h src/libcm/cmThread.h	
31
-cmSRC += src/libcm/cmAudioPort.c src/libcm/cmApBuf.c src/libcm/cmAudioAggDev.c src/libcm/cmAudioNrtDev.c src/libcm/cmThread.c
30
+cmHDR += src/cmAudioPort.h src/cmApBuf.h src/cmAudioAggDev.h src/cmAudioNrtDev.h src/cmThread.h	
31
+cmSRC += src/cmAudioPort.c src/cmApBuf.c src/cmAudioAggDev.c src/cmAudioNrtDev.c src/cmThread.c
32 32
 
33
-cmHDR += src/libcm/cmMidiFilePlay.h src/libcm/cmMidiPort.h src/libcm/cmMidiFile.h src/libcm/cmMidi.h 
34
-cmSRC += src/libcm/cmMidiFilePlay.c src/libcm/cmMidiPort.c src/libcm/cmMidiFile.c src/libcm/cmMidi.c 
33
+cmHDR += src/cmMidiFilePlay.h src/cmMidiPort.h src/cmMidiFile.h src/cmMidi.h 
34
+cmSRC += src/cmMidiFilePlay.c src/cmMidiPort.c src/cmMidiFile.c src/cmMidi.c 
35 35
 
36
-cmHDR += src/libcm/cmSerialPort.h
37
-cmSRC += src/libcm/cmSerialPort.c
36
+cmHDR += src/cmSerialPort.h
37
+cmSRC += src/cmSerialPort.c
38 38
 
39
-cmHDR += src/libcm/cmAudioFile.h src/libcm/cmAudioFileMgr.h src/libcm/cmMsgProtocol.h src/libcm/cmAudioSys.h src/libcm/cmAudioPortFile.h src/libcm/cmAudioFileDev.h 
40
-cmSRC += src/libcm/cmAudioFile.c src/libcm/cmAudioFileMgr.c src/libcm/cmMsgProtocol.c src/libcm/cmAudioSys.c src/libcm/cmAudioPortFile.c src/libcm/cmAudioFileDev.c
39
+cmHDR += src/cmAudioFile.h src/cmAudioFileMgr.h src/cmMsgProtocol.h src/cmAudioSys.h src/cmAudioSysMsg.h src/cmAudioPortFile.h src/cmAudioFileDev.h 
40
+cmSRC += src/cmAudioFile.c src/cmAudioFileMgr.c src/cmMsgProtocol.c src/cmAudioSys.c src/cmAudioPortFile.c src/cmAudioFileDev.c
41 41
 
42
-cmHDR += src/libcm/cmRtSys.h src/libcm/cmRtNet.h src/libcm/cmUiRtSysMstr.h src/libcm/cmRtSysMsg.h 
43
-cmSRC += src/libcm/cmRtSys.c src/libcm/cmRtNet.c src/libcm/cmUiRtSysMstr.c
42
+cmHDR += src/cmRtSys.h src/cmRtNet.h src/cmUiRtSysMstr.h src/cmRtSysMsg.h 
43
+cmSRC += src/cmRtSys.c src/cmRtNet.c src/cmUiRtSysMstr.c
44 44
 
45
-cmHDR += src/libcm/cmDevCfg.h src/libcm/cmUi.h src/libcm/cmUiDrvr.h 
46
-cmSRC += src/libcm/cmDevCfg.c src/libcm/cmUi.c src/libcm/cmUiDrvr.c
45
+cmHDR += src/cmDevCfg.h src/cmUi.h src/cmUiDrvr.h 
46
+cmSRC += src/cmDevCfg.c src/cmUi.c src/cmUiDrvr.c
47 47
 
48
-cmHDR += src/libcm/cmFrameFile.h src/libcm/cmFeatFile.h src/libcm/cmCsv.h src/libcm/cmAudLabelFile.h src/libcm/cmTagFile.h
49
-cmSRC += src/libcm/cmFrameFile.c src/libcm/cmFeatFile.c src/libcm/cmCsv.c src/libcm/cmAudLabelFile.c src/libcm/cmTagFile.c
48
+cmHDR += src/cmFrameFile.h src/cmFeatFile.h src/cmCsv.h src/cmAudLabelFile.h src/cmTagFile.h
49
+cmSRC += src/cmFrameFile.c src/cmFeatFile.c src/cmCsv.c src/cmAudLabelFile.c src/cmTagFile.c
50 50
 
51
-cmSRC += src/libcm/cmGr.c src/libcm/cmGrDevCtx.c src/libcm/cmGrPage.c src/libcm/cmGrPlot.c src/libcm/cmGrPlotAudio.c
52
-cmHDR += src/libcm/cmGr.h src/libcm/cmGrDevCtx.h src/libcm/cmGrPage.h src/libcm/cmGrPlot.h src/libcm/cmGrPlotAudio.h
51
+cmSRC += src/cmGr.c src/cmGrDevCtx.c src/cmGrPage.c src/cmGrPlot.c src/cmGrPlotAudio.c
52
+cmHDR += src/cmGr.h src/cmGrDevCtx.h src/cmGrPage.h src/cmGrPlot.h src/cmGrPlotAudio.h
53 53
 
54
-cmHDR +=  src/libcm/dsp/cmDspSys.h src/libcm/dsp/cmDspClass.h src/libcm/dsp/cmDspValue.h src/libcm/dsp/cmDspUi.h src/libcm/dsp/cmDspPreset.h src/libcm/dsp/cmDspNet.h
55
-cmSRC +=  src/libcm/dsp/cmDspSys.c src/libcm/dsp/cmDspClass.c src/libcm/dsp/cmDspValue.c src/libcm/dsp/cmDspUi.c src/libcm/dsp/cmDspPreset.c src/libcm/dsp/cmDspNet.c
54
+cmHDR +=  src/dsp/cmDspSys.h src/dsp/cmDspClass.h src/dsp/cmDspValue.h src/dsp/cmDspUi.h src/dsp/cmDspPreset.h src/dsp/cmDspNet.h
55
+cmSRC +=  src/dsp/cmDspSys.c src/dsp/cmDspClass.c src/dsp/cmDspValue.c src/dsp/cmDspUi.c src/dsp/cmDspPreset.c src/dsp/cmDspNet.c
56 56
 
57
-cmHDR += src/libcm/dsp/cmDspStore.h src/libcm/dsp/cmDspBuiltIn.h  src/libcm/dsp/cmDspFx.h 
58
-cmSRC += src/libcm/dsp/cmDspStore.c src/libcm/dsp/cmDspBuiltIn.c  src/libcm/dsp/cmDspFx.c 
57
+cmHDR += src/dsp/cmDspStore.h src/dsp/cmDspBuiltIn.h  src/dsp/cmDspFx.h 
58
+cmSRC += src/dsp/cmDspStore.c src/dsp/cmDspBuiltIn.c  src/dsp/cmDspFx.c 
59 59
 
60
-cmHDR += src/libcm/dsp/cmDspPgm.h src/libcm/dsp/cmDspPgmPP.h src/libcm/dsp/cmDspPgmPPMain.h
61
-cmSRC += src/libcm/dsp/cmDspPgm.c src/libcm/dsp/cmDspPgmPP.c src/libcm/dsp/cmDspPgmPPMain.c
60
+cmHDR += src/dsp/cmDspPgm.h src/dsp/cmDspPgmPP.h src/dsp/cmDspPgmPPMain.h
61
+cmSRC += src/dsp/cmDspPgm.c src/dsp/cmDspPgmPP.c src/dsp/cmDspPgmPPMain.c
62 62
 
63
-cmHDR +=  src/libcm/dsp/cmDspKr.h src/libcm/dsp/cmDspPgmKr.h  src/libcm/dsp/cmDspPgmKrChain.h  
64
-cmSRC +=  src/libcm/dsp/cmDspKr.c src/libcm/dsp/cmDspPgmKr.c  src/libcm/dsp/cmDspPgmKrChain2.c src/libcm/dsp/cmDspPgmKrTksb.c src/libcm/dsp/cmDspPgmKrTimeLineLite.c src/libcm/dsp/cmDspPgmKrTimeLineLiteAf.c
63
+cmHDR +=  src/dsp/cmDspKr.h src/dsp/cmDspPgmKr.h  src/dsp/cmDspPgmKrChain.h  
64
+cmSRC +=  src/dsp/cmDspKr.c src/dsp/cmDspPgmKr.c  src/dsp/cmDspPgmKrChain2.c src/dsp/cmDspPgmKrTksb.c src/dsp/cmDspPgmKrTimeLineLite.c src/dsp/cmDspPgmKrTimeLineLiteAf.c
65 65
 
66
-cmHDR += src/libcm/cmAudDsp.h src/libcm/cmAudDspIF.h src/libcm/cmAudDspLocal.h
67
-cmSRC += src/libcm/cmAudDsp.c src/libcm/cmAudDspIF.c src/libcm/cmAudDspLocal.c
66
+cmHDR += src/cmAudDsp.h src/cmAudDspIF.h src/cmAudDspLocal.h
67
+cmSRC += src/cmAudDsp.c src/cmAudDspIF.c src/cmAudDspLocal.c
68 68
 
69
-cmHDR += src/libcm/vop/cmVectOpsTemplateUndef.h src/libcm/vop/cmVectOpsTemplateHdr.h src/libcm/vop/cmVectOpsTemplateCode.h src/libcm/vop/cmVectOpsTemplateMain.h
70
-cmHDR += src/libcm/vop/cmVectOpsRIHdr.h src/libcm/vop/cmVectOpsRICode.h 
71
-cmHDR += src/libcm/vop/cmProcTemplateUndef.h src/libcm/vop/cmProcTemplateHdr.h src/libcm/vop/cmProcTemplateCode.h src/libcm/vop/cmProcTemplateMain.h
72
-cmHDR += src/libcm/vop/cmVectOps.h src/libcm/vop/cmProcTemplate.h
69
+cmHDR += src/vop/cmVectOpsTemplateUndef.h src/vop/cmVectOpsTemplateHdr.h src/vop/cmVectOpsTemplateCode.h src/vop/cmVectOpsTemplateMain.h
70
+cmHDR += src/vop/cmVectOpsRIHdr.h src/vop/cmVectOpsRICode.h 
71
+cmHDR += src/vop/cmProcTemplateUndef.h src/vop/cmProcTemplateHdr.h src/vop/cmProcTemplateCode.h src/vop/cmProcTemplateMain.h
72
+cmHDR += src/vop/cmVectOps.h src/vop/cmProcTemplate.h
73 73
 
74
-cmSRC += src/libcm/vop/cmVectOps.c src/libcm/vop/cmProcTemplate.c
74
+cmSRC += src/vop/cmVectOps.c src/vop/cmProcTemplate.c
75 75
 
76
-cmSRC += src/libcm/cmDList.c
77
-cmHDR += src/libcm/cmDList.h src/libcm/cmDListTpl.h
76
+cmSRC += src/cmDList.c
77
+cmHDR += src/cmDList.h src/cmDListTpl.h
78 78
 
79
-cmHDR += src/libcm/cmProcObj.h src/libcm/cmProc.h src/libcm/cmProc2.h src/libcm/cmProc3.h src/libcm/cmProc4.h src/libcm/cmProc5.h src/libcm/cmProcTest.h
80
-cmSRC += src/libcm/cmProcObj.c src/libcm/cmProc.c src/libcm/cmProc2.c src/libcm/cmProc3.c src/libcm/cmProc4.c src/libcm/cmProc5.c src/libcm/cmProcTest.c
79
+cmHDR += src/cmProcObj.h src/cmProc.h src/cmProc2.h src/cmProc3.h src/cmProc4.h src/cmProc5.h src/cmProcTest.h
80
+cmSRC += src/cmProcObj.c src/cmProc.c src/cmProc2.c src/cmProc3.c src/cmProc4.c src/cmProc5.c src/cmProcTest.c
81 81
 
82 82
 
83
-cmHDR += src/libcm/app/cmOnset.h src/libcm/app/cmTimeLine.h src/libcm/app/cmScore.h src/libcm/app/cmScoreProc.h src/libcm/app/cmXScore.h src/libcm/app/cmScoreMatchGraphic.h
84
-cmSRC += src/libcm/app/cmOnset.c src/libcm/app/cmTimeLine.c src/libcm/app/cmScore.c src/libcm/app/cmScoreProc.c src/libcm/app/cmXScore.c src/libcm/app/cmScoreMatchGraphic.c
83
+cmHDR += src/app/cmOnset.h src/app/cmTimeLine.h src/app/cmScore.h src/app/cmScoreProc.h src/app/cmXScore.h src/app/cmScoreMatchGraphic.h
84
+cmSRC += src/app/cmOnset.c src/app/cmTimeLine.c src/app/cmScore.c src/app/cmScoreProc.c src/app/cmXScore.c src/app/cmScoreMatchGraphic.c
85 85
 
86
-cmHDR += src/libcm/app/cmMidiScoreFollow.h
87
-cmSRC += src/libcm/app/cmMidiScoreFollow.c
86
+cmHDR += src/app/cmMidiScoreFollow.h
87
+cmSRC += src/app/cmMidiScoreFollow.c
88 88
 
89
-cmHDR += src/libcm/app/cmSdb.h  src/libcm/app/cmTakeSeqBldr.h  src/libcm/app/cmDspPgmJsonToDot.h
90
-cmSRC += src/libcm/app/cmSdb.c  src/libcm/app/cmTakeSeqBldr.c  src/libcm/app/cmDspPgmJsonToDot.c
89
+cmHDR += src/app/cmSdb.h  src/app/cmTakeSeqBldr.h  src/app/cmDspPgmJsonToDot.h
90
+cmSRC += src/app/cmSdb.c  src/app/cmTakeSeqBldr.c  src/app/cmDspPgmJsonToDot.c
91 91
 
92
-cmHDR += src/libcm/app/cmPickup.h src/libcm/cmRbm.h src/libcm/cmTaskMgr.h  src/libcm/cmSyncRecd.h
93
-cmSRC += src/libcm/app/cmPickup.c src/libcm/cmRbm.c src/libcm/cmTaskMgr.c  src/libcm/cmSyncRecd.c
92
+cmHDR += src/app/cmPickup.h src/cmRbm.h src/cmTaskMgr.h  src/cmSyncRecd.h
93
+cmSRC += src/app/cmPickup.c src/cmRbm.c src/cmTaskMgr.c  src/cmSyncRecd.c
94 94
 
95
-cmHDR += src/libcm/sa/cmSaProc.h 
96
-cmSRC += src/libcm/sa/cmSaProc.c
95
+cmHDR += src/sa/cmSaProc.h 
96
+cmSRC += src/sa/cmSaProc.c
97 97
 
98 98
 if INC_SONICART
99
-  cmSRC += src/libcm/sa/ss0/surroundstereo.c src/libcm/sa/ss1/surroundstereo_1.c
99
+  cmSRC += src/sa/ss0/surroundstereo.c src/sa/ss1/surroundstereo_1.c
100 100
 endif
101 101
 
102 102
 if OS_LINUX
103
- cmSRC += src/libcm/linux/cmFileSysLinux.c  src/libcm/linux/cmAudioPortAlsa.c src/libcm/linux/cmMidiAlsa.c
104
- cmHDR += src/libcm/linux/cmFileSysLinux.h  src/libcm/linux/cmAudioPortAlsa.h
103
+ cmSRC += src/linux/cmFileSysLinux.c  src/linux/cmAudioPortAlsa.c src/linux/cmMidiAlsa.c
104
+ cmHDR += src/linux/cmFileSysLinux.h  src/linux/cmAudioPortAlsa.h
105 105
 endif
106 106
 
107 107
 if OS_OSX
108
-  cmSRC += src/libcm/osx/cmMidiOsx.c src/libcm/osx/cmAudioPortOsx.c src/libcm/osx/cmFileSysOsx.c
108
+  cmSRC += src/osx/cmMidiOsx.c src/osx/cmAudioPortOsx.c src/osx/cmFileSysOsx.c
109 109
 endif
110 110
 
111 111
 
112
+lib_LTLIBRARIES=
113
+include_HEADERS=
112 114
 
113 115
 
116
+AM_CPPFLAGS = -D _GNU_SOURCE  -I.. -I$(srcdir)/src  -I$(srcdir)/src/dsp  -I$(srcdir)/src/vop  -I$(srcdir)/src/app
117
+AM_CFLAGS   = -Wno-multichar 
118
+AM_CXXFLAGS = 
119
+
120
+# debug/release switches
121
+if DEBUG
122
+  AM_CFLAGS   += -g 
123
+  AM_CXXFLAGS += -g
124
+else
125
+  AM_CFLAGS   += -O3
126
+  AM_CXXFLAGS += -O3
127
+endif
128
+
129
+# Linux specific compiler flags
130
+if OS_LINUX
131
+if OS_64
132
+  AM_CFLAGS  += -m64
133
+endif	
134
+endif
135
+
136
+# OSX specific compiler flags
137
+if OS_OSX
138
+ AM_CPPFLAGS +=  -I/opt/local/include	# Search macports directory for fftw headers
139
+endif
140
+
141
+# include src/Makefile.am
142
+src_libcm_la_SOURCES   = $(cmSRC) $(cmHDR)
143
+include_HEADERS += $(cmHDR)
144
+lib_LTLIBRARIES += src/libcm.la
145
+
146
+
147
+# distclean-local sets the source tree back to it's minimal, pre-configure, state.
148
+distclean-local:
149
+	rm -rf ${exec_prefix}/src        
150
+	rm -rf ${srcdir}/autom4te.cache
151
+	rm -rf ${srcdir}/build-aux
152
+	rm -f  ${srcdir}/m4/libtool.m4   ${srcdir}/m4/lt~obsolete.m4 ${srcdir}/m4/ltsugar.m4
153
+	rm -f  ${srcdir}/m4/ltversion.m4 ${srcdir}/m4/ltoptions.m4
154
+	rm -f  ${srcdir}/aclocal.m4      ${srcdir}/config.h.in ${srcdir}/config.h.in~
155
+	rm -f  ${srcdir}/Makefile.in     ${srcdir}/configure

+ 40
- 0
build/clean.sh View File

@@ -0,0 +1,40 @@
1
+#!/bin/bash
2
+#
3
+# Run 'make distclean' to clean many of the temporary make files.
4
+# then use this script run from cm/build to clean the remaining files
5
+#
6
+
7
+
8
+
9
+function clean_dir {
10
+
11
+    make -C $1 uninstall
12
+    make -C $1 distclean
13
+
14
+    
15
+    rm -f  $1/bin/kc.app/Contents/MacOS/kc
16
+    
17
+    rm -rf $1/include
18
+    rm -rf $1/lib
19
+    rm -rf $1/bin
20
+    rm -rf $1/.deps
21
+    
22
+}
23
+
24
+
25
+
26
+clean_dir linux/debug
27
+clean_dir linux/release
28
+clean_dir osx/debug
29
+clean_dir osx/release
30
+
31
+rm -rf osx/debug/a.out.dSYM
32
+
33
+
34
+#rm -rf ../octave/results
35
+
36
+# remove all of emacs backup files (files ending width '~')
37
+# find ../ -name "*~" -exec rm {} \; 
38
+
39
+
40
+

+ 18
- 0
build/linux/debug/build.sh View File

@@ -0,0 +1,18 @@
1
+#!/bin/sh
2
+
3
+curdir=`pwd`
4
+
5
+cd ../../..
6
+autoreconf --force --install
7
+
8
+cd ${curdir}
9
+
10
+../../../configure --prefix=${curdir} \
11
+--enable-debug \
12
+CFLAGS="-g -Wall" \
13
+CXXFLAGS="-g -Wall" \
14
+CPPFLAGS= 
15
+
16
+
17
+#make
18
+#make install

+ 24
- 0
build/linux/release/build.sh View File

@@ -0,0 +1,24 @@
1
+#!/bin/sh
2
+
3
+curdir=`pwd`
4
+
5
+cd ../../..
6
+autoreconf --force --install
7
+
8
+cd ${curdir}
9
+
10
+# To Profile w/ gprof:
11
+# 1) Modify configure: ./configure --disable-shared CFLAGS="-pg"
12
+# 2) Run the program. ./foo
13
+# 3) Run gprof /libtool --mode=execute gprof ./foo
14
+
15
+../../../configure --prefix=${curdir} \
16
+CFLAGS="-Wall" \
17
+CXXFLAGS="-Wall" \
18
+CPPFLAGS= \
19
+LDFLAGS= \
20
+LIBS=
21
+
22
+
23
+#make
24
+#make install

+ 20
- 0
build/osx/debug/build.sh View File

@@ -0,0 +1,20 @@
1
+#!/bin/sh
2
+
3
+curdir=`pwd`
4
+
5
+cd ../../..
6
+autoreconf --force --install
7
+
8
+cd ${curdir}
9
+
10
+../../../configure --prefix=${curdir} \
11
+--enable-debug \
12
+CFLAGS="-g -Wall" \
13
+CXXFLAGS="-g -Wall" \
14
+CPPFLAGS= \
15
+LDFLAGS= \
16
+LIBS=
17
+
18
+
19
+#make
20
+#make install

+ 19
- 0
build/osx/release/build.sh View File

@@ -0,0 +1,19 @@
1
+#!/bin/sh
2
+
3
+curdir=`pwd`
4
+
5
+cd ../../..
6
+autoreconf --force --install
7
+
8
+cd ${curdir}
9
+
10
+../../../configure --prefix=${curdir} \
11
+CFLAGS="-Wall" \
12
+CXXFLAGS="-Wall" \
13
+CPPFLAGS= \
14
+LDFLAGS= \
15
+LIBS=
16
+
17
+
18
+#make
19
+#make install

+ 129
- 0
configure.ac View File

@@ -0,0 +1,129 @@
1
+#
2
+# Use "autoreconf --force --install" to update depedent files after changing 
3
+# this configure.ac or any of the Makefile.am files.
4
+#
5
+
6
+AC_INIT([libcm],[1.0],[kpl@currawongproject.org])
7
+AC_CONFIG_AUX_DIR([build-aux])                    # put aux files in build-aux
8
+AM_INIT_AUTOMAKE([1.9 -Wall foreign subdir-objects]) # subdir-objects needed for non-recursive make
9
+AC_CONFIG_SRCDIR([src/cmGlobal.h])
10
+AC_CONFIG_HEADERS([config.h])
11
+AC_CONFIG_MACRO_DIR([m4])
12
+
13
+AM_PROG_AR
14
+
15
+LT_INIT
16
+
17
+# Check for programs
18
+AC_PROG_CC
19
+AC_PROG_CXX
20
+# AC_PROG_RANLIB  # required for static librarires
21
+
22
+AM_PROG_CC_C_O
23
+
24
+# Checks for libraries.
25
+# AC_CHECK_LIB([cairo],[cairo_debug_reset_static_data],[AC_MSG_RESULT([The 'cairo' library was found.])],[AC_MSG_ERROR([The 'cairo' library was not found.])])
26
+#TODO: add more library checks 
27
+
28
+# Checks for header files.
29
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h limits.h mach/mach.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h termios.h unistd.h])
30
+
31
+# Checks for typedefs, structures, and compiler characteristics.
32
+AC_HEADER_STDBOOL
33
+AC_C_INLINE
34
+AC_TYPE_OFF_T
35
+AC_TYPE_SSIZE_T
36
+AC_TYPE_UINT64_T
37
+
38
+# Checks for library functions.
39
+AC_FUNC_ERROR_AT_LINE
40
+AC_FUNC_FORK
41
+AC_FUNC_FSEEKO
42
+AC_FUNC_MALLOC
43
+AC_FUNC_REALLOC
44
+AC_FUNC_STRTOD
45
+AC_CHECK_FUNCS([clock_gettime floor memmove memset mkdir pow rint select socket sqrt strcasecmp strchr strcspn strerror strspn strstr strtol])
46
+
47
+
48
+# The following is a custom macro in ./m4/os_type.m4
49
+# be sure to also set "ACLOCAL_AMFLAGS = -I m4" in ./Makefile.am
50
+# Defines the config.h variable OS_LINUX or OS_OSX
51
+AX_FUNC_OS_TYPE
52
+
53
+AX_FUNC_OS_64
54
+
55
+# ac_cv_os_type is set by AX_FUNC_OS_TYPE
56
+AM_CONDITIONAL([OS_LINUX],[test x"${ax_cv_os_type}" = xLinux])
57
+AM_CONDITIONAL([OS_OSX],[test x"${ax_cv_os_type}" = xDarwin])
58
+echo "OS='${ax_cv_os_type}'"
59
+
60
+AM_CONDITIONAL([OS_64],[test x"${ax_cv_os_64}" == xx86_64])
61
+echo "ptr width='${ax_cv_os_64}'"
62
+
63
+
64
+AC_ARG_ENABLE([debug],
65
+     [  --enable-debug    Turn on debugging],
66
+     [case "${enableval}" in
67
+       yes) debug=true ;;
68
+       no)  debug=false ;;
69
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
70
+     esac],[debug=false])
71
+     
72
+echo "debug=${debug}"
73
+     
74
+AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
75
+
76
+if test x$debug = xfalse; then
77
+AC_DEFINE([NDEBUG], 1,[Debugging off.])
78
+fi
79
+
80
+AC_ARG_ENABLE([vectop],
81
+     [  --enable-vectop    Turn on use of Lapack and Atlas vector/matrix operations. ],
82
+     [case "${enableval}" in
83
+       yes) vectop=true ;;
84
+       no)  vectop=false ;;
85
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-vectop]) ;;
86
+     esac],[vectop=true])
87
+     
88
+echo "vectop=${vectop}"
89
+     
90
+# if --enable-vectop then #define CM_VECTOP = 1 in config.h otherwise CM_VECTOP is undefined.
91
+if test x"$vectop" = xtrue; then
92
+AC_DEFINE([CM_VECTOP], 1,[Use Lapack and Atlas.])
93
+fi
94
+
95
+
96
+AC_ARG_ENABLE([memalign],
97
+     [  --enable-memalign    Turn on memory alignment on dynamic memory allocations. ],
98
+     [case "${enableval}" in
99
+       yes) memalign=true ;;
100
+       no)  memalign=false ;;
101
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-memalign]) ;;
102
+     esac],[memalign=true])
103
+     
104
+echo "memalign=${memalign}"
105
+
106
+# if --enable-vectop then #define CM_MEMALIGN = 1 in config.h otherwise CM_MEMALIGN is undefined.     
107
+if test x"$memalign" = xtrue; then
108
+AC_DEFINE([CM_MEMALIGN], 1,[Turn on dynamic memory alignment.])
109
+fi
110
+
111
+AC_ARG_ENABLE([sonicart],
112
+     [  --enable-sonicart    Enable use of Sonic Arts proprietary code. ],
113
+     [case "${enableval}" in
114
+       yes) sonicart=true ;;
115
+       no)  sonicart=false ;;
116
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-sonicart]) ;;
117
+     esac],[sonicart=false])
118
+     
119
+echo "sonicart=${sonicart}"
120
+     
121
+# if --enable-sonicart then #define CM_SONICART = 1 in config.h otherwise CM_SONICART is undefined.
122
+if test x"$sonicart" = xtrue; then
123
+AC_DEFINE([CM_SONICART], 1,[Include Sonic Arts proprietry code.])
124
+fi
125
+
126
+AM_CONDITIONAL([INC_SONICART], [test x$sonicart = xtrue])
127
+
128
+AC_CONFIG_FILES([ Makefile ])
129
+AC_OUTPUT

+ 8
- 0
m4/os_64.m4 View File

@@ -0,0 +1,8 @@
1
+AC_DEFUN([AX_FUNC_OS_64],
2
+[AC_CACHE_CHECK([operating system address width],
3
+[ax_cv_os_64],
4
+[ax_cv_os_64=`uname -m`])
5
+if test x"$ax_cv_os_64" = xx86_64; then
6
+AC_DEFINE([OS_64], 1,[Operating system is 64 bits.])
7
+fi
8
+]) # AX_FUNC_OS_TYPE

+ 11
- 0
m4/os_type.m4 View File

@@ -0,0 +1,11 @@
1
+AC_DEFUN([AX_FUNC_OS_TYPE],
2
+[AC_CACHE_CHECK([operating system type],
3
+[ax_cv_os_type],
4
+[ax_cv_os_type=`uname`])
5
+if test x"$ax_cv_os_type" = xLinux; then
6
+AC_DEFINE([OS_LINUX], 1,[Operating system is Linux.])
7
+fi
8
+if test x"$ax_cv_os_type" = xDarwin; then
9
+AC_DEFINE([OS_OSX], 1,[Operating system is Darwin.])
10
+fi]) # AX_FUNC_OS_TYPE
11
+

app/cmDspPgmJsonToDot.c → src/app/cmDspPgmJsonToDot.c View File


app/cmDspPgmJsonToDot.h → src/app/cmDspPgmJsonToDot.h View File


app/cmMidiScoreFollow.c → src/app/cmMidiScoreFollow.c View File


app/cmMidiScoreFollow.h → src/app/cmMidiScoreFollow.h View File


app/cmOnset.c → src/app/cmOnset.c View File


app/cmOnset.h → src/app/cmOnset.h View File


app/cmPickup.c → src/app/cmPickup.c View File


app/cmPickup.h → src/app/cmPickup.h View File


app/cmScore.c → src/app/cmScore.c View File


app/cmScore.h → src/app/cmScore.h View File


app/cmScoreMatchGraphic.c → src/app/cmScoreMatchGraphic.c View File


app/cmScoreMatchGraphic.css → src/app/cmScoreMatchGraphic.css View File


app/cmScoreMatchGraphic.h → src/app/cmScoreMatchGraphic.h View File


app/cmScoreProc.c → src/app/cmScoreProc.c View File


app/cmScoreProc.h → src/app/cmScoreProc.h View File


app/cmSdb.c → src/app/cmSdb.c View File


app/cmSdb.h → src/app/cmSdb.h View File


app/cmTakeSeqBldr.c → src/app/cmTakeSeqBldr.c View File


app/cmTakeSeqBldr.h → src/app/cmTakeSeqBldr.h View File


app/cmTimeLine.c → src/app/cmTimeLine.c View File


app/cmTimeLine.h → src/app/cmTimeLine.h View File


app/cmXScore.c → src/app/cmXScore.c View File


app/cmXScore.h → src/app/cmXScore.h View File


cmApBuf.c → src/cmApBuf.c View File


cmApBuf.h → src/cmApBuf.h View File


cmArray.c → src/cmArray.c View File


cmArray.h → src/cmArray.h View File


cmAudDsp.c → src/cmAudDsp.c View File


cmAudDsp.h → src/cmAudDsp.h View File


cmAudDspIF.c → src/cmAudDspIF.c View File


cmAudDspIF.h → src/cmAudDspIF.h View File


cmAudDspLocal.c → src/cmAudDspLocal.c View File


cmAudDspLocal.h → src/cmAudDspLocal.h View File


cmAudLabelFile.c → src/cmAudLabelFile.c View File


cmAudLabelFile.h → src/cmAudLabelFile.h View File


cmAudioAggDev.c → src/cmAudioAggDev.c View File


cmAudioAggDev.h → src/cmAudioAggDev.h View File


cmAudioBuf.c → src/cmAudioBuf.c View File


cmAudioBuf.h → src/cmAudioBuf.h View File


cmAudioFile.c → src/cmAudioFile.c View File


cmAudioFile.h → src/cmAudioFile.h View File


cmAudioFileDev.c → src/cmAudioFileDev.c View File


cmAudioFileDev.h → src/cmAudioFileDev.h View File


cmAudioFileMgr.c → src/cmAudioFileMgr.c View File


cmAudioFileMgr.h → src/cmAudioFileMgr.h View File


cmAudioNrtDev.c → src/cmAudioNrtDev.c View File


cmAudioNrtDev.h → src/cmAudioNrtDev.h View File


cmAudioPort.c → src/cmAudioPort.c View File


cmAudioPort.h → src/cmAudioPort.h View File


cmAudioPortFile.c → src/cmAudioPortFile.c View File


cmAudioPortFile.h → src/cmAudioPortFile.h View File


cmAudioSys.c → src/cmAudioSys.c View File


cmAudioSys.h → src/cmAudioSys.h View File


cmAudioSysMsg.h → src/cmAudioSysMsg.h View File


cmComplexTypes.c → src/cmComplexTypes.c View File


cmComplexTypes.h → src/cmComplexTypes.h View File


cmCsv.c → src/cmCsv.c View File


cmCsv.h → src/cmCsv.h View File


cmCtx.c → src/cmCtx.c View File


cmCtx.h → src/cmCtx.h View File


cmDList.c → src/cmDList.c View File


cmDList.h → src/cmDList.h View File


cmDListTpl.h → src/cmDListTpl.h View File


cmData.c → src/cmData.c View File


cmData.h → src/cmData.h View File


cmDevCfg.c → src/cmDevCfg.c View File


cmDevCfg.h → src/cmDevCfg.h View File


cmDocMain.h → src/cmDocMain.h View File


cmErr.c → src/cmErr.c View File


cmErr.h → src/cmErr.h View File


cmExec.c → src/cmExec.c View File


cmExec.h → src/cmExec.h View File


cmFeatFile.c → src/cmFeatFile.c View File


cmFeatFile.h → src/cmFeatFile.h View File


cmFile.c → src/cmFile.c View File


cmFile.h → src/cmFile.h View File


cmFileSys.c → src/cmFileSys.c View File


cmFileSys.h → src/cmFileSys.h View File


cmFloatTypes.h → src/cmFloatTypes.h View File


cmFrameFile.c → src/cmFrameFile.c View File


cmFrameFile.h → src/cmFrameFile.h View File


cmGlobal.c → src/cmGlobal.c View File


cmGlobal.h → src/cmGlobal.h View File


cmGnuPlot.c → src/cmGnuPlot.c View File


cmGnuPlot.h → src/cmGnuPlot.h View File


cmGr.c → src/cmGr.c View File


cmGr.h → src/cmGr.h View File


cmGrDevCtx.c → src/cmGrDevCtx.c View File


cmGrDevCtx.h → src/cmGrDevCtx.h View File


cmGrPage.c → src/cmGrPage.c View File


cmGrPage.h → src/cmGrPage.h View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save