--- linuxsampler/trunk/src/Makefile.in 2004/01/11 16:43:54 30 +++ linuxsampler/trunk/src/Makefile.in 2004/01/18 20:31:31 31 @@ -84,10 +84,13 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ RC = @RC@ STRIP = @STRIP@ @@ -96,7 +99,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ bin_PROGRAMS = linuxsampler -linuxsampler_SOURCES = linuxsampler.cpp audioio.cpp audioio.h audiothread.cpp audiothread.h diskthread.cpp diskthread.h global.cpp global.h midiin.cpp midiin.h ringbuffer.h stream.cpp stream.h thread.cpp thread.h voice.cpp voice.h rtelmemorypool.h atomic.h modulationsystem.cpp eg_vca.cpp +linuxsampler_SOURCES = linuxsampler.cpp audioio.cpp audioio.h audiothread.cpp audiothread.h diskthread.cpp diskthread.h global.cpp global.h midiin.cpp midiin.h ringbuffer.h stream.cpp stream.h thread.cpp thread.h voice.cpp voice.h rtelmemorypool.h atomic.h modulationsystem.cpp eg_vca.cpp alsaio.cpp alsaio.h jackio.cpp jackio.h # set the include path found by configure INCLUDES = $(all_includes) @@ -105,7 +108,7 @@ AM_CXXFLAGS = -pedantic # the library search path. -linuxsampler_LDFLAGS = $(all_libraries) +linuxsampler_LDFLAGS = $(all_libraries) $(JACK_LIBS) lib_LIBRARIES = libgig.a libgig_a_SOURCES = DLS.cpp DLS.h gig.cpp gig.h RIFF.cpp RIFF.h linuxsampler_LDADD = $(top_builddir)/src/libgig.a -lpthread -lasound @@ -126,7 +129,8 @@ am_linuxsampler_OBJECTS = linuxsampler.$(OBJEXT) audioio.$(OBJEXT) \ audiothread.$(OBJEXT) diskthread.$(OBJEXT) global.$(OBJEXT) \ midiin.$(OBJEXT) stream.$(OBJEXT) thread.$(OBJEXT) \ - voice.$(OBJEXT) modulationsystem.$(OBJEXT) eg_vca.$(OBJEXT) + voice.$(OBJEXT) modulationsystem.$(OBJEXT) eg_vca.$(OBJEXT) \ + alsaio.$(OBJEXT) jackio.$(OBJEXT) linuxsampler_OBJECTS = $(am_linuxsampler_OBJECTS) linuxsampler_DEPENDENCIES = $(top_builddir)/src/libgig.a @@ -138,10 +142,12 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/DLS.Po ./$(DEPDIR)/RIFF.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/audioio.Po ./$(DEPDIR)/audiothread.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/alsaio.Po ./$(DEPDIR)/audioio.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/audiothread.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/diskthread.Po ./$(DEPDIR)/eg_vca.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/gig.Po ./$(DEPDIR)/global.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/linuxsampler.Po ./$(DEPDIR)/midiin.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/jackio.Po ./$(DEPDIR)/linuxsampler.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/midiin.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/modulationsystem.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/stream.Po ./$(DEPDIR)/thread.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/voice.Po @@ -252,12 +258,14 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DLS.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RIFF.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsaio.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audioio.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audiothread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskthread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eg_vca.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gig.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jackio.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linuxsampler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midiin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modulationsystem.Po@am__quote@