From 9c0e19a3be2288db79e2502e5fa450c3e20a668d Mon Sep 17 00:00:00 2001
From: Guenter  Geiger <ggeiger@users.sourceforge.net>
Date: Fri, 9 May 2003 16:04:00 +0000
Subject: This commit was generated by cvs2svn to compensate for changes in
 r610, which included commits to RCS files with non-trunk default branches.

svn path=/trunk/; revision=611
---
 pd/src/makefile.in | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

(limited to 'pd/src/makefile.in')

diff --git a/pd/src/makefile.in b/pd/src/makefile.in
index f9204e78..3f5b24d2 100644
--- a/pd/src/makefile.in
+++ b/pd/src/makefile.in
@@ -1,7 +1,3 @@
-#
-#
-#
-
 VPATH = ../obj:./
 OBJ_DIR = ../obj
 BIN_DIR = ../bin
@@ -20,10 +16,6 @@ MANDIR = @mandir@
 
 SOUND_ALSA = @alsa@
 
-# RME compilation
-
-SOUND_RME = @rme@
-
 DEFINES = @DEFINES@
 MORECFLAGS = @MORECFLAGS@
 
@@ -47,22 +39,13 @@ CFLAGS = $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(DEFINES) $(MORECFLAGS)
 # ALSA non-shared, move the # sign below.
 
 ifeq (${SOUND_ALSA},yes)
-CFLAGS += -DALSA01
-#LIB += /usr/lib/libasound.a
-#LIB += -lasound
+CFLAGS += -DPA_USE_ALSA -DUSEAPI_ALSA
+SYSSRC += s_audio_alsa.c \
+    ../portaudio/pa_linux_alsa/callback_thread.c \
+    ../portaudio/pa_linux_alsa/pa_linux_alsa.c \
+    ../portaudio/pa_linux_alsa/blocking_calls.c
 endif
 
-ifeq (${SOUND_ALSA},old)
-CFLAGS += -DALSA99
-#LIB += /usr/lib/libasound.a
-#LIB += -lasound
-endif
-
-ifeq (${SOUND_RME},yes)
-CFLAGS += -DRME_HAMMERFALL
-endif
-
-
 # Which system
 
 SYSTEM = $(shell uname -m)
@@ -80,7 +63,7 @@ endif
 
 # the sources
 
-SYSSRC = @SYSSRC@
+SYSSRC += @SYSSRC@
 
 SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
     g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \
@@ -88,8 +71,8 @@ SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
     g_toggle.c g_vdial.c g_vslider.c g_vumeter.c \
     m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \
     m_conf.c m_glob.c m_sched.c \
-    s_main.c s_inter.c s_unix.c s_file.c s_print.c \
-    s_loader.c s_path.c s_entry.c \
+    s_main.c s_inter.c s_file.c s_print.c \
+    s_loader.c s_path.c s_entry.c s_audio.c s_midi.c \
     d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \
     d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \
     d_delay.c d_resample.c \
-- 
cgit v1.2.1