patch-1.3.28 linux/drivers/sound/Makefile

Next file: linux/drivers/sound/dmabuf.c
Previous file: linux/drivers/scsi/wd7000.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.27/linux/drivers/sound/Makefile linux/drivers/sound/Makefile
@@ -17,7 +17,13 @@
 	 sys_timer.o ics2101.o ad1848.o pss.o sscape.o trix.o aedsp16.o \
 	 mad16.o
 
+# Don't compile the sound driver during a normal kernel build if we have
+# configured for a module build instead.
+ifeq ($(CONFIG_SOUND),y)
 all:	local.h sound.a
+else
+all:
+endif
 
 sound.a: $(OBJS) 
 	-rm -f sound.a
@@ -59,9 +65,9 @@
 setup-linux:
 	@echo Compiling Sound Driver v $(VERSION) for Linux
 
-sound.o: $(OBJS) 
+sound.o: sound.a
 	-rm -f sound.o
-	$(LD) -r -o sound.o $(OBJS)
+	$(LD) -r -o sound.o soundcard.o sound.a
 
 modules: sound.o
 	(cd ../../modules; ln -fs ../drivers/sound/sound.o .)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this