From 0f40c3f1624261a969340c13467c47f2e5c4b120 Mon Sep 17 00:00:00 2001 From: Ariff Abdullah Date: Wed, 10 Jun 2009 06:49:45 +0000 Subject: [PATCH] Move all sound related scripts to its own 'sound' subdir. Suggested by: jmallett --- sys/conf/files | 24 +++++++++---------- sys/modules/sound/sound/Makefile | 12 +++++----- sys/tools/{ => sound}/emu10k1-mkalsa.sh | 0 sys/tools/{ => sound}/feeder_eq_mkfilter.awk | 0 .../{ => sound}/feeder_rate_mkfilter.awk | 0 sys/tools/{ => sound}/snd_fxdiv_gen.awk | 0 6 files changed, 18 insertions(+), 18 deletions(-) rename sys/tools/{ => sound}/emu10k1-mkalsa.sh (100%) rename sys/tools/{ => sound}/feeder_eq_mkfilter.awk (100%) rename sys/tools/{ => sound}/feeder_rate_mkfilter.awk (100%) rename sys/tools/{ => sound}/snd_fxdiv_gen.awk (100%) diff --git a/sys/conf/files b/sys/conf/files index f51534e39699..9cafbdb48818 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -51,33 +51,33 @@ aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local emu10k1-alsa%diked.h optional snd_emu10k1 | snd_emu10kx \ - dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \ - compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ + dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \ + compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "emu10k1-alsa%diked.h" p16v-alsa%diked.h optional snd_emu10kx pci \ - dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \ - compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \ + dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \ + compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "p16v-alsa%diked.h" p17v-alsa%diked.h optional snd_emu10kx pci \ - dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \ - compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \ + dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \ + compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "p17v-alsa%diked.h" feeder_eq_gen.h optional sound \ - dependency "$S/tools/feeder_eq_mkfilter.awk" \ - compile-with "${AWK} -f $S/tools/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \ + dependency "$S/tools/sound/feeder_eq_mkfilter.awk" \ + compile-with "${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \ no-obj no-implicit-rule before-depend \ clean "feeder_eq_gen.h" feeder_rate_gen.h optional sound \ - dependency "$S/tools/feeder_rate_mkfilter.awk" \ - compile-with "${AWK} -f $S/tools/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \ + dependency "$S/tools/sound/feeder_rate_mkfilter.awk" \ + compile-with "${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \ no-obj no-implicit-rule before-depend \ clean "feeder_rate_gen.h" snd_fxdiv_gen.h optional sound \ - dependency "$S/tools/snd_fxdiv_gen.awk" \ - compile-with "${AWK} -f $S/tools/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \ + dependency "$S/tools/sound/snd_fxdiv_gen.awk" \ + compile-with "${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \ no-obj no-implicit-rule before-depend \ clean "snd_fxdiv_gen.h" miidevs.h optional miibus | mii \ diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index cd251082907f..67403bac7e4a 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -19,14 +19,14 @@ SRCS+= ac97.c ac97_patch.c buffer.c channel.c clone.c dsp.c SRCS+= mixer.c sndstat.c sound.c unit.c vchan.c SRCS+= midi.c mpu401.c sequencer.c -feeder_eq_gen.h: @ @/tools/feeder_eq_mkfilter.awk machine - ${AWK} -f @/tools/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET} +feeder_eq_gen.h: @ @/tools/sound/feeder_eq_mkfilter.awk machine + ${AWK} -f @/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET} -feeder_rate_gen.h: @ @/tools/feeder_rate_mkfilter.awk machine - ${AWK} -f @/tools/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > ${.TARGET} +feeder_rate_gen.h: @ @/tools/sound/feeder_rate_mkfilter.awk machine + ${AWK} -f @/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > ${.TARGET} -snd_fxdiv_gen.h: @ @/tools/snd_fxdiv_gen.awk machine - ${AWK} -f @/tools/snd_fxdiv_gen.awk -- > ${.TARGET} +snd_fxdiv_gen.h: @ @/tools/sound/snd_fxdiv_gen.awk machine + ${AWK} -f @/tools/sound/snd_fxdiv_gen.awk -- > ${.TARGET} CLEANFILES+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h diff --git a/sys/tools/emu10k1-mkalsa.sh b/sys/tools/sound/emu10k1-mkalsa.sh similarity index 100% rename from sys/tools/emu10k1-mkalsa.sh rename to sys/tools/sound/emu10k1-mkalsa.sh diff --git a/sys/tools/feeder_eq_mkfilter.awk b/sys/tools/sound/feeder_eq_mkfilter.awk similarity index 100% rename from sys/tools/feeder_eq_mkfilter.awk rename to sys/tools/sound/feeder_eq_mkfilter.awk diff --git a/sys/tools/feeder_rate_mkfilter.awk b/sys/tools/sound/feeder_rate_mkfilter.awk similarity index 100% rename from sys/tools/feeder_rate_mkfilter.awk rename to sys/tools/sound/feeder_rate_mkfilter.awk diff --git a/sys/tools/snd_fxdiv_gen.awk b/sys/tools/sound/snd_fxdiv_gen.awk similarity index 100% rename from sys/tools/snd_fxdiv_gen.awk rename to sys/tools/sound/snd_fxdiv_gen.awk