diff -p -up bristol-0.60.10/brighton/Makefile.am.link bristol-0.60.10/brighton/Makefile.am --- bristol-0.60.10/brighton/Makefile.am.link 2012-04-27 13:27:27.000000000 +0200 +++ bristol-0.60.10/brighton/Makefile.am 2012-12-15 13:04:16.772844351 +0100 @@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRIGHTON_HAS_X11@ -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ bin_PROGRAMS = brighton -brighton_LDFLAGS = -Bdynamic -L../libbrighton/.libs -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg -brighton_LDADD = @BRIGHTON_LIBX11@ @BRIGHTON_LIBXEXT@ @BRIGHTON_LIBB11@ -lbrighton -lbvg -lbristolmidi @ALSA_LIBS@ -lm -lpthread +brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg +brighton_LDADD = -lbrighton -lbvg @BRIGHTON_LIBB11@ @BRIGHTON_LIBX11@ @BRIGHTON_LIBXEXT@ -lbristolmidi @ALSA_LIBS@ -lm -lpthread brighton_SOURCES = brightonArp2600.c brightonAxxe.c brighton.c brightonControllers.c brightonDX.c brightonExplorer.c brightonHammondB3.c brightonHammond.c brightonJuno.c brightonMemoryMoog.c brightonMini.c brightonMixer.c brightonMixerMemory.c brightonMixerMenu.c brightonMS20.c brightonOBXa.c brightonOBX.c brightonOdyssey.c brightonPoly6.c brightonPoly.c brightonProphet10.c brightonProphet52.c brightonProphet.c brightonRhodesBass.c brightonRhodes.c brightonRoutines.c brightonSAks.c brightonVox.c brightonKeyboards.h brightonKeys.h brightonMini.h brightonMixer.h brightonMixerMemory.h brightonhelp.h brightonSolina.c brightonRoadRunner.c brightonGranular.c brightonRealistic.c brightonVoxM2.c brightonJupiter.c brightonBitOne.c brightonMaster.c brightonCS80.c brightonProOne.c brightonVoyager.c brightonSonic6.c brightonTrilogy.c brightonStratus.c brightonPoly800.c brightonBME700.c brightonBassMaker.c brightonSID.c brightonSID2.c brightonSID2.h brightonreadme.h brightonCLI.c brightonVImages.h diff -p -up bristol-0.60.10/bristol/Makefile.am.link bristol-0.60.10/bristol/Makefile.am --- bristol-0.60.10/bristol/Makefile.am.link 2012-01-03 19:10:01.000000000 +0100 +++ bristol-0.60.10/bristol/Makefile.am 2012-12-15 13:04:16.785844221 +0100 @@ -3,10 +3,10 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -msse -mfpmath=sse -ffast-math -fomit-frame-pointer -O2 bin_PROGRAMS = bristol -#bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -L../libbristolic/.libs +#bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic -bristol_LDFLAGS = -Bdynamic `pkg-config --silence-errors --libs alsa` @BRISTOL_LIBPALIBS@ @BRISTOL_LIB_PA@ @ALSA_LIBS@ -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -L../libbristolic -lbristolmidi -lbristolaudio -lbristol -lm -lpthread `pkg-config --silence-errors --libs jack` -bristol_LDADD = @BRISTOL_LIB_PA@ @JACK_LIBS@ @ALSA_LIBS@ -lbristolmidi -lbristolaudio -lbristolic -lbristol -lm -lpthread +bristol_LDFLAGS = `pkg-config --silence-errors --libs alsa` @BRISTOL_LIBPALIBS@ @BRISTOL_LIB_PA@ @ALSA_LIBS@ -L../libbristolmidi/.libs -L../libbristolaudio -L../libbristol -L../libbristolic -lbristolmidi -lbristolaudio -lbristol -lm -lpthread `pkg-config --silence-errors --libs jack` +bristol_LDADD = -lbristolic -lbristol -lbristolmidi -lbristolaudio @BRISTOL_LIB_PA@ @JACK_LIBS@ @ALSA_LIBS@ -lm -lpthread bristol_SOURCES = aksdco.c aksenv.c aksfilter.c aksreverb.c arpdco.c audioEngine.c audiothread.c bristolaks.c bristolarp2600.c bristolaxxe.c bristoldx.c bristolexplorer.c bristolhammond.c bristoljuno.c bristol.c bristolmemorymoog.c bristolmixer.c bristolmm.c bristolobx.c bristolodyssey.c bristolpoly6.c bristolpoly.c bristolprophet52.c bristolprophet.c bristolsampler.c bristolsystem.c bristolvox.c dca.c dco.c dimensionD.c dxop.c electroswitch.c envelope.c expdco.c filter2.c filter.c follower.c hammond.c hammondchorus.c hpf.c junodco.c lfo.c midihandlers.c midinote.c midithread.c noise.c prophetdco.c resonator.c reverb.c ringmod.c rotary.c sdco.c sdcoutils.c soundManager.c thesermon.c vibrachorus.c vox.c aksdco.h aksenv.h aksfilter.h aksreverb.h arpdco.h bristolaks.h bristolarp2600.h bristolaxxe.h bristolexplorer.h bristoljuno.h bristolmemorymoog.h bristolmixer.h bristolmm.h bristolobx.h bristolodyssey.h bristolpoly6.h bristolpoly.h bristolprophet.h bristolsampler.h click.h dca.h dco.h dimensionD.h dxop.h electroswitch.h envelope.h expdco.h filter.h follower.h hammondchorus.h hammond.h hpf.h junodco.h lfo.h noise.h palette.h prophetdco.h resonator.h reverb.h ringmod.h rotary.h sdco.h thesermon.h vibrachorus.h vox.h bristolsolina.c solina.h bristolroadrunner.c roadrunner.h bristolgranular.c granular.h granulardco.c granulardco.h bristolrealistic.c bristolmg1.h bristoljupiter.c bristolbitone.c bit1osc.c bit1osc.h arpeggiator.c bristolcs80.c activesense.c cs80osc.c blo.c cs80osc.h bristolprophet1.c bristolprophet1.h cs80env.c bristolcs80.h bristolsonic6.c bristolsonic6.h bristoltrilogy.c bristoltrilogy.h trilogyosc.c trilogyosc.h bristolpoly800.c bristolpoly800.h env5stage.c env5stage.h nro.c nro.h bristolbme700.c bristolbme700.h bristolbassmaker.c bristolsid1.c bristolsid1.h bristolsid2.c bristolsid2.h bristolhelp.h ringbuffer.c diff -p -up bristol-0.60.10/configure.ac.link bristol-0.60.10/configure.ac --- bristol-0.60.10/configure.ac.link 2012-01-12 18:13:41.000000000 +0100 +++ bristol-0.60.10/configure.ac 2012-12-15 13:11:05.490755192 +0100 @@ -106,7 +106,7 @@ BRIGHTON_HAS_X11= BRIGHTON_X11_DIR= BRIGHTON_LIBX11= BRIGHTON_LIBB11=-lC11 -BRIGHTON_LIBXLIBS=-L../libbrightonC11/.libs +BRIGHTON_LIBXLIBS=-L../libbrightonC11 AC_ARG_ENABLE(x11, [ --disable-x11 disable X11 interface ], TRY_X11=$enableval , TRY_X11=yes ) @@ -130,7 +130,7 @@ then BRIGHTON_LIBB11=-lB11 BRIGHTON_LIBX11=-lX11 BRIGHTON_LIBXEXT= - BRIGHTON_LIBXLIBS=-L../libbrightonX11/.libs + BRIGHTON_LIBXLIBS=-L../libbrightonX11 AC_ARG_ENABLE(ximage, [ --disable-ximage ignore XImage interface ], TRY_XIMAGE=$enableval , TRY_XIMAGE=yes ) diff -p -up bristol-0.60.10/libbrightonC11/Makefile.am.link bristol-0.60.10/libbrightonC11/Makefile.am --- bristol-0.60.10/libbrightonC11/Makefile.am.link 2010-04-10 21:39:50.000000000 +0200 +++ bristol-0.60.10/libbrightonC11/Makefile.am 2012-12-15 13:10:46.060949749 +0100 @@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton @BRIGHTON_HAS_XIMAGE@ -libC11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ -libC11_la_LIBADD= +#libC11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ +#libC11_la_LIBADD= -lib_LTLIBRARIES = libC11.la -libC11_la_SOURCES = bColor.c bDisplay.c bEvent.c bRender.c bRoutines.c bWindow.c +noinst_LIBRARIES = libC11.a +libC11_a_SOURCES = bColor.c bDisplay.c bEvent.c bRender.c bRoutines.c bWindow.c diff -p -up bristol-0.60.10/libbrighton/Makefile.am.link bristol-0.60.10/libbrighton/Makefile.am --- bristol-0.60.10/libbrighton/Makefile.am.link 2010-11-16 08:57:09.000000000 +0100 +++ bristol-0.60.10/libbrighton/Makefile.am 2012-12-15 13:04:16.812843951 +0100 @@ -1,9 +1,9 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@ -libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@ -lib_LTLIBRARIES = libbrighton.la -libbrighton_la_LIBADD= @BRIGHTON_LIBB11@ -lm -libbrighton_la_SOURCES = brightonBitmaps.c brightonButton.c brightonC.c brightonColorMgt.c brightonDevice.c brightonDispatch.c brightonDisplay.c brightonDisplayMgt.c brightonEventHandlers.c brightonHammond.c brightonInterface.c brightonKbd.c brightonLayer.c brightonPanelMgt.c brightonPic.c brightonRender.c brightonRotary.c brightonScale.c brightonShadowMgt.c brightonTouchpanel.c brightonVu.c brightonWindowMgt.c brightonXpmRead.c brightonkeymappings.h brightonMenu.c brightonLedBlock.c brightonHButton.c brightonLever.c brightonModWheel.c brightonLed.c brightonSlowTimer.c brightonFastTimer.c brightonRibbonKbd.c +noinst_LIBRARIES = libbrighton.a +#libbrighton_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@ +#libbrighton_a_LIBADD= @BRIGHTON_LIBB11@ -lm +libbrighton_a_SOURCES = brightonBitmaps.c brightonButton.c brightonC.c brightonColorMgt.c brightonDevice.c brightonDispatch.c brightonDisplay.c brightonDisplayMgt.c brightonEventHandlers.c brightonHammond.c brightonInterface.c brightonKbd.c brightonLayer.c brightonPanelMgt.c brightonPic.c brightonRender.c brightonRotary.c brightonScale.c brightonShadowMgt.c brightonTouchpanel.c brightonVu.c brightonWindowMgt.c brightonXpmRead.c brightonkeymappings.h brightonMenu.c brightonLedBlock.c brightonHButton.c brightonLever.c brightonModWheel.c brightonLed.c brightonSlowTimer.c brightonFastTimer.c brightonRibbonKbd.c diff -p -up bristol-0.60.10/libbrightonX11/Makefile.am.link bristol-0.60.10/libbrightonX11/Makefile.am --- bristol-0.60.10/libbrightonX11/Makefile.am.link 2010-05-16 11:01:56.000000000 +0200 +++ bristol-0.60.10/libbrightonX11/Makefile.am 2012-12-15 13:04:16.826843811 +0100 @@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ @BRIGHTON_HAS_SHMIMAGE@ @BRIGHTON_HAS_X11@ -libB11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ -libB11_la_LIBADD= -L/usr/X11R6/lib -lX11 +#libB11_a_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@ +#libB11_a_LIBADD= -L/usr/X11R6/lib -lX11 -lib_LTLIBRARIES = libB11.la -libB11_la_SOURCES = bColor.c bDisplay.c bEvent.c bRender.c bRoutines.c bWindow.c +noinst_LIBRARIES = libB11.a +libB11_a_SOURCES = bColor.c bDisplay.c bEvent.c bRender.c bRoutines.c bWindow.c diff -p -up bristol-0.60.10/libbristolaudio/Makefile.am.link bristol-0.60.10/libbristolaudio/Makefile.am --- bristol-0.60.10/libbristolaudio/Makefile.am.link 2010-06-08 10:58:47.000000000 +0200 +++ bristol-0.60.10/libbristolaudio/Makefile.am 2012-12-15 13:04:16.840843671 +0100 @@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_OSS=@BRISTOL_HAS_OSS@ @BRISTOL_HAS_DRAIN@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_PA@ -libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ +#libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ +#libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ -lib_LTLIBRARIES = libbristolaudio.la -libbristolaudio_la_SOURCES = audioEngineALSA.c audioGUIALSA.c audioMastering.c audioEngine.c audioGUI.c audioEngineOSS.c audioGUIOSS.c audioEngineJack.c +noinst_LIBRARIES = libbristolaudio.a +libbristolaudio_a_SOURCES = audioEngineALSA.c audioGUIALSA.c audioMastering.c audioEngine.c audioGUI.c audioEngineOSS.c audioGUIOSS.c audioEngineJack.c diff -p -up bristol-0.60.10/libbristolic/Makefile.am.link bristol-0.60.10/libbristolic/Makefile.am --- bristol-0.60.10/libbristolic/Makefile.am.link 2009-09-21 09:16:50.000000000 +0200 +++ bristol-0.60.10/libbristolic/Makefile.am 2012-12-15 13:04:16.853843541 +0100 @@ -1,10 +1,10 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ -libbristolic_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ +#libbristolic_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -lib_LTLIBRARIES = libbristolic.la -libbristolic_la_SOURCES = sid.c +noinst_LIBRARIES = libbristolic.a +libbristolic_a_SOURCES = sid.c #bin_PROGRAMS = sidtest #sidtest_LDFLAGS = -Bdynamic -L../libbristolic/.libs diff -p -up bristol-0.60.10/libbristol/Makefile.am.link bristol-0.60.10/libbristol/Makefile.am --- bristol-0.60.10/libbristol/Makefile.am.link 2010-06-08 10:50:03.000000000 +0200 +++ bristol-0.60.10/libbristol/Makefile.am 2012-12-15 13:04:16.867843401 +0100 @@ -1,9 +1,9 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@ -libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 +#libbristol_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la -lib_LTLIBRARIES = libbristol.la -libbristol_la_SOURCES = audioRoutines.c bristolcdefs.c debugging.c mixroutines.c opmgt.c +noinst_LIBRARIES = libbristol.a +libbristol_a_SOURCES = audioRoutines.c bristolcdefs.c debugging.c mixroutines.c opmgt.c diff -p -up bristol-0.60.10/libbristolmidi/Makefile.am.link bristol-0.60.10/libbristolmidi/Makefile.am --- bristol-0.60.10/libbristolmidi/Makefile.am.link 2010-01-17 21:48:52.000000000 +0100 +++ bristol-0.60.10/libbristolmidi/Makefile.am 2012-12-15 13:04:16.881843262 +0100 @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ -O1 libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ +libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ -lm lib_LTLIBRARIES = libbristolmidi.la libbristolmidi_la_SOURCES = inetClient.c inetServer.c interface.c midiALSADevMan.c midiDevMan.c midiMsgMan.c midiOSSDevMan.c midiParse.c midiRoutines.c midiSeqDevMan.c midiTCPDevMan.c slabmessages.h socketToolKit.c slabmessages.h midiFileMgt.c midiJACKDevMan.c scalaParse.c diff -p -up bristol-0.60.10/libbvg/Makefile.am.link bristol-0.60.10/libbvg/Makefile.am --- bristol-0.60.10/libbvg/Makefile.am.link 2012-04-27 13:24:00.000000000 +0200 +++ bristol-0.60.10/libbvg/Makefile.am 2012-12-15 13:04:16.894843132 +0100 @@ -1,10 +1,10 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ -libbvg_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -lib_LTLIBRARIES = libbvg.la -libbvg_la_SOURCES = bvg.c font1.h +noinst_LIBRARIES = libbvg.a +#libbvg_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ +libbvg_a_SOURCES = bvg.c font1.h #bin_PROGRAMS = sidtest #sidtest_LDFLAGS = -Bdynamic -L../libbvg/.libs