Menu
▾
▴
[linuxdc-cvs] CVS: linux-sh-dc/drivers/sound Makefile,1.2,1.3
|
From: M. R. B. <mr...@us...> - 2002-10-29 16:11:48
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv7381
Modified Files:
Makefile
Log Message:
Merge changes from Linux 2.5.44
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/sound/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 9 Jan 2002 11:13:57 -0000 1.2
+++ Makefile 29 Oct 2002 16:11:45 -0000 1.3
@@ -3,18 +3,15 @@
# 18 Apr 1998, Michael Elizabeth Chastain, <mailto:me...@sh...>
# Rewritten to use lists instead of if-statements.
-
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
-export-objs := ad1848.o audio_syms.o midi_syms.o mpu401.o \
- msnd.o opl3.o sb_common.o sequencer_syms.o \
- sound_core.o sound_syms.o uart401.o \
- nm256_audio.o ac97.o ac97_codec.o aci.o
+export-objs := ad1848.o audio_syms.o midi_syms.o mpu401.o ac97_codec.o \
+ msnd.o opl3.o sb_common.o sequencer_syms.o ac97.o aci.o \
+ sound_syms.o uart401.o
# Each configuration option enables a list of files.
-obj-$(CONFIG_SOUND) += soundcore.o
obj-$(CONFIG_SOUND_OSS) += sound.o
obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o
@@ -78,42 +75,19 @@
obj-$(CONFIG_SOUND_EMU10K1) += sound.o
endif
-subdir-$(CONFIG_SOUND_EMU10K1) += emu10k1
-subdir-$(CONFIG_SOUND_CS4281) += cs4281
-
-ifeq ($(CONFIG_SOUND_EMU10K1),y)
- obj-y += emu10k1/emu10k1.o
-endif
-
-ifeq ($(CONFIG_SOUND_CS4281),y)
- obj-y += cs4281/cs4281.o
-endif
-
-subdir-$(CONFIG_DMASOUND) += dmasound
-
-ifeq ($(CONFIG_DMASOUND),y)
- obj-y += dmasound/dmasound.o
-endif
-
-subdir-$(CONFIG_SOUND_AICA) += aica
-
-ifeq ($(CONFIG_SOUND_AICA),y)
- obj-y += aica/aica.o
-endif
+obj-$(CONFIG_SOUND_EMU10K1) += emu10k1/
+obj-$(CONFIG_SOUND_CS4281) += cs4281/
+obj-$(CONFIG_DMASOUND) += dmasound/
+obj-$(CONFIG_SOUND_AICA) += aica/
# Declare multi-part drivers.
-list-multi := sound.o gus.o pas2.o sb.o sb_lib.o vidc_mod.o \
- soundcore.o wavefront.o
-
sound-objs := \
dev_table.o soundcard.o sound_syms.o \
audio.o audio_syms.o dmabuf.o \
midi_syms.o midi_synth.o midibuf.o \
sequencer.o sequencer_syms.o sound_timer.o sys_timer.o
-soundcore-objs := sound_core.o sound_firmware.o
-
gus-objs := gus_card.o gus_midi.o gus_vol.o gus_wave.o ics2101.o
pas2-objs := pas2_card.o pas2_midi.o pas2_mixer.o pas2_pcm.o
sb-objs := sb_card.o
@@ -121,179 +95,84 @@
vidc_mod-objs := vidc.o vidc_fill.o
wavefront-objs := wavfront.o wf_midi.o yss225.o
+host-progs := bin2hex hex2hex
-O_TARGET := sounddrivers.o
+# Files generated that shall be removed upon make clean
+clean-files := maui_boot.h msndperm.c msndinit.c pndsperm.c pndspini.c \
+ pss_boot.h trix_boot.h
include $(TOPDIR)/Rules.make
-
-
-# Link rules for multi-part drivers.
-
-sound.o: $(sound-objs)
- $(LD) -r -o $@ $(sound-objs)
-
-soundcore.o: $(soundcore-objs)
- $(LD) -r -o $@ $(soundcore-objs)
-
-gus.o: $(gus-objs)
- $(LD) -r -o $@ $(gus-objs)
-
-pas2.o: $(pas2-objs)
- $(LD) -r -o $@ $(pas2-objs)
-
-sb.o: $(sb-objs)
- $(LD) -r -o $@ $(sb-objs)
-
-sb_lib.o: $(sb_lib-objs)
- $(LD) -r -o $@ $(sb_lib-objs)
-
-vidc_mod.o: $(vidc_mod-objs)
- $(LD) -r -o $@ $(vidc_mod-objs)
-
-wavefront.o: $(wavefront-objs)
- $(LD) -r -o $@ $(wavefront-objs)
-
# Firmware files that need translation
#
# The translated files are protected by a file that keeps track
# of what name was used to build them. If the name changes, they
# will be forced to be remade.
#
-# First make the utilities.
-
-bin2hex: bin2hex.c
- $(HOSTCC) $(HOSTCFLAGS) -o bin2hex bin2hex.c
-
-hex2hex: hex2hex.c
- $(HOSTCC) $(HOSTCFLAGS) -o hex2hex hex2hex.c
-
-
-
# Turtle Beach Maui / Tropez
-maui.o: maui_boot.h
+$(obj)/maui.o: $(obj)/maui_boot.h
ifeq ($(CONFIG_MAUI_HAVE_BOOT),y)
- maui_boot.h: $(patsubst "%", %, $(CONFIG_MAUI_BOOT_FILE)) bin2hex
- ./bin2hex -i maui_os < $(CONFIG_MAUI_BOOT_FILE) > $@
+ $(obj)/maui_boot.h: $(patsubst "%", %, $(CONFIG_MAUI_BOOT_FILE)) $(obj)/bin2hex
+ $(obj)/bin2hex -i maui_os < $< > $@
else
- maui_boot.h:
+ $(obj)/maui_boot.h:
( \
echo 'static unsigned char * maui_os = NULL;'; \
echo 'static int maui_osLen = 0;'; \
) > $@
endif
- @ ( \
- echo 'ifeq ($(strip $(CONFIG_MAUI_HAVE_BOOT) $(CONFIG_MAUI_BOOT_FILE)),$$(strip $$(CONFIG_MAUI_HAVE_BOOT) $$(CONFIG_MAUI_BOOT_FILE)))'; \
- echo 'FILES_BOOT_UP_TO_DATE += $@'; \
- echo 'endif' \
- ) > .$@.boot
-
-
# Turtle Beach MultiSound
ifeq ($(CONFIG_MSNDCLAS_HAVE_BOOT),y)
- msnd_classic.o: msndperm.c msndinit.c
+ $(obj)/msnd_classic.o: $(obj)/msndperm.c $(obj)/msndinit.c
- msndperm.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_PERM_FILE)) bin2hex
- ./bin2hex msndperm < $(CONFIG_MSNDCLAS_PERM_FILE) > $@
- @ ( \
- echo 'ifeq ($(strip $(CONFIG_MSNDCLAS_HAVE_BOOT) $(CONFIG_MSNDCLAS_PERM_FILE)),$$(strip $$(CONFIG_MSNDCLAS_HAVE_BOOT) $$(CONFIG_MSNDCLAS_PERM_FILE)))'; \
- echo 'FILES_BOOT_UP_TO_DATE += $@'; \
- echo 'endif' \
- ) > .$@.boot
+ $(obj)/msndperm.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_PERM_FILE)) $(obj)/bin2hex
+ $(obj)/bin2hex msndperm < $< > $@
- msndinit.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_INIT_FILE)) bin2hex
- ./bin2hex msndinit < $(CONFIG_MSNDCLAS_INIT_FILE) > $@
- @ ( \
- echo 'ifeq ($(strip $(CONFIG_MSNDCLAS_HAVE_BOOT) $(CONFIG_MSNDCLAS_INIT_FILE)),$$(strip $$(CONFIG_MSNDCLAS_HAVE_BOOT) $$(CONFIG_MSNDCLAS_INIT_FILE)))'; \
- echo 'FILES_BOOT_UP_TO_DATE += $@'; \
- echo 'endif' \
- ) > .$@.boot
+ $(obj)/msndinit.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_INIT_FILE)) $(obj)/bin2hex
+ $(obj)/bin2hex msndinit < $< > $@
endif
ifeq ($(CONFIG_MSNDPIN_HAVE_BOOT),y)
- msnd_pinnacle.o: pndsperm.c pndspini.c
+ $(obj)/msnd_pinnacle.o: $(obj)/pndsperm.c $(obj)/pndspini.c
- pndsperm.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_PERM_FILE)) bin2hex
- ./bin2hex pndsperm < $(CONFIG_MSNDPIN_PERM_FILE) > $@
- @ ( \
- echo 'ifeq ($(strip $(CONFIG_MSNDPIN_HAVE_BOOT) $(CONFIG_MSNDPIN_PERM_FILE)),$$(strip $$(CONFIG_MSNDPIN_HAVE_BOOT) $$(CONFIG_MSNDPIN_PERM_FILE)))'; \
- echo 'FILES_BOOT_UP_TO_DATE += $@'; \
- echo 'endif' \
- ) > .$@.boot
+ $(obj)/pndsperm.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_PERM_FILE)) $(obj)/bin2hex
+ $(obj)/bin2hex pndsperm < $< > $@
- pndspini.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_INIT_FILE)) bin2hex
- ./bin2hex pndspini < $(CONFIG_MSNDPIN_INIT_FILE) > $@
- @ ( \
- echo 'ifeq ($(strip $(CONFIG_MSNDPIN_HAVE_BOOT) $(CONFIG_MSNDPIN_INIT_FILE)),$$(strip $$(CONFIG_MSNDPIN_HAVE_BOOT) $$(CONFIG_MSNDPIN_INIT_FILE)))'; \
- echo 'FILES_BOOT_UP_TO_DATE += $@'; \
- echo 'endif' \
- ) > .$@.boot
+ $(obj)/pndspini.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_INIT_FILE)) $(obj)/bin2hex
+ $(obj)/bin2hex pndspini < $< > $@
endif
-
-
# PSS (ECHO-ADI2111)
-pss.o: pss_boot.h
+$(obj)/pss.o: $(obj)/pss_boot.h
ifeq ($(CONFIG_PSS_HAVE_BOOT),y)
- pss_boot.h: $(patsubst "%", %, $(CONFIG_PSS_BOOT_FILE)) bin2hex
- ./bin2hex pss_synth < $(CONFIG_PSS_BOOT_FILE) > $@
+ $(obj)/pss_boot.h: $(patsubst "%", %, $(CONFIG_PSS_BOOT_FILE)) $(obj)/bin2hex
+ $(obj)/bin2hex pss_synth < $< > $@
else
- pss_boot.h:
+ $(obj)/pss_boot.h:
( \
echo 'static unsigned char * pss_synth = NULL;'; \
echo 'static int pss_synthLen = 0;'; \
) > $@
endif
- @ ( \
- echo 'ifeq ($(strip $(CONFIG_PSS_HAVE_BOOT) $(CONFIG_PSS_BOOT_FILE)),$$(strip $$(CONFIG_PSS_HAVE_BOOT) $$(CONFIG_PSS_BOOT_FILE)))'; \
- echo 'FILES_BOOT_UP_TO_DATE += $@'; \
- echo 'endif' \
- ) > .$@.boot
-
-
# MediaTrix AudioTrix Pro
-trix.o: trix_boot.h
+$(obj)/trix.o: $(obj)/trix_boot.h
ifeq ($(CONFIG_TRIX_HAVE_BOOT),y)
- trix_boot.h: $(patsubst "%", %, $(CONFIG_TRIX_BOOT_FILE)) hex2hex
- ./hex2hex -i trix_boot < $(CONFIG_TRIX_BOOT_FILE) > $@
+ $(obj)/trix_boot.h: $(patsubst "%", %, $(CONFIG_TRIX_BOOT_FILE)) $(obj)/hex2hex
+ $(obj)/hex2hex -i trix_boot < $< > $@
else
- trix_boot.h:
+ $(obj)/trix_boot.h:
( \
echo 'static unsigned char * trix_boot = NULL;'; \
echo 'static int trix_boot_len = 0;'; \
) > $@
-endif
- @ ( \
- echo 'ifeq ($(strip $(CONFIG_TRIX_HAVE_BOOT) $(CONFIG_TRIX_BOOT_FILE)),$$(strip $$(CONFIG_TRIX_HAVE_BOOT) $$(CONFIG_TRIX_BOOT_FILE)))'; \
- echo 'FILES_BOOT_UP_TO_DATE += $@'; \
- echo 'endif' \
- ) > .$@.boot
-
-
-
-# Find boot files whose source file names have changed and force rebuild.
-
-FILES_BOOT_UP_TO_DATE :=
-
-FILES_BOOT_EXIST := $(wildcard .*.boot)
-ifneq ($(FILES_BOOT_EXIST),)
-include $(FILES_BOOT_EXIST)
-endif
-
-FILES_BOOT_CHANGED := $(strip \
- $(filter-out $(FILES_BOOT_UP_TO_DATE), \
- maui_boot.h pss_boot.h trix_boot.h))
-
-ifneq ($(FILES_BOOT_CHANGED),)
-$(FILES_BOOT_CHANGED): dummy
endif
|
