diff --git a/Makefile.in b/Makefile.in index afc1bfb12bbcee71d5ada9a020d3ab58c5302c7d..57bd2793b00abbaf8aa94e688819183a1ffb7266 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -86,7 +86,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ autotools/ar-lib autotools/compile autotools/config.guess \ autotools/config.rpath autotools/config.sub autotools/depcomp \ autotools/install-sh autotools/missing autotools/ltmain.sh \ - $(top_srcdir)/autotools/ar-lib $(top_srcdir)/autotools/compile \ + $(top_srcdir)/autotools/ar-lib \ $(top_srcdir)/autotools/config.guess \ $(top_srcdir)/autotools/config.rpath \ $(top_srcdir)/autotools/config.sub \ @@ -892,16 +892,10 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -943,10 +937,9 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff --git a/help/Makefile.in b/help/Makefile.in index 5271567991d2cd52b0de10acc3f0a950d63e4c4e..c8ed4ad18a376c2062c05575e5b98f5fd328c067 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/images/Makefile.in b/images/Makefile.in index c8c7bdf5d6843892668b15e0c49fc646980abb1e..e5441f7af775be8a3cd685ac37707c8e3eeced7e 100644 --- a/images/Makefile.in +++ b/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index e5f363a973e099b85333c10ffe59990da281ed47..c4bb121f71dd531c5e7d45fba72568b7d6b4b926 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/src/Makefile.in b/src/Makefile.in index 4a078b92db255694aaad56c361ab5737502d185a..3a304751eed2e4194bf0ad76c278a48e959b4079 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -291,17 +291,17 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ Lyrics.h LyricsWindow.cpp LyricsWindow.h MacroMagic.h \ Matrix.cpp Matrix.h Menus.cpp Menus.h Mix.cpp Mix.h \ MixerBoard.cpp MixerBoard.h ModuleManager.cpp ModuleManager.h \ - PitchName.cpp PitchName.h PlatformCompatibility.cpp \ - PlatformCompatibility.h PluginManager.cpp PluginManager.h \ - Printing.cpp Printing.h Profiler.cpp Profiler.h Project.cpp \ - Project.h RealFFTf.cpp RealFFTf.h RealFFTf48x.cpp \ - RealFFTf48x.h Resample.cpp Resample.h RevisionIdent.h \ - RingBuffer.cpp RingBuffer.h Screenshot.cpp Screenshot.h \ - SelectedRegion.cpp SelectedRegion.h Shuttle.cpp Shuttle.h \ - ShuttleGui.cpp ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h \ - Snap.cpp Snap.h SoundActivatedRecord.cpp \ - SoundActivatedRecord.h Spectrum.cpp Spectrum.h \ - SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ + NumberScale.h PitchName.cpp PitchName.h \ + PlatformCompatibility.cpp PlatformCompatibility.h \ + PluginManager.cpp PluginManager.h Printing.cpp Printing.h \ + Profiler.cpp Profiler.h Project.cpp Project.h RealFFTf.cpp \ + RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h Resample.cpp \ + Resample.h RevisionIdent.h RingBuffer.cpp RingBuffer.h \ + Screenshot.cpp Screenshot.h SelectedRegion.cpp \ + SelectedRegion.h Shuttle.cpp Shuttle.h ShuttleGui.cpp \ + ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ + SoundActivatedRecord.cpp SoundActivatedRecord.h Spectrum.cpp \ + Spectrum.h SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ SseMathFuncs.h Tags.cpp Tags.h Theme.cpp Theme.h \ ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ @@ -309,7 +309,7 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \ UndoManager.cpp UndoManager.h ViewInfo.cpp ViewInfo.h \ VoiceKey.cpp VoiceKey.h WaveClip.cpp WaveClip.h WaveTrack.cpp \ - WaveTrack.h WrappedType.cpp WrappedType.h \ + WaveTrack.h WaveTrackLocation.h WrappedType.cpp WrappedType.h \ commands/AppCommandEvent.cpp commands/AppCommandEvent.h \ commands/BatchEvalCommand.cpp commands/BatchEvalCommand.h \ commands/Command.cpp commands/Command.h \ @@ -406,7 +406,7 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ prefs/DirectoriesPrefs.cpp prefs/DirectoriesPrefs.h \ prefs/EffectsPrefs.cpp prefs/EffectsPrefs.h \ prefs/ExtImportPrefs.cpp prefs/ExtImportPrefs.h \ - prefs/GUIPrefs.cpp prefs/GUIPrefs.h \ + prefs/GUIPrefs.cpp prefs/GUIPrefs.h prefs/GUISettings.h \ prefs/ImportExportPrefs.cpp prefs/ImportExportPrefs.h \ prefs/KeyConfigPrefs.cpp prefs/KeyConfigPrefs.h \ prefs/LibraryPrefs.cpp prefs/LibraryPrefs.h \ @@ -417,10 +417,13 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ prefs/PrefsDialog.h prefs/PrefsPanel.h prefs/ProjectsPrefs.cpp \ prefs/ProjectsPrefs.h prefs/QualityPrefs.cpp \ prefs/QualityPrefs.h prefs/RecordingPrefs.cpp \ - prefs/RecordingPrefs.h prefs/SpectrumPrefs.cpp \ + prefs/RecordingPrefs.h prefs/SpectrogramSettings.cpp \ + prefs/SpectrogramSettings.h prefs/SpectrumPrefs.cpp \ prefs/SpectrumPrefs.h prefs/ThemePrefs.cpp prefs/ThemePrefs.h \ prefs/TracksPrefs.cpp prefs/TracksPrefs.h \ prefs/WarningsPrefs.cpp prefs/WarningsPrefs.h \ + prefs/WaveformPrefs.cpp prefs/WaveformPrefs.h \ + prefs/WaveformSettings.cpp prefs/WaveformSettings.h \ toolbars/ControlToolBar.cpp toolbars/ControlToolBar.h \ toolbars/DeviceToolBar.cpp toolbars/DeviceToolBar.h \ toolbars/EditToolBar.cpp toolbars/EditToolBar.h \ @@ -664,10 +667,13 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ prefs/audacity-ProjectsPrefs.$(OBJEXT) \ prefs/audacity-QualityPrefs.$(OBJEXT) \ prefs/audacity-RecordingPrefs.$(OBJEXT) \ + prefs/audacity-SpectrogramSettings.$(OBJEXT) \ prefs/audacity-SpectrumPrefs.$(OBJEXT) \ prefs/audacity-ThemePrefs.$(OBJEXT) \ prefs/audacity-TracksPrefs.$(OBJEXT) \ prefs/audacity-WarningsPrefs.$(OBJEXT) \ + prefs/audacity-WaveformPrefs.$(OBJEXT) \ + prefs/audacity-WaveformSettings.$(OBJEXT) \ toolbars/audacity-ControlToolBar.$(OBJEXT) \ toolbars/audacity-DeviceToolBar.$(OBJEXT) \ toolbars/audacity-EditToolBar.$(OBJEXT) \ @@ -1152,17 +1158,17 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ Lyrics.h LyricsWindow.cpp LyricsWindow.h MacroMagic.h \ Matrix.cpp Matrix.h Menus.cpp Menus.h Mix.cpp Mix.h \ MixerBoard.cpp MixerBoard.h ModuleManager.cpp ModuleManager.h \ - PitchName.cpp PitchName.h PlatformCompatibility.cpp \ - PlatformCompatibility.h PluginManager.cpp PluginManager.h \ - Printing.cpp Printing.h Profiler.cpp Profiler.h Project.cpp \ - Project.h RealFFTf.cpp RealFFTf.h RealFFTf48x.cpp \ - RealFFTf48x.h Resample.cpp Resample.h RevisionIdent.h \ - RingBuffer.cpp RingBuffer.h Screenshot.cpp Screenshot.h \ - SelectedRegion.cpp SelectedRegion.h Shuttle.cpp Shuttle.h \ - ShuttleGui.cpp ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h \ - Snap.cpp Snap.h SoundActivatedRecord.cpp \ - SoundActivatedRecord.h Spectrum.cpp Spectrum.h \ - SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ + NumberScale.h PitchName.cpp PitchName.h \ + PlatformCompatibility.cpp PlatformCompatibility.h \ + PluginManager.cpp PluginManager.h Printing.cpp Printing.h \ + Profiler.cpp Profiler.h Project.cpp Project.h RealFFTf.cpp \ + RealFFTf.h RealFFTf48x.cpp RealFFTf48x.h Resample.cpp \ + Resample.h RevisionIdent.h RingBuffer.cpp RingBuffer.h \ + Screenshot.cpp Screenshot.h SelectedRegion.cpp \ + SelectedRegion.h Shuttle.cpp Shuttle.h ShuttleGui.cpp \ + ShuttleGui.h ShuttlePrefs.cpp ShuttlePrefs.h Snap.cpp Snap.h \ + SoundActivatedRecord.cpp SoundActivatedRecord.h Spectrum.cpp \ + Spectrum.h SplashDialog.cpp SplashDialog.h SseMathFuncs.cpp \ SseMathFuncs.h Tags.cpp Tags.h Theme.cpp Theme.h \ ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ @@ -1170,7 +1176,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \ UndoManager.cpp UndoManager.h ViewInfo.cpp ViewInfo.h \ VoiceKey.cpp VoiceKey.h WaveClip.cpp WaveClip.h WaveTrack.cpp \ - WaveTrack.h WrappedType.cpp WrappedType.h \ + WaveTrack.h WaveTrackLocation.h WrappedType.cpp WrappedType.h \ commands/AppCommandEvent.cpp commands/AppCommandEvent.h \ commands/BatchEvalCommand.cpp commands/BatchEvalCommand.h \ commands/Command.cpp commands/Command.h \ @@ -1267,7 +1273,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ prefs/DirectoriesPrefs.cpp prefs/DirectoriesPrefs.h \ prefs/EffectsPrefs.cpp prefs/EffectsPrefs.h \ prefs/ExtImportPrefs.cpp prefs/ExtImportPrefs.h \ - prefs/GUIPrefs.cpp prefs/GUIPrefs.h \ + prefs/GUIPrefs.cpp prefs/GUIPrefs.h prefs/GUISettings.h \ prefs/ImportExportPrefs.cpp prefs/ImportExportPrefs.h \ prefs/KeyConfigPrefs.cpp prefs/KeyConfigPrefs.h \ prefs/LibraryPrefs.cpp prefs/LibraryPrefs.h \ @@ -1278,10 +1284,13 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ prefs/PrefsDialog.h prefs/PrefsPanel.h prefs/ProjectsPrefs.cpp \ prefs/ProjectsPrefs.h prefs/QualityPrefs.cpp \ prefs/QualityPrefs.h prefs/RecordingPrefs.cpp \ - prefs/RecordingPrefs.h prefs/SpectrumPrefs.cpp \ + prefs/RecordingPrefs.h prefs/SpectrogramSettings.cpp \ + prefs/SpectrogramSettings.h prefs/SpectrumPrefs.cpp \ prefs/SpectrumPrefs.h prefs/ThemePrefs.cpp prefs/ThemePrefs.h \ prefs/TracksPrefs.cpp prefs/TracksPrefs.h \ prefs/WarningsPrefs.cpp prefs/WarningsPrefs.h \ + prefs/WaveformPrefs.cpp prefs/WaveformPrefs.h \ + prefs/WaveformSettings.cpp prefs/WaveformSettings.h \ toolbars/ControlToolBar.cpp toolbars/ControlToolBar.h \ toolbars/DeviceToolBar.cpp toolbars/DeviceToolBar.h \ toolbars/EditToolBar.cpp toolbars/EditToolBar.h \ @@ -1366,8 +1375,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): configwin.h: stamp-h1 - @test -f $@ || rm -f stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/configtemplate.h $(top_builddir)/config.status @rm -f stamp-h1 @@ -1378,8 +1387,8 @@ $(srcdir)/configtemplate.h: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) touch $@ configunix.h: stamp-h2 - @test -f $@ || rm -f stamp-h2 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2 + @if test ! -f $@; then rm -f stamp-h2; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi stamp-h2: $(srcdir)/configtemplate.h $(top_builddir)/config.status @rm -f stamp-h2 @@ -1760,6 +1769,8 @@ prefs/audacity-QualityPrefs.$(OBJEXT): prefs/$(am__dirstamp) \ prefs/$(DEPDIR)/$(am__dirstamp) prefs/audacity-RecordingPrefs.$(OBJEXT): prefs/$(am__dirstamp) \ prefs/$(DEPDIR)/$(am__dirstamp) +prefs/audacity-SpectrogramSettings.$(OBJEXT): prefs/$(am__dirstamp) \ + prefs/$(DEPDIR)/$(am__dirstamp) prefs/audacity-SpectrumPrefs.$(OBJEXT): prefs/$(am__dirstamp) \ prefs/$(DEPDIR)/$(am__dirstamp) prefs/audacity-ThemePrefs.$(OBJEXT): prefs/$(am__dirstamp) \ @@ -1768,6 +1779,10 @@ prefs/audacity-TracksPrefs.$(OBJEXT): prefs/$(am__dirstamp) \ prefs/$(DEPDIR)/$(am__dirstamp) prefs/audacity-WarningsPrefs.$(OBJEXT): prefs/$(am__dirstamp) \ prefs/$(DEPDIR)/$(am__dirstamp) +prefs/audacity-WaveformPrefs.$(OBJEXT): prefs/$(am__dirstamp) \ + prefs/$(DEPDIR)/$(am__dirstamp) +prefs/audacity-WaveformSettings.$(OBJEXT): prefs/$(am__dirstamp) \ + prefs/$(DEPDIR)/$(am__dirstamp) toolbars/$(am__dirstamp): @$(MKDIR_P) toolbars @: > toolbars/$(am__dirstamp) @@ -2186,10 +2201,13 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-ProjectsPrefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-QualityPrefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-RecordingPrefs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-SpectrogramSettings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-SpectrumPrefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-ThemePrefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-TracksPrefs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-WarningsPrefs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-WaveformPrefs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@prefs/$(DEPDIR)/audacity-WaveformSettings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@toolbars/$(DEPDIR)/audacity-ControlToolBar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@toolbars/$(DEPDIR)/audacity-DeviceToolBar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@toolbars/$(DEPDIR)/audacity-EditToolBar.Po@am__quote@ @@ -5192,6 +5210,20 @@ prefs/audacity-RecordingPrefs.obj: prefs/RecordingPrefs.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-RecordingPrefs.obj `if test -f 'prefs/RecordingPrefs.cpp'; then $(CYGPATH_W) 'prefs/RecordingPrefs.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/RecordingPrefs.cpp'; fi` +prefs/audacity-SpectrogramSettings.o: prefs/SpectrogramSettings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT prefs/audacity-SpectrogramSettings.o -MD -MP -MF prefs/$(DEPDIR)/audacity-SpectrogramSettings.Tpo -c -o prefs/audacity-SpectrogramSettings.o `test -f 'prefs/SpectrogramSettings.cpp' || echo '$(srcdir)/'`prefs/SpectrogramSettings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) prefs/$(DEPDIR)/audacity-SpectrogramSettings.Tpo prefs/$(DEPDIR)/audacity-SpectrogramSettings.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='prefs/SpectrogramSettings.cpp' object='prefs/audacity-SpectrogramSettings.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-SpectrogramSettings.o `test -f 'prefs/SpectrogramSettings.cpp' || echo '$(srcdir)/'`prefs/SpectrogramSettings.cpp + +prefs/audacity-SpectrogramSettings.obj: prefs/SpectrogramSettings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT prefs/audacity-SpectrogramSettings.obj -MD -MP -MF prefs/$(DEPDIR)/audacity-SpectrogramSettings.Tpo -c -o prefs/audacity-SpectrogramSettings.obj `if test -f 'prefs/SpectrogramSettings.cpp'; then $(CYGPATH_W) 'prefs/SpectrogramSettings.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/SpectrogramSettings.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) prefs/$(DEPDIR)/audacity-SpectrogramSettings.Tpo prefs/$(DEPDIR)/audacity-SpectrogramSettings.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='prefs/SpectrogramSettings.cpp' object='prefs/audacity-SpectrogramSettings.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-SpectrogramSettings.obj `if test -f 'prefs/SpectrogramSettings.cpp'; then $(CYGPATH_W) 'prefs/SpectrogramSettings.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/SpectrogramSettings.cpp'; fi` + prefs/audacity-SpectrumPrefs.o: prefs/SpectrumPrefs.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT prefs/audacity-SpectrumPrefs.o -MD -MP -MF prefs/$(DEPDIR)/audacity-SpectrumPrefs.Tpo -c -o prefs/audacity-SpectrumPrefs.o `test -f 'prefs/SpectrumPrefs.cpp' || echo '$(srcdir)/'`prefs/SpectrumPrefs.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) prefs/$(DEPDIR)/audacity-SpectrumPrefs.Tpo prefs/$(DEPDIR)/audacity-SpectrumPrefs.Po @@ -5248,6 +5280,34 @@ prefs/audacity-WarningsPrefs.obj: prefs/WarningsPrefs.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-WarningsPrefs.obj `if test -f 'prefs/WarningsPrefs.cpp'; then $(CYGPATH_W) 'prefs/WarningsPrefs.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/WarningsPrefs.cpp'; fi` +prefs/audacity-WaveformPrefs.o: prefs/WaveformPrefs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT prefs/audacity-WaveformPrefs.o -MD -MP -MF prefs/$(DEPDIR)/audacity-WaveformPrefs.Tpo -c -o prefs/audacity-WaveformPrefs.o `test -f 'prefs/WaveformPrefs.cpp' || echo '$(srcdir)/'`prefs/WaveformPrefs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) prefs/$(DEPDIR)/audacity-WaveformPrefs.Tpo prefs/$(DEPDIR)/audacity-WaveformPrefs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='prefs/WaveformPrefs.cpp' object='prefs/audacity-WaveformPrefs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-WaveformPrefs.o `test -f 'prefs/WaveformPrefs.cpp' || echo '$(srcdir)/'`prefs/WaveformPrefs.cpp + +prefs/audacity-WaveformPrefs.obj: prefs/WaveformPrefs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT prefs/audacity-WaveformPrefs.obj -MD -MP -MF prefs/$(DEPDIR)/audacity-WaveformPrefs.Tpo -c -o prefs/audacity-WaveformPrefs.obj `if test -f 'prefs/WaveformPrefs.cpp'; then $(CYGPATH_W) 'prefs/WaveformPrefs.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/WaveformPrefs.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) prefs/$(DEPDIR)/audacity-WaveformPrefs.Tpo prefs/$(DEPDIR)/audacity-WaveformPrefs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='prefs/WaveformPrefs.cpp' object='prefs/audacity-WaveformPrefs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-WaveformPrefs.obj `if test -f 'prefs/WaveformPrefs.cpp'; then $(CYGPATH_W) 'prefs/WaveformPrefs.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/WaveformPrefs.cpp'; fi` + +prefs/audacity-WaveformSettings.o: prefs/WaveformSettings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT prefs/audacity-WaveformSettings.o -MD -MP -MF prefs/$(DEPDIR)/audacity-WaveformSettings.Tpo -c -o prefs/audacity-WaveformSettings.o `test -f 'prefs/WaveformSettings.cpp' || echo '$(srcdir)/'`prefs/WaveformSettings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) prefs/$(DEPDIR)/audacity-WaveformSettings.Tpo prefs/$(DEPDIR)/audacity-WaveformSettings.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='prefs/WaveformSettings.cpp' object='prefs/audacity-WaveformSettings.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-WaveformSettings.o `test -f 'prefs/WaveformSettings.cpp' || echo '$(srcdir)/'`prefs/WaveformSettings.cpp + +prefs/audacity-WaveformSettings.obj: prefs/WaveformSettings.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT prefs/audacity-WaveformSettings.obj -MD -MP -MF prefs/$(DEPDIR)/audacity-WaveformSettings.Tpo -c -o prefs/audacity-WaveformSettings.obj `if test -f 'prefs/WaveformSettings.cpp'; then $(CYGPATH_W) 'prefs/WaveformSettings.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/WaveformSettings.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) prefs/$(DEPDIR)/audacity-WaveformSettings.Tpo prefs/$(DEPDIR)/audacity-WaveformSettings.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='prefs/WaveformSettings.cpp' object='prefs/audacity-WaveformSettings.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o prefs/audacity-WaveformSettings.obj `if test -f 'prefs/WaveformSettings.cpp'; then $(CYGPATH_W) 'prefs/WaveformSettings.cpp'; else $(CYGPATH_W) '$(srcdir)/prefs/WaveformSettings.cpp'; fi` + toolbars/audacity-ControlToolBar.o: toolbars/ControlToolBar.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT toolbars/audacity-ControlToolBar.o -MD -MP -MF toolbars/$(DEPDIR)/audacity-ControlToolBar.Tpo -c -o toolbars/audacity-ControlToolBar.o `test -f 'toolbars/ControlToolBar.cpp' || echo '$(srcdir)/'`toolbars/ControlToolBar.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) toolbars/$(DEPDIR)/audacity-ControlToolBar.Tpo toolbars/$(DEPDIR)/audacity-ControlToolBar.Po diff --git a/tests/Makefile.in b/tests/Makefile.in index 245e0660d90c6ac785b73e3039b817d8cf1c58a1..bcb5f792ee307033d7921cff0b5edb124f9956b3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc.