Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1426
Modified Files: Tag: devel_0_39 configure.in configure makefile.in Log Message: more cleanup
Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.9 retrieving revision 1.4.4.2.2.10 diff -C2 -d -r1.4.4.2.2.9 -r1.4.4.2.2.10 *** makefile.in 22 Nov 2006 21:46:24 -0000 1.4.4.2.2.9 --- makefile.in 22 Nov 2006 22:39:34 -0000 1.4.4.2.2.10 *************** *** 17,30 **** CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
! # the sources ! SYSSRC += @SYSSRC@ ! ! # DesireData (matju & chun) SRC = desire.c m_hash.c
! # devel_0_39 (thomas & tim) SRC += m_fifo.c m_simd.c
! # pd miller SRC += 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_file.c s_loader.c s_path.c \ --- 17,27 ---- CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
! # from DesireData (matju & chun) SRC = desire.c m_hash.c
! # from devel_0_39 (thomas & tim) SRC += m_fifo.c m_simd.c
! # from pd miller SRC += 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_file.c s_loader.c s_path.c \ *************** *** 37,55 **** $(SYSSRC)
OBJ = $(SRC:.c=.o)
- # # ------------------ targets ------------------------------------ - #
! .PHONY: pd externs all
! all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk externs
! bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk
! $(OBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c
--- 34,51 ---- $(SYSSRC)
+ # audio drivers and midi drivers + SRC += @SYSSRC@ + OBJ = $(SRC:.c=.o)
# ------------------ targets ------------------------------------
! .PHONY: pd bin externs all
! all: bin externs
! bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend $(BIN_DIR)/pdreceive $(BIN_DIR)/pd.tk
! $(OBJ) : %.o : %.c config.log $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c
*************** *** 67,71 **** $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c
! $(PDEXEC): $(OBJ) $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
--- 63,67 ---- $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c
! $(PDEXEC): $(OBJ) config.log $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
*************** *** 84,88 **** INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR) - BINARYMODE=@binarymode@
install: all --- 80,83 ----
Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -C2 -d -r1.6.2.10 -r1.6.2.11 *** configure 22 Nov 2006 21:46:24 -0000 1.6.2.10 --- configure 22 Nov 2006 22:39:34 -0000 1.6.2.11 *************** *** 310,314 **** #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi binarymode PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files=''
--- 310,314 ---- #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS SYSSRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files=''
*************** *** 1306,1311 **** portmidi=yes
- binarymode=-m755 -
--- 1306,1309 ---- *************** *** 4575,4579 ****
! if test x$oss == "xyes"; then if test "${ac_cv_header_linux_soundcard_h+set}" = set; then echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 --- 4573,4577 ----
! if test x$oss == xyes; then if test "${ac_cv_header_linux_soundcard_h+set}" = set; then echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5 *************** *** 4925,4929 **** echo "${ECHO_T}$ac_cv_lib_jack_jack_set_xrun_callback" >&6 if test $ac_cv_lib_jack_jack_set_xrun_callback = yes; then ! LIBS="$LIBS -ljack";jack=xrun else jack=no --- 4923,4927 ---- echo "${ECHO_T}$ac_cv_lib_jack_jack_set_xrun_callback" >&6 if test $ac_cv_lib_jack_jack_set_xrun_callback = yes; then ! jack=xrun else jack=no *************** *** 4994,4998 **** echo "${ECHO_T}$ac_cv_lib_jack_jack_set_error_function" >&6 if test $ac_cv_lib_jack_jack_set_error_function = yes; then ! LIBS="$LIBS -ljack";jack=yes else jack=no --- 4992,4996 ---- echo "${ECHO_T}$ac_cv_lib_jack_jack_set_error_function" >&6 if test $ac_cv_lib_jack_jack_set_error_function = yes; then ! jack=yes else jack=no *************** *** 5078,5082 **** SYSSRC=""
! if test x$USE_DEBUG_CFLAGS == "xyes"; then OPT_CFLAGS="-O1 -g" else --- 5076,5080 ---- SYSSRC=""
! if test x$USE_DEBUG_CFLAGS == xyes; then OPT_CFLAGS="-O1 -g" else *************** *** 5086,5093 **** if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing" ! SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi --- 5084,5090 ---- if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi *************** *** 5096,5107 ****
if test `uname -s` = Darwin; then ! LDFLAGS="-Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi
! if test x$alsa == "xyes"; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" --- 5093,5109 ----
if test `uname -s` = Darwin; then ! LDFLAGS="-Wl" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi
! if test x$oss == xyes; then ! SYSSRC=$SYSSRC" s_audio_oss.c s_midi_oss.c" ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS" ! fi ! ! if test x$alsa == xyes; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" *************** *** 5109,5124 **** fi
! if test `uname -s` = Darwin; then ! if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi ! if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi fi - if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi - if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
! if test x$portaudio == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" fi - if test x$portmidi == "xyes"; then SYSSRC=$SYSSRC" s_midi_pm.c"; fi
ac_config_files="$ac_config_files makefile" --- 5111,5141 ---- fi
! if test x$jack == xyes; then ! SYSSRC=$SYSSRC" s_audio_jack.c" ! if test x$jack != xno; then ! if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" ! else ! LIBS="$LIBS -ljack" ! fi ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" ! fi ! if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DJACK_XRUN"; fi fi
! if test x$portaudio == xyes; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon" + fi + fi + + if test x$portmidi == xyes; then + SYSSRC=$SYSSRC" s_midi_pm.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreMIDI" + fi fi
ac_config_files="$ac_config_files makefile" *************** *** 5763,5767 **** s,@portaudio@,$portaudio,;t t s,@portmidi@,$portmidi,;t t - s,@binarymode@,$binarymode,;t t s,@PDLIB@,$PDLIB,;t t s,@MORECFLAGS@,$MORECFLAGS,;t t --- 5780,5783 ----
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.12 retrieving revision 1.5.4.5.2.13 diff -C2 -d -r1.5.4.5.2.12 -r1.5.4.5.2.13 *** configure.in 22 Nov 2006 21:46:24 -0000 1.5.4.5.2.12 --- configure.in 22 Nov 2006 22:39:34 -0000 1.5.4.5.2.13 *************** *** 14,18 **** AC_SUBST(portaudio, yes) AC_SUBST(portmidi, yes) - AC_SUBST(binarymode, -m755) AC_SUBST(PDLIB) AC_SUBST(MORECFLAGS) --- 14,17 ---- *************** *** 67,71 **** AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1)
! if test x$oss == "xyes"; then AC_CHECK_HEADER(linux/soundcard.h,oss="yes",oss="no") fi --- 66,70 ---- AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1)
! if test x$oss == xyes; then AC_CHECK_HEADER(linux/soundcard.h,oss="yes",oss="no") fi *************** *** 78,83 **** if test x$jack == xyes; then AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no) fi
--- 77,82 ---- if test x$jack == xyes; then AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,jack=yes,jack=no) fi
*************** *** 92,96 **** SYSSRC=""
! if test x$USE_DEBUG_CFLAGS == "xyes"; then OPT_CFLAGS="-O1 -g" else --- 91,95 ---- SYSSRC=""
! if test x$USE_DEBUG_CFLAGS == xyes; then OPT_CFLAGS="-O1 -g" else *************** *** 100,107 **** if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = "yes"; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -fno-strict-aliasing" ! SYSSRC=$SYSSRC" s_midi_oss.c s_audio_oss.c" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi --- 99,105 ---- if test `uname -s` = Linux; then LDFLAGS="-Wl,-export-dynamic" ! if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" STRIPFLAG=-s if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi *************** *** 110,121 ****
if test `uname -s` = Darwin; then ! LDFLAGS="-Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -Wno-error -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi
! if test x$alsa == "xyes"; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" --- 108,124 ----
if test `uname -s` = Darwin; then ! LDFLAGS="-Wl" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" EXTERNTARGET=pd_darwin fi
! if test x$oss == xyes; then ! SYSSRC=$SYSSRC" s_audio_oss.c s_midi_oss.c" ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_OSS" ! fi ! ! if test x$alsa == xyes; then SYSSRC=$SYSSRC" s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c" MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" *************** *** 123,138 **** fi
! if test `uname -s` = Darwin; then ! if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi ! if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -framework Jack"; fi fi - if test x$jack == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi - if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN"; SYSSRC=$SYSSRC" s_audio_jack.c"; fi
! if test x$portaudio == "xyes"; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" fi - if test x$portmidi == "xyes"; then SYSSRC=$SYSSRC" s_midi_pm.c"; fi
AC_OUTPUT(makefile) --- 126,156 ---- fi
! if test x$jack == xyes; then ! SYSSRC=$SYSSRC" s_audio_jack.c" ! if test x$jack != xno; then ! if test `uname -s` = Darwin; then ! LDFLAGS=$LDFLAGS" -framework Jack" ! else ! LIBS="$LIBS -ljack" ! fi ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" ! fi ! if test x$jack == "xrun"; then MORECFLAGS=$MORECFLAGS" -DJACK_XRUN"; fi fi
! if test x$portaudio == xyes; then MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19" SYSSRC=$SYSSRC" s_audio_portaudio.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon" + fi + fi + + if test x$portmidi == xyes; then + SYSSRC=$SYSSRC" s_midi_pm.c" + if test `uname -s` = Darwin; then + LDFLAGS=$LDFLAGS" -framework CoreMIDI" + fi fi
AC_OUTPUT(makefile)