diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-11-24 17:38:25 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-11-24 17:38:25 +0100 |
| commit | d5d488e33d85549c81d007497c8301c920d0a6e4 (patch) | |
| tree | 5805a0dfc83aa8306a16f0b96f49530aa46c8765 /src/Makefile.am | |
| parent | ed7642ebac32bde8d9c47f3a1d8eabf75c3ea986 (diff) | |
| parent | 0fcdc3d15d759e576ba3d71cc874c1036dcd36a0 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f0d5a5e8..3be28692 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -125,28 +125,7 @@ EXTRA_DIST = \ daemon/pulseaudio.desktop.in \ daemon/pulseaudio-kde.desktop.in \ map-file \ - daemon/pulseaudio-system.conf \ - modules/alsa/mixer/profile-sets/default.conf \ - modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ - modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \ - modules/alsa/mixer/profile-sets/90-pulseaudio.rules \ - modules/alsa/mixer/paths/analog-input-aux.conf \ - modules/alsa/mixer/paths/analog-input.conf \ - modules/alsa/mixer/paths/analog-input.conf.common \ - modules/alsa/mixer/paths/analog-input-fm.conf \ - modules/alsa/mixer/paths/analog-input-linein.conf \ - modules/alsa/mixer/paths/analog-input-mic.conf \ - modules/alsa/mixer/paths/analog-input-mic.conf.common \ - modules/alsa/mixer/paths/analog-input-mic-line.conf \ - modules/alsa/mixer/paths/analog-input-tvtuner.conf \ - modules/alsa/mixer/paths/analog-input-video.conf \ - modules/alsa/mixer/paths/analog-output.conf \ - modules/alsa/mixer/paths/analog-output-speaker.conf \ - modules/alsa/mixer/paths/analog-output.conf.common \ - modules/alsa/mixer/paths/analog-output-headphones.conf \ - modules/alsa/mixer/paths/analog-output-headphones-2.conf \ - modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ - modules/alsa/mixer/paths/analog-output-mono.conf + daemon/pulseaudio-system.conf pulseconf_DATA = \ default.pa \ @@ -1088,17 +1067,17 @@ modlibexec_LTLIBRARIES += \ module-alsa-source.la \ module-alsa-card.la -alsaprofilesets_DATA = \ +dist_alsaprofilesets_DATA = \ modules/alsa/mixer/profile-sets/default.conf \ modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \ modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf if HAVE_UDEV -udevrules_DATA = \ +dist_udevrules_DATA = \ modules/alsa/mixer/profile-sets/90-pulseaudio.rules endif -alsapaths_DATA = \ +dist_alsapaths_DATA = \ modules/alsa/mixer/paths/analog-input-aux.conf \ modules/alsa/mixer/paths/analog-input.conf \ modules/alsa/mixer/paths/analog-input.conf.common \ @@ -1110,8 +1089,10 @@ alsapaths_DATA = \ modules/alsa/mixer/paths/analog-input-tvtuner.conf \ modules/alsa/mixer/paths/analog-input-video.conf \ modules/alsa/mixer/paths/analog-output.conf \ + modules/alsa/mixer/paths/analog-output-speaker.conf \ modules/alsa/mixer/paths/analog-output.conf.common \ modules/alsa/mixer/paths/analog-output-headphones.conf \ + modules/alsa/mixer/paths/analog-output-headphones-2.conf \ modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ modules/alsa/mixer/paths/analog-output-mono.conf @@ -1204,6 +1185,7 @@ endif if HAVE_FFTW modlibexec_LTLIBRARIES += \ module-equalizer-sink.la +bin_SCRIPTS += utils/qpaeq endif # These are generated by an M4 script |