From 79623815d8aea679730886db280d501ad772829f Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 6 May 2011 00:43:30 +0000 Subject: [PATCH] Put special realtime drivers (Void and Device) in Storage so that they aren't automatically chosen over real drivers. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@38557 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/devs/AHI/Drivers/Common/Makefile.common.in | 12 ++++++++---- workbench/devs/AHI/Drivers/Device/Makefile.in | 4 +++- workbench/devs/AHI/Drivers/Void/Makefile.in | 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/workbench/devs/AHI/Drivers/Common/Makefile.common.in b/workbench/devs/AHI/Drivers/Common/Makefile.common.in index 17e21d0538..2caafa6660 100644 --- a/workbench/devs/AHI/Drivers/Common/Makefile.common.in +++ b/workbench/devs/AHI/Drivers/Common/Makefile.common.in @@ -36,9 +36,13 @@ ARFLAGS = @ARFLAGS@ SFDC = @SFDC@ -# Do not link drivers wit any library by default +# Do not link drivers with any library by default LIBS = +ifeq ($(DEST),) + DEST := Devs +endif + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -72,9 +76,9 @@ distclean: clean maintainer-clean: distclean install: all - $(INSTALL) -d $(PREFIX)/Devs/AHI $(PREFIX)/Devs/AudioModes - $(INSTALL_PROGRAM) $(DRIVER) $(PREFIX)/Devs/AHI/ - $(INSTALL_DATA) $(MODEFILE) $(PREFIX)/Devs/AudioModes/ + $(INSTALL) -d $(PREFIX)/$(DEST)/AHI $(PREFIX)/$(DEST)/AudioModes + $(INSTALL_PROGRAM) $(DRIVER) $(PREFIX)/$(DEST)/AHI/ + $(INSTALL_DATA) $(MODEFILE) $(PREFIX)/$(DEST)/AudioModes/ revup: @rev=`cat $(srcdir)/version.rev` && echo `expr $$rev + 1` > $(srcdir)/version.rev diff --git a/workbench/devs/AHI/Drivers/Device/Makefile.in b/workbench/devs/AHI/Drivers/Device/Makefile.in index 0e624d2594..d58e842368 100644 --- a/workbench/devs/AHI/Drivers/Device/Makefile.in +++ b/workbench/devs/AHI/Drivers/Device/Makefile.in @@ -9,6 +9,8 @@ srcdir = @srcdir@ DRIVER = device.audio MODEFILE = DEVICE -OBJECTS = device-init.o device-main.o device-playslave.o device-accel.o +OBJECTS = device-init.o device-main.o device-playslave.o device-accel.o + +DEST = Storage include ../Common/Makefile.common diff --git a/workbench/devs/AHI/Drivers/Void/Makefile.in b/workbench/devs/AHI/Drivers/Void/Makefile.in index 3b665858ec..f1e8c8ea96 100644 --- a/workbench/devs/AHI/Drivers/Void/Makefile.in +++ b/workbench/devs/AHI/Drivers/Void/Makefile.in @@ -11,4 +11,6 @@ MODEFILE = VOID OBJECTS = void-init.o void-main.o void-playslave.o void-accel.o +DEST = Storage + include ../Common/Makefile.common -- 2.11.4.GIT