diff --git a/Makefile.am b/Makefile.am index bf2cb48..099e3a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,111 +3,153 @@ cmHDR = cmSRC = -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 -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 +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 +cmSRC += src/cmErr.c src/cmCtx.c src/cmRpt.c src/cmRptFile.c src/cmGlobal.c src/cmComplexTypes.c -cmHDR += src/libcm/cmSerialize.h src/libcm/cmSymTbl.h src/libcm/cmHashTbl.h src/libcm/cmFileSys.h src/libcm/cmFile.h -cmSRC += src/libcm/cmSerialize.c src/libcm/cmSymTbl.c src/libcm/cmHashTbl.c src/libcm/cmFileSys.c src/libcm/cmFile.c +cmHDR += src/cmSerialize.h src/cmSymTbl.h src/cmHashTbl.h src/cmFileSys.h src/cmFile.h +cmSRC += src/cmSerialize.c src/cmSymTbl.c src/cmHashTbl.c src/cmFileSys.c src/cmFile.c -cmHDR += src/libcm/cmMem.h src/libcm/cmTime.h src/libcm/cmExec.h src/libcm/cmPgmOpts.h -cmSRC += src/libcm/cmMem.c src/libcm/cmTime.c src/libcm/cmExec.c src/libcm/cmPgmOpts.c +cmHDR += src/cmMem.h src/cmTime.h src/cmExec.h src/cmPgmOpts.h +cmSRC += src/cmMem.c src/cmTime.c src/cmExec.c src/cmPgmOpts.c -cmHDR += src/libcm/cmData.h src/libcm/cmLib.h src/libcm/cmText.h src/libcm/cmTextTemplate.h -cmSRC += src/libcm/cmData.c src/libcm/cmLib.c src/libcm/cmText.c src/libcm/cmTextTemplate.c +cmHDR += src/cmData.h src/cmLib.h src/cmText.h src/cmTextTemplate.h +cmSRC += src/cmData.c src/cmLib.c src/cmText.c src/cmTextTemplate.c -cmHDR += src/libcm/cmMath.h src/libcm/cmGnuPlot.h src/libcm/cmKeyboard.h src/libcm/cmStrStream.h -cmSRC += src/libcm/cmMath.c src/libcm/cmGnuPlot.c src/libcm/cmKeyboard.c src/libcm/cmStrStream.c +cmHDR += src/cmMath.h src/cmGnuPlot.h src/cmKeyboard.h src/cmStrStream.h +cmSRC += src/cmMath.c src/cmGnuPlot.c src/cmKeyboard.c src/cmStrStream.c -cmHDR += src/libcm/cmLinkedHeap.h src/libcm/cmMallocDebug.h src/libcm/cmLex.h src/libcm/cmJson.h src/libcm/cmXml.h -cmSRC += src/libcm/cmLinkedHeap.c src/libcm/cmMallocDebug.c src/libcm/cmLex.c src/libcm/cmJson.c src/libcm/cmXml.c +cmHDR += src/cmLinkedHeap.h src/cmMallocDebug.h src/cmLex.h src/cmJson.h src/cmXml.h +cmSRC += src/cmLinkedHeap.c src/cmMallocDebug.c src/cmLex.c src/cmJson.c src/cmXml.c -cmHDR += src/libcm/cmPrefs.h src/libcm/cmStack.h src/libcm/cmArray.h src/libcm/cmSvgWriter.h -cmSRC += src/libcm/cmPrefs.c src/libcm/cmStack.c src/libcm/cmArray.c src/libcm/cmSvgWriter.c +cmHDR += src/cmPrefs.h src/cmStack.h src/cmArray.h src/cmSvgWriter.h +cmSRC += src/cmPrefs.c src/cmStack.c src/cmArray.c src/cmSvgWriter.c -cmHDR += src/libcm/cmUdpPort.h src/libcm/cmUdpNet.h src/libcm/cmVirtNet.h -cmSRC += src/libcm/cmUdpPort.c src/libcm/cmUdpNet.c src/libcm/cmVirtNet.c +cmHDR += src/cmUdpPort.h src/cmUdpNet.h src/cmVirtNet.h +cmSRC += src/cmUdpPort.c src/cmUdpNet.c src/cmVirtNet.c -cmHDR += src/libcm/cmAudioPort.h src/libcm/cmApBuf.h src/libcm/cmAudioAggDev.h src/libcm/cmAudioNrtDev.h src/libcm/cmThread.h -cmSRC += src/libcm/cmAudioPort.c src/libcm/cmApBuf.c src/libcm/cmAudioAggDev.c src/libcm/cmAudioNrtDev.c src/libcm/cmThread.c +cmHDR += src/cmAudioPort.h src/cmApBuf.h src/cmAudioAggDev.h src/cmAudioNrtDev.h src/cmThread.h +cmSRC += src/cmAudioPort.c src/cmApBuf.c src/cmAudioAggDev.c src/cmAudioNrtDev.c src/cmThread.c -cmHDR += src/libcm/cmMidiFilePlay.h src/libcm/cmMidiPort.h src/libcm/cmMidiFile.h src/libcm/cmMidi.h -cmSRC += src/libcm/cmMidiFilePlay.c src/libcm/cmMidiPort.c src/libcm/cmMidiFile.c src/libcm/cmMidi.c +cmHDR += src/cmMidiFilePlay.h src/cmMidiPort.h src/cmMidiFile.h src/cmMidi.h +cmSRC += src/cmMidiFilePlay.c src/cmMidiPort.c src/cmMidiFile.c src/cmMidi.c -cmHDR += src/libcm/cmSerialPort.h -cmSRC += src/libcm/cmSerialPort.c +cmHDR += src/cmSerialPort.h +cmSRC += src/cmSerialPort.c -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 -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 +cmHDR += src/cmAudioFile.h src/cmAudioFileMgr.h src/cmMsgProtocol.h src/cmAudioSys.h src/cmAudioSysMsg.h src/cmAudioPortFile.h src/cmAudioFileDev.h +cmSRC += src/cmAudioFile.c src/cmAudioFileMgr.c src/cmMsgProtocol.c src/cmAudioSys.c src/cmAudioPortFile.c src/cmAudioFileDev.c -cmHDR += src/libcm/cmRtSys.h src/libcm/cmRtNet.h src/libcm/cmUiRtSysMstr.h src/libcm/cmRtSysMsg.h -cmSRC += src/libcm/cmRtSys.c src/libcm/cmRtNet.c src/libcm/cmUiRtSysMstr.c +cmHDR += src/cmRtSys.h src/cmRtNet.h src/cmUiRtSysMstr.h src/cmRtSysMsg.h +cmSRC += src/cmRtSys.c src/cmRtNet.c src/cmUiRtSysMstr.c -cmHDR += src/libcm/cmDevCfg.h src/libcm/cmUi.h src/libcm/cmUiDrvr.h -cmSRC += src/libcm/cmDevCfg.c src/libcm/cmUi.c src/libcm/cmUiDrvr.c +cmHDR += src/cmDevCfg.h src/cmUi.h src/cmUiDrvr.h +cmSRC += src/cmDevCfg.c src/cmUi.c src/cmUiDrvr.c -cmHDR += src/libcm/cmFrameFile.h src/libcm/cmFeatFile.h src/libcm/cmCsv.h src/libcm/cmAudLabelFile.h src/libcm/cmTagFile.h -cmSRC += src/libcm/cmFrameFile.c src/libcm/cmFeatFile.c src/libcm/cmCsv.c src/libcm/cmAudLabelFile.c src/libcm/cmTagFile.c +cmHDR += src/cmFrameFile.h src/cmFeatFile.h src/cmCsv.h src/cmAudLabelFile.h src/cmTagFile.h +cmSRC += src/cmFrameFile.c src/cmFeatFile.c src/cmCsv.c src/cmAudLabelFile.c src/cmTagFile.c -cmSRC += src/libcm/cmGr.c src/libcm/cmGrDevCtx.c src/libcm/cmGrPage.c src/libcm/cmGrPlot.c src/libcm/cmGrPlotAudio.c -cmHDR += src/libcm/cmGr.h src/libcm/cmGrDevCtx.h src/libcm/cmGrPage.h src/libcm/cmGrPlot.h src/libcm/cmGrPlotAudio.h +cmSRC += src/cmGr.c src/cmGrDevCtx.c src/cmGrPage.c src/cmGrPlot.c src/cmGrPlotAudio.c +cmHDR += src/cmGr.h src/cmGrDevCtx.h src/cmGrPage.h src/cmGrPlot.h src/cmGrPlotAudio.h -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 -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 +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 +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 -cmHDR += src/libcm/dsp/cmDspStore.h src/libcm/dsp/cmDspBuiltIn.h src/libcm/dsp/cmDspFx.h -cmSRC += src/libcm/dsp/cmDspStore.c src/libcm/dsp/cmDspBuiltIn.c src/libcm/dsp/cmDspFx.c +cmHDR += src/dsp/cmDspStore.h src/dsp/cmDspBuiltIn.h src/dsp/cmDspFx.h +cmSRC += src/dsp/cmDspStore.c src/dsp/cmDspBuiltIn.c src/dsp/cmDspFx.c -cmHDR += src/libcm/dsp/cmDspPgm.h src/libcm/dsp/cmDspPgmPP.h src/libcm/dsp/cmDspPgmPPMain.h -cmSRC += src/libcm/dsp/cmDspPgm.c src/libcm/dsp/cmDspPgmPP.c src/libcm/dsp/cmDspPgmPPMain.c +cmHDR += src/dsp/cmDspPgm.h src/dsp/cmDspPgmPP.h src/dsp/cmDspPgmPPMain.h +cmSRC += src/dsp/cmDspPgm.c src/dsp/cmDspPgmPP.c src/dsp/cmDspPgmPPMain.c -cmHDR += src/libcm/dsp/cmDspKr.h src/libcm/dsp/cmDspPgmKr.h src/libcm/dsp/cmDspPgmKrChain.h -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 +cmHDR += src/dsp/cmDspKr.h src/dsp/cmDspPgmKr.h src/dsp/cmDspPgmKrChain.h +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 -cmHDR += src/libcm/cmAudDsp.h src/libcm/cmAudDspIF.h src/libcm/cmAudDspLocal.h -cmSRC += src/libcm/cmAudDsp.c src/libcm/cmAudDspIF.c src/libcm/cmAudDspLocal.c +cmHDR += src/cmAudDsp.h src/cmAudDspIF.h src/cmAudDspLocal.h +cmSRC += src/cmAudDsp.c src/cmAudDspIF.c src/cmAudDspLocal.c -cmHDR += src/libcm/vop/cmVectOpsTemplateUndef.h src/libcm/vop/cmVectOpsTemplateHdr.h src/libcm/vop/cmVectOpsTemplateCode.h src/libcm/vop/cmVectOpsTemplateMain.h -cmHDR += src/libcm/vop/cmVectOpsRIHdr.h src/libcm/vop/cmVectOpsRICode.h -cmHDR += src/libcm/vop/cmProcTemplateUndef.h src/libcm/vop/cmProcTemplateHdr.h src/libcm/vop/cmProcTemplateCode.h src/libcm/vop/cmProcTemplateMain.h -cmHDR += src/libcm/vop/cmVectOps.h src/libcm/vop/cmProcTemplate.h +cmHDR += src/vop/cmVectOpsTemplateUndef.h src/vop/cmVectOpsTemplateHdr.h src/vop/cmVectOpsTemplateCode.h src/vop/cmVectOpsTemplateMain.h +cmHDR += src/vop/cmVectOpsRIHdr.h src/vop/cmVectOpsRICode.h +cmHDR += src/vop/cmProcTemplateUndef.h src/vop/cmProcTemplateHdr.h src/vop/cmProcTemplateCode.h src/vop/cmProcTemplateMain.h +cmHDR += src/vop/cmVectOps.h src/vop/cmProcTemplate.h -cmSRC += src/libcm/vop/cmVectOps.c src/libcm/vop/cmProcTemplate.c +cmSRC += src/vop/cmVectOps.c src/vop/cmProcTemplate.c -cmSRC += src/libcm/cmDList.c -cmHDR += src/libcm/cmDList.h src/libcm/cmDListTpl.h +cmSRC += src/cmDList.c +cmHDR += src/cmDList.h src/cmDListTpl.h -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 -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 +cmHDR += src/cmProcObj.h src/cmProc.h src/cmProc2.h src/cmProc3.h src/cmProc4.h src/cmProc5.h src/cmProcTest.h +cmSRC += src/cmProcObj.c src/cmProc.c src/cmProc2.c src/cmProc3.c src/cmProc4.c src/cmProc5.c src/cmProcTest.c -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 -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 +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 +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 -cmHDR += src/libcm/app/cmMidiScoreFollow.h -cmSRC += src/libcm/app/cmMidiScoreFollow.c +cmHDR += src/app/cmMidiScoreFollow.h +cmSRC += src/app/cmMidiScoreFollow.c -cmHDR += src/libcm/app/cmSdb.h src/libcm/app/cmTakeSeqBldr.h src/libcm/app/cmDspPgmJsonToDot.h -cmSRC += src/libcm/app/cmSdb.c src/libcm/app/cmTakeSeqBldr.c src/libcm/app/cmDspPgmJsonToDot.c +cmHDR += src/app/cmSdb.h src/app/cmTakeSeqBldr.h src/app/cmDspPgmJsonToDot.h +cmSRC += src/app/cmSdb.c src/app/cmTakeSeqBldr.c src/app/cmDspPgmJsonToDot.c -cmHDR += src/libcm/app/cmPickup.h src/libcm/cmRbm.h src/libcm/cmTaskMgr.h src/libcm/cmSyncRecd.h -cmSRC += src/libcm/app/cmPickup.c src/libcm/cmRbm.c src/libcm/cmTaskMgr.c src/libcm/cmSyncRecd.c +cmHDR += src/app/cmPickup.h src/cmRbm.h src/cmTaskMgr.h src/cmSyncRecd.h +cmSRC += src/app/cmPickup.c src/cmRbm.c src/cmTaskMgr.c src/cmSyncRecd.c -cmHDR += src/libcm/sa/cmSaProc.h -cmSRC += src/libcm/sa/cmSaProc.c +cmHDR += src/sa/cmSaProc.h +cmSRC += src/sa/cmSaProc.c if INC_SONICART - cmSRC += src/libcm/sa/ss0/surroundstereo.c src/libcm/sa/ss1/surroundstereo_1.c + cmSRC += src/sa/ss0/surroundstereo.c src/sa/ss1/surroundstereo_1.c endif if OS_LINUX - cmSRC += src/libcm/linux/cmFileSysLinux.c src/libcm/linux/cmAudioPortAlsa.c src/libcm/linux/cmMidiAlsa.c - cmHDR += src/libcm/linux/cmFileSysLinux.h src/libcm/linux/cmAudioPortAlsa.h + cmSRC += src/linux/cmFileSysLinux.c src/linux/cmAudioPortAlsa.c src/linux/cmMidiAlsa.c + cmHDR += src/linux/cmFileSysLinux.h src/linux/cmAudioPortAlsa.h endif if OS_OSX - cmSRC += src/libcm/osx/cmMidiOsx.c src/libcm/osx/cmAudioPortOsx.c src/libcm/osx/cmFileSysOsx.c + cmSRC += src/osx/cmMidiOsx.c src/osx/cmAudioPortOsx.c src/osx/cmFileSysOsx.c endif +lib_LTLIBRARIES= +include_HEADERS= +AM_CPPFLAGS = -D _GNU_SOURCE -I.. -I$(srcdir)/src -I$(srcdir)/src/dsp -I$(srcdir)/src/vop -I$(srcdir)/src/app +AM_CFLAGS = -Wno-multichar +AM_CXXFLAGS = + +# debug/release switches +if DEBUG + AM_CFLAGS += -g + AM_CXXFLAGS += -g +else + AM_CFLAGS += -O3 + AM_CXXFLAGS += -O3 +endif + +# Linux specific compiler flags +if OS_LINUX +if OS_64 + AM_CFLAGS += -m64 +endif +endif + +# OSX specific compiler flags +if OS_OSX + AM_CPPFLAGS += -I/opt/local/include # Search macports directory for fftw headers +endif + +# include src/Makefile.am +src_libcm_la_SOURCES = $(cmSRC) $(cmHDR) +include_HEADERS += $(cmHDR) +lib_LTLIBRARIES += src/libcm.la + + +# distclean-local sets the source tree back to it's minimal, pre-configure, state. +distclean-local: + rm -rf ${exec_prefix}/src + rm -rf ${srcdir}/autom4te.cache + rm -rf ${srcdir}/build-aux + rm -f ${srcdir}/m4/libtool.m4 ${srcdir}/m4/lt~obsolete.m4 ${srcdir}/m4/ltsugar.m4 + rm -f ${srcdir}/m4/ltversion.m4 ${srcdir}/m4/ltoptions.m4 + rm -f ${srcdir}/aclocal.m4 ${srcdir}/config.h.in ${srcdir}/config.h.in~ + rm -f ${srcdir}/Makefile.in ${srcdir}/configure diff --git a/build/clean.sh b/build/clean.sh new file mode 100755 index 0000000..00fc879 --- /dev/null +++ b/build/clean.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# +# Run 'make distclean' to clean many of the temporary make files. +# then use this script run from cm/build to clean the remaining files +# + + + +function clean_dir { + + make -C $1 uninstall + make -C $1 distclean + + + rm -f $1/bin/kc.app/Contents/MacOS/kc + + rm -rf $1/include + rm -rf $1/lib + rm -rf $1/bin + rm -rf $1/.deps + +} + + + +clean_dir linux/debug +clean_dir linux/release +clean_dir osx/debug +clean_dir osx/release + +rm -rf osx/debug/a.out.dSYM + + +#rm -rf ../octave/results + +# remove all of emacs backup files (files ending width '~') +# find ../ -name "*~" -exec rm {} \; + + + diff --git a/build/linux/debug/build.sh b/build/linux/debug/build.sh new file mode 100755 index 0000000..e34fe35 --- /dev/null +++ b/build/linux/debug/build.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +../../../configure --prefix=${curdir} \ +--enable-debug \ +CFLAGS="-g -Wall" \ +CXXFLAGS="-g -Wall" \ +CPPFLAGS= + + +#make +#make install diff --git a/build/linux/release/build.sh b/build/linux/release/build.sh new file mode 100755 index 0000000..768adea --- /dev/null +++ b/build/linux/release/build.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +# To Profile w/ gprof: +# 1) Modify configure: ./configure --disable-shared CFLAGS="-pg" +# 2) Run the program. ./foo +# 3) Run gprof /libtool --mode=execute gprof ./foo + +../../../configure --prefix=${curdir} \ +CFLAGS="-Wall" \ +CXXFLAGS="-Wall" \ +CPPFLAGS= \ +LDFLAGS= \ +LIBS= + + +#make +#make install diff --git a/build/osx/debug/build.sh b/build/osx/debug/build.sh new file mode 100755 index 0000000..d53c3ad --- /dev/null +++ b/build/osx/debug/build.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +../../../configure --prefix=${curdir} \ +--enable-debug \ +CFLAGS="-g -Wall" \ +CXXFLAGS="-g -Wall" \ +CPPFLAGS= \ +LDFLAGS= \ +LIBS= + + +#make +#make install \ No newline at end of file diff --git a/build/osx/release/build.sh b/build/osx/release/build.sh new file mode 100755 index 0000000..d1e4027 --- /dev/null +++ b/build/osx/release/build.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +curdir=`pwd` + +cd ../../.. +autoreconf --force --install + +cd ${curdir} + +../../../configure --prefix=${curdir} \ +CFLAGS="-Wall" \ +CXXFLAGS="-Wall" \ +CPPFLAGS= \ +LDFLAGS= \ +LIBS= + + +#make +#make install \ No newline at end of file diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..23e5e46 --- /dev/null +++ b/configure.ac @@ -0,0 +1,129 @@ +# +# Use "autoreconf --force --install" to update depedent files after changing +# this configure.ac or any of the Makefile.am files. +# + +AC_INIT([libcm],[1.0],[kpl@currawongproject.org]) +AC_CONFIG_AUX_DIR([build-aux]) # put aux files in build-aux +AM_INIT_AUTOMAKE([1.9 -Wall foreign subdir-objects]) # subdir-objects needed for non-recursive make +AC_CONFIG_SRCDIR([src/cmGlobal.h]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) + +AM_PROG_AR + +LT_INIT + +# Check for programs +AC_PROG_CC +AC_PROG_CXX +# AC_PROG_RANLIB # required for static librarires + +AM_PROG_CC_C_O + +# Checks for libraries. +# 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.])]) +#TODO: add more library checks + +# Checks for header files. +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]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STDBOOL +AC_C_INLINE +AC_TYPE_OFF_T +AC_TYPE_SSIZE_T +AC_TYPE_UINT64_T + +# Checks for library functions. +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_FUNC_FSEEKO +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_FUNC_STRTOD +AC_CHECK_FUNCS([clock_gettime floor memmove memset mkdir pow rint select socket sqrt strcasecmp strchr strcspn strerror strspn strstr strtol]) + + +# The following is a custom macro in ./m4/os_type.m4 +# be sure to also set "ACLOCAL_AMFLAGS = -I m4" in ./Makefile.am +# Defines the config.h variable OS_LINUX or OS_OSX +AX_FUNC_OS_TYPE + +AX_FUNC_OS_64 + +# ac_cv_os_type is set by AX_FUNC_OS_TYPE +AM_CONDITIONAL([OS_LINUX],[test x"${ax_cv_os_type}" = xLinux]) +AM_CONDITIONAL([OS_OSX],[test x"${ax_cv_os_type}" = xDarwin]) +echo "OS='${ax_cv_os_type}'" + +AM_CONDITIONAL([OS_64],[test x"${ax_cv_os_64}" == xx86_64]) +echo "ptr width='${ax_cv_os_64}'" + + +AC_ARG_ENABLE([debug], + [ --enable-debug Turn on debugging], + [case "${enableval}" in + yes) debug=true ;; + no) debug=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; + esac],[debug=false]) + +echo "debug=${debug}" + +AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) + +if test x$debug = xfalse; then +AC_DEFINE([NDEBUG], 1,[Debugging off.]) +fi + +AC_ARG_ENABLE([vectop], + [ --enable-vectop Turn on use of Lapack and Atlas vector/matrix operations. ], + [case "${enableval}" in + yes) vectop=true ;; + no) vectop=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-vectop]) ;; + esac],[vectop=true]) + +echo "vectop=${vectop}" + +# if --enable-vectop then #define CM_VECTOP = 1 in config.h otherwise CM_VECTOP is undefined. +if test x"$vectop" = xtrue; then +AC_DEFINE([CM_VECTOP], 1,[Use Lapack and Atlas.]) +fi + + +AC_ARG_ENABLE([memalign], + [ --enable-memalign Turn on memory alignment on dynamic memory allocations. ], + [case "${enableval}" in + yes) memalign=true ;; + no) memalign=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-memalign]) ;; + esac],[memalign=true]) + +echo "memalign=${memalign}" + +# if --enable-vectop then #define CM_MEMALIGN = 1 in config.h otherwise CM_MEMALIGN is undefined. +if test x"$memalign" = xtrue; then +AC_DEFINE([CM_MEMALIGN], 1,[Turn on dynamic memory alignment.]) +fi + +AC_ARG_ENABLE([sonicart], + [ --enable-sonicart Enable use of Sonic Arts proprietary code. ], + [case "${enableval}" in + yes) sonicart=true ;; + no) sonicart=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-sonicart]) ;; + esac],[sonicart=false]) + +echo "sonicart=${sonicart}" + +# if --enable-sonicart then #define CM_SONICART = 1 in config.h otherwise CM_SONICART is undefined. +if test x"$sonicart" = xtrue; then +AC_DEFINE([CM_SONICART], 1,[Include Sonic Arts proprietry code.]) +fi + +AM_CONDITIONAL([INC_SONICART], [test x$sonicart = xtrue]) + +AC_CONFIG_FILES([ Makefile ]) +AC_OUTPUT diff --git a/m4/os_64.m4 b/m4/os_64.m4 new file mode 100644 index 0000000..f84a4a1 --- /dev/null +++ b/m4/os_64.m4 @@ -0,0 +1,8 @@ +AC_DEFUN([AX_FUNC_OS_64], +[AC_CACHE_CHECK([operating system address width], +[ax_cv_os_64], +[ax_cv_os_64=`uname -m`]) +if test x"$ax_cv_os_64" = xx86_64; then +AC_DEFINE([OS_64], 1,[Operating system is 64 bits.]) +fi +]) # AX_FUNC_OS_TYPE diff --git a/m4/os_type.m4 b/m4/os_type.m4 new file mode 100644 index 0000000..9b2b86e --- /dev/null +++ b/m4/os_type.m4 @@ -0,0 +1,11 @@ +AC_DEFUN([AX_FUNC_OS_TYPE], +[AC_CACHE_CHECK([operating system type], +[ax_cv_os_type], +[ax_cv_os_type=`uname`]) +if test x"$ax_cv_os_type" = xLinux; then +AC_DEFINE([OS_LINUX], 1,[Operating system is Linux.]) +fi +if test x"$ax_cv_os_type" = xDarwin; then +AC_DEFINE([OS_OSX], 1,[Operating system is Darwin.]) +fi]) # AX_FUNC_OS_TYPE + diff --git a/app/cmDspPgmJsonToDot.c b/src/app/cmDspPgmJsonToDot.c similarity index 100% rename from app/cmDspPgmJsonToDot.c rename to src/app/cmDspPgmJsonToDot.c diff --git a/app/cmDspPgmJsonToDot.h b/src/app/cmDspPgmJsonToDot.h similarity index 100% rename from app/cmDspPgmJsonToDot.h rename to src/app/cmDspPgmJsonToDot.h diff --git a/app/cmMidiScoreFollow.c b/src/app/cmMidiScoreFollow.c similarity index 100% rename from app/cmMidiScoreFollow.c rename to src/app/cmMidiScoreFollow.c diff --git a/app/cmMidiScoreFollow.h b/src/app/cmMidiScoreFollow.h similarity index 100% rename from app/cmMidiScoreFollow.h rename to src/app/cmMidiScoreFollow.h diff --git a/app/cmOnset.c b/src/app/cmOnset.c similarity index 100% rename from app/cmOnset.c rename to src/app/cmOnset.c diff --git a/app/cmOnset.h b/src/app/cmOnset.h similarity index 100% rename from app/cmOnset.h rename to src/app/cmOnset.h diff --git a/app/cmPickup.c b/src/app/cmPickup.c similarity index 100% rename from app/cmPickup.c rename to src/app/cmPickup.c diff --git a/app/cmPickup.h b/src/app/cmPickup.h similarity index 100% rename from app/cmPickup.h rename to src/app/cmPickup.h diff --git a/app/cmScore.c b/src/app/cmScore.c similarity index 100% rename from app/cmScore.c rename to src/app/cmScore.c diff --git a/app/cmScore.h b/src/app/cmScore.h similarity index 100% rename from app/cmScore.h rename to src/app/cmScore.h diff --git a/app/cmScoreMatchGraphic.c b/src/app/cmScoreMatchGraphic.c similarity index 100% rename from app/cmScoreMatchGraphic.c rename to src/app/cmScoreMatchGraphic.c diff --git a/app/cmScoreMatchGraphic.css b/src/app/cmScoreMatchGraphic.css similarity index 100% rename from app/cmScoreMatchGraphic.css rename to src/app/cmScoreMatchGraphic.css diff --git a/app/cmScoreMatchGraphic.h b/src/app/cmScoreMatchGraphic.h similarity index 100% rename from app/cmScoreMatchGraphic.h rename to src/app/cmScoreMatchGraphic.h diff --git a/app/cmScoreProc.c b/src/app/cmScoreProc.c similarity index 100% rename from app/cmScoreProc.c rename to src/app/cmScoreProc.c diff --git a/app/cmScoreProc.h b/src/app/cmScoreProc.h similarity index 100% rename from app/cmScoreProc.h rename to src/app/cmScoreProc.h diff --git a/app/cmSdb.c b/src/app/cmSdb.c similarity index 100% rename from app/cmSdb.c rename to src/app/cmSdb.c diff --git a/app/cmSdb.h b/src/app/cmSdb.h similarity index 100% rename from app/cmSdb.h rename to src/app/cmSdb.h diff --git a/app/cmTakeSeqBldr.c b/src/app/cmTakeSeqBldr.c similarity index 100% rename from app/cmTakeSeqBldr.c rename to src/app/cmTakeSeqBldr.c diff --git a/app/cmTakeSeqBldr.h b/src/app/cmTakeSeqBldr.h similarity index 100% rename from app/cmTakeSeqBldr.h rename to src/app/cmTakeSeqBldr.h diff --git a/app/cmTimeLine.c b/src/app/cmTimeLine.c similarity index 100% rename from app/cmTimeLine.c rename to src/app/cmTimeLine.c diff --git a/app/cmTimeLine.h b/src/app/cmTimeLine.h similarity index 100% rename from app/cmTimeLine.h rename to src/app/cmTimeLine.h diff --git a/app/cmXScore.c b/src/app/cmXScore.c similarity index 100% rename from app/cmXScore.c rename to src/app/cmXScore.c diff --git a/app/cmXScore.h b/src/app/cmXScore.h similarity index 100% rename from app/cmXScore.h rename to src/app/cmXScore.h diff --git a/cmApBuf.c b/src/cmApBuf.c similarity index 100% rename from cmApBuf.c rename to src/cmApBuf.c diff --git a/cmApBuf.h b/src/cmApBuf.h similarity index 100% rename from cmApBuf.h rename to src/cmApBuf.h diff --git a/cmArray.c b/src/cmArray.c similarity index 100% rename from cmArray.c rename to src/cmArray.c diff --git a/cmArray.h b/src/cmArray.h similarity index 100% rename from cmArray.h rename to src/cmArray.h diff --git a/cmAudDsp.c b/src/cmAudDsp.c similarity index 100% rename from cmAudDsp.c rename to src/cmAudDsp.c diff --git a/cmAudDsp.h b/src/cmAudDsp.h similarity index 100% rename from cmAudDsp.h rename to src/cmAudDsp.h diff --git a/cmAudDspIF.c b/src/cmAudDspIF.c similarity index 100% rename from cmAudDspIF.c rename to src/cmAudDspIF.c diff --git a/cmAudDspIF.h b/src/cmAudDspIF.h similarity index 100% rename from cmAudDspIF.h rename to src/cmAudDspIF.h diff --git a/cmAudDspLocal.c b/src/cmAudDspLocal.c similarity index 100% rename from cmAudDspLocal.c rename to src/cmAudDspLocal.c diff --git a/cmAudDspLocal.h b/src/cmAudDspLocal.h similarity index 100% rename from cmAudDspLocal.h rename to src/cmAudDspLocal.h diff --git a/cmAudLabelFile.c b/src/cmAudLabelFile.c similarity index 100% rename from cmAudLabelFile.c rename to src/cmAudLabelFile.c diff --git a/cmAudLabelFile.h b/src/cmAudLabelFile.h similarity index 100% rename from cmAudLabelFile.h rename to src/cmAudLabelFile.h diff --git a/cmAudioAggDev.c b/src/cmAudioAggDev.c similarity index 100% rename from cmAudioAggDev.c rename to src/cmAudioAggDev.c diff --git a/cmAudioAggDev.h b/src/cmAudioAggDev.h similarity index 100% rename from cmAudioAggDev.h rename to src/cmAudioAggDev.h diff --git a/cmAudioBuf.c b/src/cmAudioBuf.c similarity index 100% rename from cmAudioBuf.c rename to src/cmAudioBuf.c diff --git a/cmAudioBuf.h b/src/cmAudioBuf.h similarity index 100% rename from cmAudioBuf.h rename to src/cmAudioBuf.h diff --git a/cmAudioFile.c b/src/cmAudioFile.c similarity index 100% rename from cmAudioFile.c rename to src/cmAudioFile.c diff --git a/cmAudioFile.h b/src/cmAudioFile.h similarity index 100% rename from cmAudioFile.h rename to src/cmAudioFile.h diff --git a/cmAudioFileDev.c b/src/cmAudioFileDev.c similarity index 100% rename from cmAudioFileDev.c rename to src/cmAudioFileDev.c diff --git a/cmAudioFileDev.h b/src/cmAudioFileDev.h similarity index 100% rename from cmAudioFileDev.h rename to src/cmAudioFileDev.h diff --git a/cmAudioFileMgr.c b/src/cmAudioFileMgr.c similarity index 100% rename from cmAudioFileMgr.c rename to src/cmAudioFileMgr.c diff --git a/cmAudioFileMgr.h b/src/cmAudioFileMgr.h similarity index 100% rename from cmAudioFileMgr.h rename to src/cmAudioFileMgr.h diff --git a/cmAudioNrtDev.c b/src/cmAudioNrtDev.c similarity index 100% rename from cmAudioNrtDev.c rename to src/cmAudioNrtDev.c diff --git a/cmAudioNrtDev.h b/src/cmAudioNrtDev.h similarity index 100% rename from cmAudioNrtDev.h rename to src/cmAudioNrtDev.h diff --git a/cmAudioPort.c b/src/cmAudioPort.c similarity index 100% rename from cmAudioPort.c rename to src/cmAudioPort.c diff --git a/cmAudioPort.h b/src/cmAudioPort.h similarity index 100% rename from cmAudioPort.h rename to src/cmAudioPort.h diff --git a/cmAudioPortFile.c b/src/cmAudioPortFile.c similarity index 100% rename from cmAudioPortFile.c rename to src/cmAudioPortFile.c diff --git a/cmAudioPortFile.h b/src/cmAudioPortFile.h similarity index 100% rename from cmAudioPortFile.h rename to src/cmAudioPortFile.h diff --git a/cmAudioSys.c b/src/cmAudioSys.c similarity index 100% rename from cmAudioSys.c rename to src/cmAudioSys.c diff --git a/cmAudioSys.h b/src/cmAudioSys.h similarity index 100% rename from cmAudioSys.h rename to src/cmAudioSys.h diff --git a/cmAudioSysMsg.h b/src/cmAudioSysMsg.h similarity index 100% rename from cmAudioSysMsg.h rename to src/cmAudioSysMsg.h diff --git a/cmComplexTypes.c b/src/cmComplexTypes.c similarity index 100% rename from cmComplexTypes.c rename to src/cmComplexTypes.c diff --git a/cmComplexTypes.h b/src/cmComplexTypes.h similarity index 100% rename from cmComplexTypes.h rename to src/cmComplexTypes.h diff --git a/cmCsv.c b/src/cmCsv.c similarity index 100% rename from cmCsv.c rename to src/cmCsv.c diff --git a/cmCsv.h b/src/cmCsv.h similarity index 100% rename from cmCsv.h rename to src/cmCsv.h diff --git a/cmCtx.c b/src/cmCtx.c similarity index 100% rename from cmCtx.c rename to src/cmCtx.c diff --git a/cmCtx.h b/src/cmCtx.h similarity index 100% rename from cmCtx.h rename to src/cmCtx.h diff --git a/cmDList.c b/src/cmDList.c similarity index 100% rename from cmDList.c rename to src/cmDList.c diff --git a/cmDList.h b/src/cmDList.h similarity index 100% rename from cmDList.h rename to src/cmDList.h diff --git a/cmDListTpl.h b/src/cmDListTpl.h similarity index 100% rename from cmDListTpl.h rename to src/cmDListTpl.h diff --git a/cmData.c b/src/cmData.c similarity index 100% rename from cmData.c rename to src/cmData.c diff --git a/cmData.h b/src/cmData.h similarity index 100% rename from cmData.h rename to src/cmData.h diff --git a/cmDevCfg.c b/src/cmDevCfg.c similarity index 100% rename from cmDevCfg.c rename to src/cmDevCfg.c diff --git a/cmDevCfg.h b/src/cmDevCfg.h similarity index 100% rename from cmDevCfg.h rename to src/cmDevCfg.h diff --git a/cmDocMain.h b/src/cmDocMain.h similarity index 100% rename from cmDocMain.h rename to src/cmDocMain.h diff --git a/cmErr.c b/src/cmErr.c similarity index 100% rename from cmErr.c rename to src/cmErr.c diff --git a/cmErr.h b/src/cmErr.h similarity index 100% rename from cmErr.h rename to src/cmErr.h diff --git a/cmExec.c b/src/cmExec.c similarity index 100% rename from cmExec.c rename to src/cmExec.c diff --git a/cmExec.h b/src/cmExec.h similarity index 100% rename from cmExec.h rename to src/cmExec.h diff --git a/cmFeatFile.c b/src/cmFeatFile.c similarity index 100% rename from cmFeatFile.c rename to src/cmFeatFile.c diff --git a/cmFeatFile.h b/src/cmFeatFile.h similarity index 100% rename from cmFeatFile.h rename to src/cmFeatFile.h diff --git a/cmFile.c b/src/cmFile.c similarity index 100% rename from cmFile.c rename to src/cmFile.c diff --git a/cmFile.h b/src/cmFile.h similarity index 100% rename from cmFile.h rename to src/cmFile.h diff --git a/cmFileSys.c b/src/cmFileSys.c similarity index 100% rename from cmFileSys.c rename to src/cmFileSys.c diff --git a/cmFileSys.h b/src/cmFileSys.h similarity index 100% rename from cmFileSys.h rename to src/cmFileSys.h diff --git a/cmFloatTypes.h b/src/cmFloatTypes.h similarity index 100% rename from cmFloatTypes.h rename to src/cmFloatTypes.h diff --git a/cmFrameFile.c b/src/cmFrameFile.c similarity index 100% rename from cmFrameFile.c rename to src/cmFrameFile.c diff --git a/cmFrameFile.h b/src/cmFrameFile.h similarity index 100% rename from cmFrameFile.h rename to src/cmFrameFile.h diff --git a/cmGlobal.c b/src/cmGlobal.c similarity index 100% rename from cmGlobal.c rename to src/cmGlobal.c diff --git a/cmGlobal.h b/src/cmGlobal.h similarity index 100% rename from cmGlobal.h rename to src/cmGlobal.h diff --git a/cmGnuPlot.c b/src/cmGnuPlot.c similarity index 100% rename from cmGnuPlot.c rename to src/cmGnuPlot.c diff --git a/cmGnuPlot.h b/src/cmGnuPlot.h similarity index 100% rename from cmGnuPlot.h rename to src/cmGnuPlot.h diff --git a/cmGr.c b/src/cmGr.c similarity index 100% rename from cmGr.c rename to src/cmGr.c diff --git a/cmGr.h b/src/cmGr.h similarity index 100% rename from cmGr.h rename to src/cmGr.h diff --git a/cmGrDevCtx.c b/src/cmGrDevCtx.c similarity index 100% rename from cmGrDevCtx.c rename to src/cmGrDevCtx.c diff --git a/cmGrDevCtx.h b/src/cmGrDevCtx.h similarity index 100% rename from cmGrDevCtx.h rename to src/cmGrDevCtx.h diff --git a/cmGrPage.c b/src/cmGrPage.c similarity index 100% rename from cmGrPage.c rename to src/cmGrPage.c diff --git a/cmGrPage.h b/src/cmGrPage.h similarity index 100% rename from cmGrPage.h rename to src/cmGrPage.h diff --git a/cmGrPlot.c b/src/cmGrPlot.c similarity index 100% rename from cmGrPlot.c rename to src/cmGrPlot.c diff --git a/cmGrPlot.h b/src/cmGrPlot.h similarity index 100% rename from cmGrPlot.h rename to src/cmGrPlot.h diff --git a/cmGrPlotAudio.c b/src/cmGrPlotAudio.c similarity index 100% rename from cmGrPlotAudio.c rename to src/cmGrPlotAudio.c diff --git a/cmGrPlotAudio.h b/src/cmGrPlotAudio.h similarity index 100% rename from cmGrPlotAudio.h rename to src/cmGrPlotAudio.h diff --git a/cmHashTbl.c b/src/cmHashTbl.c similarity index 100% rename from cmHashTbl.c rename to src/cmHashTbl.c diff --git a/cmHashTbl.h b/src/cmHashTbl.h similarity index 100% rename from cmHashTbl.h rename to src/cmHashTbl.h diff --git a/cmJson.c b/src/cmJson.c similarity index 100% rename from cmJson.c rename to src/cmJson.c diff --git a/cmJson.h b/src/cmJson.h similarity index 100% rename from cmJson.h rename to src/cmJson.h diff --git a/cmKeyboard.c b/src/cmKeyboard.c similarity index 100% rename from cmKeyboard.c rename to src/cmKeyboard.c diff --git a/cmKeyboard.h b/src/cmKeyboard.h similarity index 100% rename from cmKeyboard.h rename to src/cmKeyboard.h diff --git a/cmLex.c b/src/cmLex.c similarity index 100% rename from cmLex.c rename to src/cmLex.c diff --git a/cmLex.h b/src/cmLex.h similarity index 100% rename from cmLex.h rename to src/cmLex.h diff --git a/cmLib.c b/src/cmLib.c similarity index 100% rename from cmLib.c rename to src/cmLib.c diff --git a/cmLib.h b/src/cmLib.h similarity index 100% rename from cmLib.h rename to src/cmLib.h diff --git a/cmLinkedHeap.c b/src/cmLinkedHeap.c similarity index 100% rename from cmLinkedHeap.c rename to src/cmLinkedHeap.c diff --git a/cmLinkedHeap.h b/src/cmLinkedHeap.h similarity index 100% rename from cmLinkedHeap.h rename to src/cmLinkedHeap.h diff --git a/cmMain.c b/src/cmMain.c similarity index 100% rename from cmMain.c rename to src/cmMain.c diff --git a/cmMallocDebug.c b/src/cmMallocDebug.c similarity index 100% rename from cmMallocDebug.c rename to src/cmMallocDebug.c diff --git a/cmMallocDebug.h b/src/cmMallocDebug.h similarity index 100% rename from cmMallocDebug.h rename to src/cmMallocDebug.h diff --git a/cmMath.c b/src/cmMath.c similarity index 100% rename from cmMath.c rename to src/cmMath.c diff --git a/cmMath.h b/src/cmMath.h similarity index 100% rename from cmMath.h rename to src/cmMath.h diff --git a/cmMem.c b/src/cmMem.c similarity index 100% rename from cmMem.c rename to src/cmMem.c diff --git a/cmMem.h b/src/cmMem.h similarity index 100% rename from cmMem.h rename to src/cmMem.h diff --git a/cmMidi.c b/src/cmMidi.c similarity index 100% rename from cmMidi.c rename to src/cmMidi.c diff --git a/cmMidi.h b/src/cmMidi.h similarity index 100% rename from cmMidi.h rename to src/cmMidi.h diff --git a/cmMidiFile.c b/src/cmMidiFile.c similarity index 100% rename from cmMidiFile.c rename to src/cmMidiFile.c diff --git a/cmMidiFile.h b/src/cmMidiFile.h similarity index 100% rename from cmMidiFile.h rename to src/cmMidiFile.h diff --git a/cmMidiFilePlay.c b/src/cmMidiFilePlay.c similarity index 100% rename from cmMidiFilePlay.c rename to src/cmMidiFilePlay.c diff --git a/cmMidiFilePlay.h b/src/cmMidiFilePlay.h similarity index 100% rename from cmMidiFilePlay.h rename to src/cmMidiFilePlay.h diff --git a/cmMidiPort.c b/src/cmMidiPort.c similarity index 100% rename from cmMidiPort.c rename to src/cmMidiPort.c diff --git a/cmMidiPort.h b/src/cmMidiPort.h similarity index 100% rename from cmMidiPort.h rename to src/cmMidiPort.h diff --git a/cmMsgProtocol.c b/src/cmMsgProtocol.c similarity index 100% rename from cmMsgProtocol.c rename to src/cmMsgProtocol.c diff --git a/cmMsgProtocol.h b/src/cmMsgProtocol.h similarity index 100% rename from cmMsgProtocol.h rename to src/cmMsgProtocol.h diff --git a/cmPgmOpts.c b/src/cmPgmOpts.c similarity index 100% rename from cmPgmOpts.c rename to src/cmPgmOpts.c diff --git a/cmPgmOpts.h b/src/cmPgmOpts.h similarity index 100% rename from cmPgmOpts.h rename to src/cmPgmOpts.h diff --git a/cmPrefix.h b/src/cmPrefix.h similarity index 100% rename from cmPrefix.h rename to src/cmPrefix.h diff --git a/cmPrefs.c b/src/cmPrefs.c similarity index 100% rename from cmPrefs.c rename to src/cmPrefs.c diff --git a/cmPrefs.h b/src/cmPrefs.h similarity index 100% rename from cmPrefs.h rename to src/cmPrefs.h diff --git a/cmProc.c b/src/cmProc.c similarity index 100% rename from cmProc.c rename to src/cmProc.c diff --git a/cmProc.h b/src/cmProc.h similarity index 100% rename from cmProc.h rename to src/cmProc.h diff --git a/cmProc2.c b/src/cmProc2.c similarity index 100% rename from cmProc2.c rename to src/cmProc2.c diff --git a/cmProc2.h b/src/cmProc2.h similarity index 100% rename from cmProc2.h rename to src/cmProc2.h diff --git a/cmProc3.c b/src/cmProc3.c similarity index 100% rename from cmProc3.c rename to src/cmProc3.c diff --git a/cmProc3.h b/src/cmProc3.h similarity index 100% rename from cmProc3.h rename to src/cmProc3.h diff --git a/cmProc4.c b/src/cmProc4.c similarity index 100% rename from cmProc4.c rename to src/cmProc4.c diff --git a/cmProc4.h b/src/cmProc4.h similarity index 100% rename from cmProc4.h rename to src/cmProc4.h diff --git a/cmProc5.c b/src/cmProc5.c similarity index 100% rename from cmProc5.c rename to src/cmProc5.c diff --git a/cmProc5.h b/src/cmProc5.h similarity index 100% rename from cmProc5.h rename to src/cmProc5.h diff --git a/cmProcObj.c b/src/cmProcObj.c similarity index 100% rename from cmProcObj.c rename to src/cmProcObj.c diff --git a/cmProcObj.h b/src/cmProcObj.h similarity index 100% rename from cmProcObj.h rename to src/cmProcObj.h diff --git a/cmProcTest.c b/src/cmProcTest.c similarity index 100% rename from cmProcTest.c rename to src/cmProcTest.c diff --git a/cmProcTest.h b/src/cmProcTest.h similarity index 100% rename from cmProcTest.h rename to src/cmProcTest.h diff --git a/cmRbm.c b/src/cmRbm.c similarity index 100% rename from cmRbm.c rename to src/cmRbm.c diff --git a/cmRbm.h b/src/cmRbm.h similarity index 100% rename from cmRbm.h rename to src/cmRbm.h diff --git a/cmRpt.c b/src/cmRpt.c similarity index 100% rename from cmRpt.c rename to src/cmRpt.c diff --git a/cmRpt.h b/src/cmRpt.h similarity index 100% rename from cmRpt.h rename to src/cmRpt.h diff --git a/cmRptFile.c b/src/cmRptFile.c similarity index 100% rename from cmRptFile.c rename to src/cmRptFile.c diff --git a/cmRptFile.h b/src/cmRptFile.h similarity index 100% rename from cmRptFile.h rename to src/cmRptFile.h diff --git a/cmRtNet.c b/src/cmRtNet.c similarity index 100% rename from cmRtNet.c rename to src/cmRtNet.c diff --git a/cmRtNet.h b/src/cmRtNet.h similarity index 100% rename from cmRtNet.h rename to src/cmRtNet.h diff --git a/cmRtSys.c b/src/cmRtSys.c similarity index 100% rename from cmRtSys.c rename to src/cmRtSys.c diff --git a/cmRtSys.h b/src/cmRtSys.h similarity index 100% rename from cmRtSys.h rename to src/cmRtSys.h diff --git a/cmRtSysMsg.h b/src/cmRtSysMsg.h similarity index 100% rename from cmRtSysMsg.h rename to src/cmRtSysMsg.h diff --git a/cmSerialPort.c b/src/cmSerialPort.c similarity index 100% rename from cmSerialPort.c rename to src/cmSerialPort.c diff --git a/cmSerialPort.h b/src/cmSerialPort.h similarity index 100% rename from cmSerialPort.h rename to src/cmSerialPort.h diff --git a/cmSerialize.c b/src/cmSerialize.c similarity index 100% rename from cmSerialize.c rename to src/cmSerialize.c diff --git a/cmSerialize.h b/src/cmSerialize.h similarity index 100% rename from cmSerialize.h rename to src/cmSerialize.h diff --git a/cmStack.c b/src/cmStack.c similarity index 100% rename from cmStack.c rename to src/cmStack.c diff --git a/cmStack.h b/src/cmStack.h similarity index 100% rename from cmStack.h rename to src/cmStack.h diff --git a/cmStrStream.c b/src/cmStrStream.c similarity index 100% rename from cmStrStream.c rename to src/cmStrStream.c diff --git a/cmStrStream.h b/src/cmStrStream.h similarity index 100% rename from cmStrStream.h rename to src/cmStrStream.h diff --git a/cmSvgWriter.c b/src/cmSvgWriter.c similarity index 100% rename from cmSvgWriter.c rename to src/cmSvgWriter.c diff --git a/cmSvgWriter.h b/src/cmSvgWriter.h similarity index 100% rename from cmSvgWriter.h rename to src/cmSvgWriter.h diff --git a/cmSymTbl.c b/src/cmSymTbl.c similarity index 100% rename from cmSymTbl.c rename to src/cmSymTbl.c diff --git a/cmSymTbl.h b/src/cmSymTbl.h similarity index 100% rename from cmSymTbl.h rename to src/cmSymTbl.h diff --git a/cmSyncRecd.c b/src/cmSyncRecd.c similarity index 100% rename from cmSyncRecd.c rename to src/cmSyncRecd.c diff --git a/cmSyncRecd.h b/src/cmSyncRecd.h similarity index 100% rename from cmSyncRecd.h rename to src/cmSyncRecd.h diff --git a/cmTagFile.c b/src/cmTagFile.c similarity index 100% rename from cmTagFile.c rename to src/cmTagFile.c diff --git a/cmTagFile.h b/src/cmTagFile.h similarity index 100% rename from cmTagFile.h rename to src/cmTagFile.h diff --git a/cmTaskMgr.c b/src/cmTaskMgr.c similarity index 100% rename from cmTaskMgr.c rename to src/cmTaskMgr.c diff --git a/cmTaskMgr.h b/src/cmTaskMgr.h similarity index 100% rename from cmTaskMgr.h rename to src/cmTaskMgr.h diff --git a/cmText.c b/src/cmText.c similarity index 100% rename from cmText.c rename to src/cmText.c diff --git a/cmText.h b/src/cmText.h similarity index 100% rename from cmText.h rename to src/cmText.h diff --git a/cmTextTemplate.c b/src/cmTextTemplate.c similarity index 100% rename from cmTextTemplate.c rename to src/cmTextTemplate.c diff --git a/cmTextTemplate.h b/src/cmTextTemplate.h similarity index 100% rename from cmTextTemplate.h rename to src/cmTextTemplate.h diff --git a/cmThread.c b/src/cmThread.c similarity index 100% rename from cmThread.c rename to src/cmThread.c diff --git a/cmThread.h b/src/cmThread.h similarity index 100% rename from cmThread.h rename to src/cmThread.h diff --git a/cmTime.c b/src/cmTime.c similarity index 100% rename from cmTime.c rename to src/cmTime.c diff --git a/cmTime.h b/src/cmTime.h similarity index 100% rename from cmTime.h rename to src/cmTime.h diff --git a/cmUdpNet.c b/src/cmUdpNet.c similarity index 100% rename from cmUdpNet.c rename to src/cmUdpNet.c diff --git a/cmUdpNet.h b/src/cmUdpNet.h similarity index 100% rename from cmUdpNet.h rename to src/cmUdpNet.h diff --git a/cmUdpPort.c b/src/cmUdpPort.c similarity index 100% rename from cmUdpPort.c rename to src/cmUdpPort.c diff --git a/cmUdpPort.h b/src/cmUdpPort.h similarity index 100% rename from cmUdpPort.h rename to src/cmUdpPort.h diff --git a/cmUi.c b/src/cmUi.c similarity index 100% rename from cmUi.c rename to src/cmUi.c diff --git a/cmUi.h b/src/cmUi.h similarity index 100% rename from cmUi.h rename to src/cmUi.h diff --git a/cmUiDrvr.c b/src/cmUiDrvr.c similarity index 100% rename from cmUiDrvr.c rename to src/cmUiDrvr.c diff --git a/cmUiDrvr.h b/src/cmUiDrvr.h similarity index 100% rename from cmUiDrvr.h rename to src/cmUiDrvr.h diff --git a/cmUiRtSysMstr.c b/src/cmUiRtSysMstr.c similarity index 100% rename from cmUiRtSysMstr.c rename to src/cmUiRtSysMstr.c diff --git a/cmUiRtSysMstr.h b/src/cmUiRtSysMstr.h similarity index 100% rename from cmUiRtSysMstr.h rename to src/cmUiRtSysMstr.h diff --git a/cmVirtNet.c b/src/cmVirtNet.c similarity index 100% rename from cmVirtNet.c rename to src/cmVirtNet.c diff --git a/cmVirtNet.h b/src/cmVirtNet.h similarity index 100% rename from cmVirtNet.h rename to src/cmVirtNet.h diff --git a/cmXml.c b/src/cmXml.c similarity index 100% rename from cmXml.c rename to src/cmXml.c diff --git a/cmXml.h b/src/cmXml.h similarity index 100% rename from cmXml.h rename to src/cmXml.h diff --git a/dsp/cmDspBuiltIn.c b/src/dsp/cmDspBuiltIn.c similarity index 100% rename from dsp/cmDspBuiltIn.c rename to src/dsp/cmDspBuiltIn.c diff --git a/dsp/cmDspBuiltIn.h b/src/dsp/cmDspBuiltIn.h similarity index 100% rename from dsp/cmDspBuiltIn.h rename to src/dsp/cmDspBuiltIn.h diff --git a/dsp/cmDspClass.c b/src/dsp/cmDspClass.c similarity index 100% rename from dsp/cmDspClass.c rename to src/dsp/cmDspClass.c diff --git a/dsp/cmDspClass.h b/src/dsp/cmDspClass.h similarity index 100% rename from dsp/cmDspClass.h rename to src/dsp/cmDspClass.h diff --git a/dsp/cmDspCtx.h b/src/dsp/cmDspCtx.h similarity index 100% rename from dsp/cmDspCtx.h rename to src/dsp/cmDspCtx.h diff --git a/dsp/cmDspFx.c b/src/dsp/cmDspFx.c similarity index 100% rename from dsp/cmDspFx.c rename to src/dsp/cmDspFx.c diff --git a/dsp/cmDspFx.h b/src/dsp/cmDspFx.h similarity index 100% rename from dsp/cmDspFx.h rename to src/dsp/cmDspFx.h diff --git a/dsp/cmDspKr.c b/src/dsp/cmDspKr.c similarity index 100% rename from dsp/cmDspKr.c rename to src/dsp/cmDspKr.c diff --git a/dsp/cmDspKr.h b/src/dsp/cmDspKr.h similarity index 100% rename from dsp/cmDspKr.h rename to src/dsp/cmDspKr.h diff --git a/dsp/cmDspMod.c b/src/dsp/cmDspMod.c similarity index 100% rename from dsp/cmDspMod.c rename to src/dsp/cmDspMod.c diff --git a/dsp/cmDspNet.c b/src/dsp/cmDspNet.c similarity index 100% rename from dsp/cmDspNet.c rename to src/dsp/cmDspNet.c diff --git a/dsp/cmDspNet.h b/src/dsp/cmDspNet.h similarity index 100% rename from dsp/cmDspNet.h rename to src/dsp/cmDspNet.h diff --git a/dsp/cmDspPgm.c b/src/dsp/cmDspPgm.c similarity index 100% rename from dsp/cmDspPgm.c rename to src/dsp/cmDspPgm.c diff --git a/dsp/cmDspPgm.h b/src/dsp/cmDspPgm.h similarity index 100% rename from dsp/cmDspPgm.h rename to src/dsp/cmDspPgm.h diff --git a/dsp/cmDspPgmKr.c b/src/dsp/cmDspPgmKr.c similarity index 100% rename from dsp/cmDspPgmKr.c rename to src/dsp/cmDspPgmKr.c diff --git a/dsp/cmDspPgmKr.h b/src/dsp/cmDspPgmKr.h similarity index 100% rename from dsp/cmDspPgmKr.h rename to src/dsp/cmDspPgmKr.h diff --git a/dsp/cmDspPgmKrChain.c b/src/dsp/cmDspPgmKrChain.c similarity index 100% rename from dsp/cmDspPgmKrChain.c rename to src/dsp/cmDspPgmKrChain.c diff --git a/dsp/cmDspPgmKrChain.h b/src/dsp/cmDspPgmKrChain.h similarity index 100% rename from dsp/cmDspPgmKrChain.h rename to src/dsp/cmDspPgmKrChain.h diff --git a/dsp/cmDspPgmKrChain2.c b/src/dsp/cmDspPgmKrChain2.c similarity index 100% rename from dsp/cmDspPgmKrChain2.c rename to src/dsp/cmDspPgmKrChain2.c diff --git a/dsp/cmDspPgmKrTimeLineLite.c b/src/dsp/cmDspPgmKrTimeLineLite.c similarity index 100% rename from dsp/cmDspPgmKrTimeLineLite.c rename to src/dsp/cmDspPgmKrTimeLineLite.c diff --git a/dsp/cmDspPgmKrTimeLineLiteAf.c b/src/dsp/cmDspPgmKrTimeLineLiteAf.c similarity index 100% rename from dsp/cmDspPgmKrTimeLineLiteAf.c rename to src/dsp/cmDspPgmKrTimeLineLiteAf.c diff --git a/dsp/cmDspPgmKrTksb.c b/src/dsp/cmDspPgmKrTksb.c similarity index 100% rename from dsp/cmDspPgmKrTksb.c rename to src/dsp/cmDspPgmKrTksb.c diff --git a/dsp/cmDspPgmPP.c b/src/dsp/cmDspPgmPP.c similarity index 100% rename from dsp/cmDspPgmPP.c rename to src/dsp/cmDspPgmPP.c diff --git a/dsp/cmDspPgmPP.h b/src/dsp/cmDspPgmPP.h similarity index 100% rename from dsp/cmDspPgmPP.h rename to src/dsp/cmDspPgmPP.h diff --git a/dsp/cmDspPgmPPMain.c b/src/dsp/cmDspPgmPPMain.c similarity index 100% rename from dsp/cmDspPgmPPMain.c rename to src/dsp/cmDspPgmPPMain.c diff --git a/dsp/cmDspPgmPPMain.h b/src/dsp/cmDspPgmPPMain.h similarity index 100% rename from dsp/cmDspPgmPPMain.h rename to src/dsp/cmDspPgmPPMain.h diff --git a/dsp/cmDspPreset.c b/src/dsp/cmDspPreset.c similarity index 100% rename from dsp/cmDspPreset.c rename to src/dsp/cmDspPreset.c diff --git a/dsp/cmDspPreset.h b/src/dsp/cmDspPreset.h similarity index 100% rename from dsp/cmDspPreset.h rename to src/dsp/cmDspPreset.h diff --git a/dsp/cmDspStore.c b/src/dsp/cmDspStore.c similarity index 100% rename from dsp/cmDspStore.c rename to src/dsp/cmDspStore.c diff --git a/dsp/cmDspStore.h b/src/dsp/cmDspStore.h similarity index 100% rename from dsp/cmDspStore.h rename to src/dsp/cmDspStore.h diff --git a/dsp/cmDspSys.c b/src/dsp/cmDspSys.c similarity index 100% rename from dsp/cmDspSys.c rename to src/dsp/cmDspSys.c diff --git a/dsp/cmDspSys.h b/src/dsp/cmDspSys.h similarity index 100% rename from dsp/cmDspSys.h rename to src/dsp/cmDspSys.h diff --git a/dsp/cmDspUi.c b/src/dsp/cmDspUi.c similarity index 100% rename from dsp/cmDspUi.c rename to src/dsp/cmDspUi.c diff --git a/dsp/cmDspUi.h b/src/dsp/cmDspUi.h similarity index 100% rename from dsp/cmDspUi.h rename to src/dsp/cmDspUi.h diff --git a/dsp/cmDspValue.c b/src/dsp/cmDspValue.c similarity index 100% rename from dsp/cmDspValue.c rename to src/dsp/cmDspValue.c diff --git a/dsp/cmDspValue.h b/src/dsp/cmDspValue.h similarity index 100% rename from dsp/cmDspValue.h rename to src/dsp/cmDspValue.h diff --git a/dsp/notes.txt b/src/dsp/notes.txt similarity index 100% rename from dsp/notes.txt rename to src/dsp/notes.txt diff --git a/linux/cmAudioPortAlsa.c b/src/linux/cmAudioPortAlsa.c similarity index 100% rename from linux/cmAudioPortAlsa.c rename to src/linux/cmAudioPortAlsa.c diff --git a/linux/cmAudioPortAlsa.h b/src/linux/cmAudioPortAlsa.h similarity index 100% rename from linux/cmAudioPortAlsa.h rename to src/linux/cmAudioPortAlsa.h diff --git a/linux/cmFileSysLinux.c b/src/linux/cmFileSysLinux.c similarity index 100% rename from linux/cmFileSysLinux.c rename to src/linux/cmFileSysLinux.c diff --git a/linux/cmFileSysLinux.h b/src/linux/cmFileSysLinux.h similarity index 100% rename from linux/cmFileSysLinux.h rename to src/linux/cmFileSysLinux.h diff --git a/linux/cmMidiAlsa.c b/src/linux/cmMidiAlsa.c similarity index 100% rename from linux/cmMidiAlsa.c rename to src/linux/cmMidiAlsa.c diff --git a/osx/cmAudioPortOsx.c b/src/osx/cmAudioPortOsx.c similarity index 100% rename from osx/cmAudioPortOsx.c rename to src/osx/cmAudioPortOsx.c diff --git a/osx/cmAudioPortOsx.h b/src/osx/cmAudioPortOsx.h similarity index 100% rename from osx/cmAudioPortOsx.h rename to src/osx/cmAudioPortOsx.h diff --git a/osx/cmFileSysOsx.c b/src/osx/cmFileSysOsx.c similarity index 100% rename from osx/cmFileSysOsx.c rename to src/osx/cmFileSysOsx.c diff --git a/osx/cmFileSysOsx.h b/src/osx/cmFileSysOsx.h similarity index 100% rename from osx/cmFileSysOsx.h rename to src/osx/cmFileSysOsx.h diff --git a/osx/cmMidiOsx.c b/src/osx/cmMidiOsx.c similarity index 100% rename from osx/cmMidiOsx.c rename to src/osx/cmMidiOsx.c diff --git a/sa/cmSaProc.c b/src/sa/cmSaProc.c similarity index 100% rename from sa/cmSaProc.c rename to src/sa/cmSaProc.c diff --git a/sa/cmSaProc.h b/src/sa/cmSaProc.h similarity index 100% rename from sa/cmSaProc.h rename to src/sa/cmSaProc.h diff --git a/vop/cmProcTemplate.c b/src/vop/cmProcTemplate.c similarity index 100% rename from vop/cmProcTemplate.c rename to src/vop/cmProcTemplate.c diff --git a/vop/cmProcTemplate.h b/src/vop/cmProcTemplate.h similarity index 100% rename from vop/cmProcTemplate.h rename to src/vop/cmProcTemplate.h diff --git a/vop/cmProcTemplateCode.h b/src/vop/cmProcTemplateCode.h similarity index 100% rename from vop/cmProcTemplateCode.h rename to src/vop/cmProcTemplateCode.h diff --git a/vop/cmProcTemplateHdr.h b/src/vop/cmProcTemplateHdr.h similarity index 100% rename from vop/cmProcTemplateHdr.h rename to src/vop/cmProcTemplateHdr.h diff --git a/vop/cmProcTemplateMain.h b/src/vop/cmProcTemplateMain.h similarity index 100% rename from vop/cmProcTemplateMain.h rename to src/vop/cmProcTemplateMain.h diff --git a/vop/cmProcTemplateUndef.h b/src/vop/cmProcTemplateUndef.h similarity index 100% rename from vop/cmProcTemplateUndef.h rename to src/vop/cmProcTemplateUndef.h diff --git a/vop/cmVectOps.c b/src/vop/cmVectOps.c similarity index 100% rename from vop/cmVectOps.c rename to src/vop/cmVectOps.c diff --git a/vop/cmVectOps.h b/src/vop/cmVectOps.h similarity index 100% rename from vop/cmVectOps.h rename to src/vop/cmVectOps.h diff --git a/vop/cmVectOpsDoc.h b/src/vop/cmVectOpsDoc.h similarity index 100% rename from vop/cmVectOpsDoc.h rename to src/vop/cmVectOpsDoc.h diff --git a/vop/cmVectOpsRICode.h b/src/vop/cmVectOpsRICode.h similarity index 100% rename from vop/cmVectOpsRICode.h rename to src/vop/cmVectOpsRICode.h diff --git a/vop/cmVectOpsRIHdr.h b/src/vop/cmVectOpsRIHdr.h similarity index 100% rename from vop/cmVectOpsRIHdr.h rename to src/vop/cmVectOpsRIHdr.h diff --git a/vop/cmVectOpsTemplateCode.h b/src/vop/cmVectOpsTemplateCode.h similarity index 100% rename from vop/cmVectOpsTemplateCode.h rename to src/vop/cmVectOpsTemplateCode.h diff --git a/vop/cmVectOpsTemplateHdr.h b/src/vop/cmVectOpsTemplateHdr.h similarity index 100% rename from vop/cmVectOpsTemplateHdr.h rename to src/vop/cmVectOpsTemplateHdr.h diff --git a/vop/cmVectOpsTemplateMain.h b/src/vop/cmVectOpsTemplateMain.h similarity index 100% rename from vop/cmVectOpsTemplateMain.h rename to src/vop/cmVectOpsTemplateMain.h diff --git a/vop/cmVectOpsTemplateUndef.h b/src/vop/cmVectOpsTemplateUndef.h similarity index 100% rename from vop/cmVectOpsTemplateUndef.h rename to src/vop/cmVectOpsTemplateUndef.h