git-svn-id: https://svn.code.sf.net/p/freetel/code@676 01035d8c-6547-0410-b346-abe4f9...

diff --git a/fdmdv2/Makefile b/fdmdv2/Makefile
index 5117aa9022284122b300c490e80cc6c7373a8654..56f9f4ec1f7f2751c9048f86ea3b2eaf2cd5eef3 100644 (file)
--- a/fdmdv2/Makefile
+++ b/fdmdv2/Makefile
@@ -96,11 +96,11 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /fdmdv2/missing --run aclocal-1.11
-AMTAR = ${SHELL} /fdmdv2/missing --run tar
-AUTOCONF = ${SHELL} /fdmdv2/missing --run autoconf
-AUTOHEADER = ${SHELL} /fdmdv2/missing --run autoheader
-AUTOMAKE = ${SHELL} /fdmdv2/missing --run automake-1.11
+ACLOCAL = ${SHELL} /p/Radio/fdmdv2/missing --run aclocal-1.11
+AMTAR = ${SHELL} /p/Radio/fdmdv2/missing --run tar
+AUTOCONF = ${SHELL} /p/Radio/fdmdv2/missing --run autoconf
+AUTOHEADER = ${SHELL} /p/Radio/fdmdv2/missing --run autoheader
+AUTOMAKE = ${SHELL} /p/Radio/fdmdv2/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=none
@@ -125,7 +125,7 @@ LDFLAGS =
 LIBOBJS = 
 LIBS = -lm 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /fdmdv2/missing --run makeinfo
+MAKEINFO = ${SHELL} /p/Radio/fdmdv2/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 PACKAGE = fdmdv2
@@ -140,10 +140,10 @@ SET_MAKE =
 SHELL = /bin/sh
 STRIP = 
 VERSION = 0.2
-abs_builddir = /fdmdv2
-abs_srcdir = /fdmdv2
-abs_top_builddir = /fdmdv2
-abs_top_srcdir = /fdmdv2
+abs_builddir = /p/Radio/fdmdv2
+abs_srcdir = /p/Radio/fdmdv2
+abs_top_builddir = /p/Radio/fdmdv2
+abs_top_srcdir = /p/Radio/fdmdv2
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -162,7 +162,7 @@ host_alias =
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /fdmdv2/install-sh
+install_sh = ${SHELL} /p/Radio/fdmdv2/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

diff --git a/fdmdv2/src/Makefile b/fdmdv2/src/Makefile
index d966ec19aaab01d2bd485619d1349998a827eae1..f726ab5183ce2e01b327d4ee4feb9b71a16db325 100644 (file)
--- a/fdmdv2/src/Makefile
+++ b/fdmdv2/src/Makefile
@@ -42,11 +42,11 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /fdmdv2/missing --run aclocal-1.11
-AMTAR = ${SHELL} /fdmdv2/missing --run tar
-AUTOCONF = ${SHELL} /fdmdv2/missing --run autoconf
-AUTOHEADER = ${SHELL} /fdmdv2/missing --run autoheader
-AUTOMAKE = ${SHELL} /fdmdv2/missing --run automake-1.11
+ACLOCAL = ${SHELL} /p/Radio/fdmdv2/missing --run aclocal-1.11
+AMTAR = ${SHELL} /p/Radio/fdmdv2/missing --run tar
+AUTOCONF = ${SHELL} /p/Radio/fdmdv2/missing --run autoconf
+AUTOHEADER = ${SHELL} /p/Radio/fdmdv2/missing --run autoheader
+AUTOMAKE = ${SHELL} /p/Radio/fdmdv2/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=none
@@ -105,7 +105,7 @@ LIBS = -lsndfile-1 \
 -lwsock32 
 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /fdmdv2/missing --run makeinfo
+MAKEINFO = ${SHELL} /p/Radio/fdmdv2/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 PACKAGE = fdmdv2
@@ -120,10 +120,10 @@ SET_MAKE =
 SHELL = /bin/sh
 STRIP = 
 VERSION = 0.2
-abs_builddir = /fdmdv2/src
-abs_srcdir = /fdmdv2/src
-abs_top_builddir = /fdmdv2
-abs_top_srcdir = /fdmdv2
+abs_builddir = /p/Radio/fdmdv2/src
+abs_srcdir = /p/Radio/fdmdv2/src
+abs_top_builddir = /p/Radio/fdmdv2
+abs_top_srcdir = /p/Radio/fdmdv2
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -142,7 +142,7 @@ host_alias =
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /fdmdv2/install-sh
+install_sh = ${SHELL} /p/Radio/fdmdv2/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -181,7 +181,6 @@ fdmdv2_plot_scalar.cpp \
 fdmdv2_plot_scatter.cpp \
 fdmdv2_plot_spectrum.cpp \
 fdmdv2_plot_waterfall.cpp \
-fdmdv2_process_audio.cpp\
 fdmdv2_pa_wrapper.cpp \
 dlg_about.cpp \
 dlg_audio.cpp \
@@ -196,7 +195,6 @@ fdmdv2_plot_scalar.$(OBJEXT) \
 fdmdv2_plot_scatter.$(OBJEXT) \
 fdmdv2_plot_spectrum.$(OBJEXT) \
 fdmdv2_plot_waterfall.$(OBJEXT) \
-fdmdv2_process_audio.$(OBJEXT)\
 fdmdv2_pa_wrapper.$(OBJEXT)\
 dlg_about.$(OBJEXT) \
 dlg_audio.$(OBJEXT) \
