From 6a89bd15fda7b7628c9fb8500fdc47d7c8d3bb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Fri, 8 May 2015 08:50:22 +0200 Subject: [PATCH] dde_bsd: prefix audio library name Issue #1498. --- repos/dde_bsd/lib/mk/{audio.inc => dde_bsd_audio.inc} | 0 repos/dde_bsd/lib/mk/x86_32/{audio.mk => dde_bsd_audio.mk} | 2 +- repos/dde_bsd/lib/mk/x86_64/{audio.mk => dde_bsd_audio.mk} | 2 +- repos/dde_bsd/src/drivers/audio_out/target.mk | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename repos/dde_bsd/lib/mk/{audio.inc => dde_bsd_audio.inc} (100%) rename repos/dde_bsd/lib/mk/x86_32/{audio.mk => dde_bsd_audio.mk} (65%) rename repos/dde_bsd/lib/mk/x86_64/{audio.mk => dde_bsd_audio.mk} (65%) diff --git a/repos/dde_bsd/lib/mk/audio.inc b/repos/dde_bsd/lib/mk/dde_bsd_audio.inc similarity index 100% rename from repos/dde_bsd/lib/mk/audio.inc rename to repos/dde_bsd/lib/mk/dde_bsd_audio.inc diff --git a/repos/dde_bsd/lib/mk/x86_32/audio.mk b/repos/dde_bsd/lib/mk/x86_32/dde_bsd_audio.mk similarity index 65% rename from repos/dde_bsd/lib/mk/x86_32/audio.mk rename to repos/dde_bsd/lib/mk/x86_32/dde_bsd_audio.mk index 06b76f674..02457391e 100644 --- a/repos/dde_bsd/lib/mk/x86_32/audio.mk +++ b/repos/dde_bsd/lib/mk/x86_32/dde_bsd_audio.mk @@ -1,5 +1,5 @@ INC_DIR += $(LIB_INC_DIR)/x86_32 $(LIB_INC_DIR)/x86 -include $(REP_DIR)/lib/mk/audio.inc +include $(REP_DIR)/lib/mk/dde_bsd_audio.inc vpath %.S $(LIB_DIR)/x86_32 diff --git a/repos/dde_bsd/lib/mk/x86_64/audio.mk b/repos/dde_bsd/lib/mk/x86_64/dde_bsd_audio.mk similarity index 65% rename from repos/dde_bsd/lib/mk/x86_64/audio.mk rename to repos/dde_bsd/lib/mk/x86_64/dde_bsd_audio.mk index d032c47c7..f0e95b5e1 100644 --- a/repos/dde_bsd/lib/mk/x86_64/audio.mk +++ b/repos/dde_bsd/lib/mk/x86_64/dde_bsd_audio.mk @@ -1,5 +1,5 @@ INC_DIR += $(LIB_INC_DIR)/x86_64 $(LIB_INC_DIR)/x86 -include $(REP_DIR)/lib/mk/audio.inc +include $(REP_DIR)/lib/mk/dde_bsd_audio.inc vpath %.S $(LIB_DIR)/x86_64 diff --git a/repos/dde_bsd/src/drivers/audio_out/target.mk b/repos/dde_bsd/src/drivers/audio_out/target.mk index d5ae9f81b..66e395636 100644 --- a/repos/dde_bsd/src/drivers/audio_out/target.mk +++ b/repos/dde_bsd/src/drivers/audio_out/target.mk @@ -1,5 +1,5 @@ TARGET = audio_out_drv REQUIRES = x86 SRC_CC = main.cc -LIBS = audio base config server +LIBS = dde_bsd_audio base config server INC_DIR += $(REP_DIR)/include