From 6dcc5b030e1a6e66aed8504a2fbc2ab652b9ea91 Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Wed, 16 Jul 2003 19:53:53 +0000
Subject: Further fixes to the old makefiles.

Kent
---
 intern/SoundSystem/Makefile          | 4 ++--
 intern/SoundSystem/SND_test/Makefile | 7 +++----
 intern/SoundSystem/intern/Makefile   | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'intern')

diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile
index 87afb6abb15..4273b3380f9 100644
--- a/intern/SoundSystem/Makefile
+++ b/intern/SoundSystem/Makefile
@@ -35,7 +35,7 @@ include nan_definitions.mk
 
 LIBNAME = soundsystem
 SOURCEDIR = intern/SoundSystem
-DIR = $(OCGDIR)/SoundSystem
+DIR = $(OCGDIR)/$(SOURCEDIR)
 DIRS = intern
 DIRS += dummy
 
@@ -68,6 +68,6 @@ ifeq ($(OS),darwin)
 	ranlib $(NAN_SOUNDSYSTEM)/lib/libsoundsystem.a
 	ranlib $(NAN_SOUNDSYSTEM)/lib/debug/libsoundsystem.a
 endif
-	@../tools/cpifdiff.sh extern/*.h $(NAN_SOUNDSYSTEM)/include/
+	@../tools/cpifdiff.sh *.h $(NAN_SOUNDSYSTEM)/include/
 
 
diff --git a/intern/SoundSystem/SND_test/Makefile b/intern/SoundSystem/SND_test/Makefile
index bb317f2c8f6..2fc531ae37e 100644
--- a/intern/SoundSystem/SND_test/Makefile
+++ b/intern/SoundSystem/SND_test/Makefile
@@ -31,8 +31,8 @@
 #
 #
 
-LIBNAME = SoundSystem
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+LIBNAME = soundsystem
+DIR = $(OCGDIR)/intern/SoundSystem
 ALLTARGETS = $(OBJS) $(DIR)/$(DEBUG_DIR)SoundSystem
 
 include nan_compile.mk
@@ -44,8 +44,7 @@ CPPFLAGS += -I.. -I../SND_BlenderWaveCache -I../SND_OpenAL
 
 TESTLIB = $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
 TESTLIB += $(OCGDIR)/gameengine/BlenderWaveCache/$(DEBUG_DIR)libBlenderWaveCache.a
-TESTLIB += $(OCGDIR)/kernel/gen_system/$(DEBUG_DIR)libgen_system.a
-TESTLIB += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
+TESTLIB += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libsoundsystem.a
 TESTLIB += $(NAN_OPENAL)/lib/libopenal.a
 
 $(DIR)/$(DEBUG_DIR)SoundSystem: $(OBJS) $(TESTLIB)
diff --git a/intern/SoundSystem/intern/Makefile b/intern/SoundSystem/intern/Makefile
index 380a9748b70..252c6c022fe 100644
--- a/intern/SoundSystem/intern/Makefile
+++ b/intern/SoundSystem/intern/Makefile
@@ -31,8 +31,8 @@
 #
 #
 
-LIBNAME = SoundSystem
-DIR = $(OCGDIR)/intern/$(LIBNAME)
+LIBNAME = soundsystem
+DIR = $(OCGDIR)/intern/SoundSystem
 
 include nan_compile.mk
 
-- 
cgit v1.2.3