@@ -416,8 +414,8 @@ fdmdv2_plot_spectrum.$(OBJEXT):  fdmdv2_plot_spectrum.cpp fdmdv2_plot_spectrum.h
 fdmdv2_plot_waterfall.$(OBJEXT):  fdmdv2_plot_waterfall.cpp fdmdv2_plot_waterfall.h fdmdv2_plot.h fdmdv2_defines.h
        $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_plot_waterfall.cpp
 
-fdmdv2_process_audio.$(OBJEXT):  fdmdv2_process_audio.cpp 
-       $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_process_audio.cpp
+#fdmdv2_process_audio.$(OBJEXT):  fdmdv2_process_audio.cpp 
+#      $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_process_audio.cpp
 
 fdmdv2_pa_wrapper.$(OBJEXT): fdmdv2_pa_wrapper.cpp  fdmdv2_pa_wrapper.h
        $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_pa_wrapper.cpp

diff --git a/fdmdv2/src/Makefile.am b/fdmdv2/src/Makefile.am
index 53503c7e239e6986858da6d748a06c1821859adb..574957297b2cda2f63560902e31c79074425bcc8 100644 (file)
--- a/fdmdv2/src/Makefile.am
+++ b/fdmdv2/src/Makefile.am
@@ -22,7 +22,6 @@ fdmdv2_plot_scalar.cpp \
 fdmdv2_plot_scatter.cpp \
 fdmdv2_plot_spectrum.cpp \
 fdmdv2_plot_waterfall.cpp \
-fdmdv2_process_audio.cpp\
 fdmdv2_pa_wrapper.cpp \
 dlg_about.cpp \
 dlg_audio.cpp \
@@ -38,7 +37,6 @@ fdmdv2_plot_scalar.$(OBJEXT) \
 fdmdv2_plot_scatter.$(OBJEXT) \
 fdmdv2_plot_spectrum.$(OBJEXT) \
 fdmdv2_plot_waterfall.$(OBJEXT) \
-fdmdv2_process_audio.$(OBJEXT)\
 fdmdv2_pa_wrapper.$(OBJEXT)\
 dlg_about.$(OBJEXT) \
 dlg_audio.$(OBJEXT) \
@@ -121,8 +119,8 @@ fdmdv2_plot_spectrum.$(OBJEXT):  fdmdv2_plot_spectrum.cpp fdmdv2_plot_spectrum.h
 fdmdv2_plot_waterfall.$(OBJEXT):  fdmdv2_plot_waterfall.cpp fdmdv2_plot_waterfall.h fdmdv2_plot.h fdmdv2_defines.h
        $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_plot_waterfall.cpp
 
-fdmdv2_process_audio.$(OBJEXT):  fdmdv2_process_audio.cpp 
-       $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_process_audio.cpp
+#fdmdv2_process_audio.$(OBJEXT):  fdmdv2_process_audio.cpp 
+#      $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_process_audio.cpp
 
 fdmdv2_pa_wrapper.$(OBJEXT): fdmdv2_pa_wrapper.cpp  fdmdv2_pa_wrapper.h
        $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_pa_wrapper.cpp

diff --git a/fdmdv2/src/Makefile.in b/fdmdv2/src/Makefile.in
index bf60b90855991c76798b3ddb1b5a2b6dffa1a57c..93893a2072f89763e33e977d5a672488054cb185 100644 (file)
--- a/fdmdv2/src/Makefile.in
+++ b/fdmdv2/src/Makefile.in
@@ -181,7 +181,6 @@ fdmdv2_plot_scalar.cpp \
 fdmdv2_plot_scatter.cpp \
 fdmdv2_plot_spectrum.cpp \
 fdmdv2_plot_waterfall.cpp \
-fdmdv2_process_audio.cpp\
 fdmdv2_pa_wrapper.cpp \
 dlg_about.cpp \
 dlg_audio.cpp \
@@ -196,7 +195,6 @@ fdmdv2_plot_scalar.$(OBJEXT) \
 fdmdv2_plot_scatter.$(OBJEXT) \
 fdmdv2_plot_spectrum.$(OBJEXT) \
 fdmdv2_plot_waterfall.$(OBJEXT) \
-fdmdv2_process_audio.$(OBJEXT)\
 fdmdv2_pa_wrapper.$(OBJEXT)\
 dlg_about.$(OBJEXT) \
 dlg_audio.$(OBJEXT) \
@@ -416,8 +414,8 @@ fdmdv2_plot_spectrum.$(OBJEXT):  fdmdv2_plot_spectrum.cpp fdmdv2_plot_spectrum.h
 fdmdv2_plot_waterfall.$(OBJEXT):  fdmdv2_plot_waterfall.cpp fdmdv2_plot_waterfall.h fdmdv2_plot.h fdmdv2_defines.h
        $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_plot_waterfall.cpp
 
-fdmdv2_process_audio.$(OBJEXT):  fdmdv2_process_audio.cpp 
-       $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_process_audio.cpp
+#fdmdv2_process_audio.$(OBJEXT):  fdmdv2_process_audio.cpp 
+#      $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_process_audio.cpp
 
 fdmdv2_pa_wrapper.$(OBJEXT): fdmdv2_pa_wrapper.cpp  fdmdv2_pa_wrapper.h
        $(GPP) -c $(DEFINES) $(INCLUDE_PATHS) $(CFLAGS) $(WX_FLAGS) fdmdv2_pa_wrapper.cpp