From 19774011061270d80467faff97d65aad2658c89b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 14 Jul 2010 21:11:24 +0000 Subject: [PATCH] Simplified Jamfiles. The drivers isn't built anyway, though. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37520 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../drivers/audio/ac97/ichaudio/Jamfile | 20 ++++--------------- .../drivers/audio/ac97/ichaudio/lala/Jamfile | 9 ++------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile index 2f4aebdbd8..80dbbc94f6 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile +++ b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile @@ -1,26 +1,14 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 ichaudio ; -# UsePrivateHeaders media ; SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons lala ] ; -KernelMergeObject ichaudio_driver.o : + +KernelAddon ichaudio : ichaudio.c io.c - : - -fno-pic -Wno-unused -D_KERNEL_MODE - ; + : ichaudio_lala.o +; -KernelLd ichaudio : - ichaudio_driver.o - lala.o - /boot/beos/system/kernel_intel - : - $(HAIKU_TOP)/src/kernel/ldscripts/$(TARGET_ARCH)/add-on.ld - : - -Bdynamic -shared - : - : - ; SubInclude HAIKU_TOP src add-ons kernel drivers audio ac97 ichaudio lala ; diff --git a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile index d54c6fac1f..6a78fd7ef8 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile +++ b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile @@ -1,12 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 ichaudio lala ; -# R5KernelStaticLibrary liblala.a : -# driver.c -# ; -KernelMergeObject lala.o : +KernelMergeObject ichaudio_lala.o : driver.c util.c - : - -fno-pic -D_KERNEL_MODE - ; +;