rename directories, update Makefile to match

pje · Aug 19, 2012 · f17ce13 · f17ce13
1 parent b1d4826
commit f17ce13
Show file tree

Hide file tree

Showing 34 changed files with 3 additions and 3 deletions.
diff --git a/SoundflowerBed/AppController.h → App/AppController.h b/SoundflowerBed/AppController.h → App/AppController.h
diff --git a/SoundflowerBed/AppController.mm → App/AppController.mm b/SoundflowerBed/AppController.mm → App/AppController.mm
diff --git a/SoundflowerBed/AudioDevice.cpp → App/AudioDevice.cpp b/SoundflowerBed/AudioDevice.cpp → App/AudioDevice.cpp
diff --git a/SoundflowerBed/AudioDevice.h → App/AudioDevice.h b/SoundflowerBed/AudioDevice.h → App/AudioDevice.h
diff --git a/SoundflowerBed/AudioDeviceList.cpp → App/AudioDeviceList.cpp b/SoundflowerBed/AudioDeviceList.cpp → App/AudioDeviceList.cpp
diff --git a/SoundflowerBed/AudioDeviceList.h → App/AudioDeviceList.h b/SoundflowerBed/AudioDeviceList.h → App/AudioDeviceList.h
diff --git a/SoundflowerBed/AudioRingBuffer.cpp → App/AudioRingBuffer.cpp b/SoundflowerBed/AudioRingBuffer.cpp → App/AudioRingBuffer.cpp
diff --git a/SoundflowerBed/AudioRingBuffer.h → App/AudioRingBuffer.h b/SoundflowerBed/AudioRingBuffer.h → App/AudioRingBuffer.h
diff --git a/SoundflowerBed/AudioThruEngine.cpp → App/AudioThruEngine.cpp b/SoundflowerBed/AudioThruEngine.cpp → App/AudioThruEngine.cpp
diff --git a/SoundflowerBed/AudioThruEngine.h → App/AudioThruEngine.h b/SoundflowerBed/AudioThruEngine.h → App/AudioThruEngine.h
diff --git a/...English.lproj/MainMenu.nib/designable.nib → ...English.lproj/MainMenu.nib/designable.nib b/...English.lproj/MainMenu.nib/designable.nib → ...English.lproj/MainMenu.nib/designable.nib
diff --git a/...glish.lproj/MainMenu.nib/keyedobjects.nib → ...glish.lproj/MainMenu.nib/keyedobjects.nib b/...glish.lproj/MainMenu.nib/keyedobjects.nib → ...glish.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/SoundflowerBed/HelpWindowController.h → App/HelpWindowController.h b/SoundflowerBed/HelpWindowController.h → App/HelpWindowController.h
diff --git a/SoundflowerBed/HelpWindowController.m → App/HelpWindowController.m b/SoundflowerBed/HelpWindowController.m → App/HelpWindowController.m
diff --git a/SoundflowerBed/Info.plist → App/Info.plist b/SoundflowerBed/Info.plist → App/Info.plist
diff --git a/SoundflowerBed/Soundflowerbed.h → App/Soundflowerbed.h b/SoundflowerBed/Soundflowerbed.h → App/Soundflowerbed.h
diff --git a/SoundflowerBed/Soundflowerbed.m → App/Soundflowerbed.m b/SoundflowerBed/Soundflowerbed.m → App/Soundflowerbed.m
diff --git a/...lowerBed/WavTap.xcodeproj/project.pbxproj → App/WavTap.xcodeproj/project.pbxproj b/...lowerBed/WavTap.xcodeproj/project.pbxproj → App/WavTap.xcodeproj/project.pbxproj
diff --git a/SoundflowerBed/appIcon.icns → App/appIcon.icns b/SoundflowerBed/appIcon.icns → App/appIcon.icns
diff --git a/SoundflowerBed/appIcon.psd → App/appIcon.psd b/SoundflowerBed/appIcon.psd → App/appIcon.psd
diff --git a/SoundflowerBed/main.m → App/main.m b/SoundflowerBed/main.m → App/main.m
diff --git a/SoundflowerBed/menuIcon.psd → App/menuIcon.psd b/SoundflowerBed/menuIcon.psd → App/menuIcon.psd
diff --git a/SoundflowerBed/menuIcon.tiff → App/menuIcon.tiff b/SoundflowerBed/menuIcon.tiff → App/menuIcon.tiff
diff --git a/SoundflowerBed/sox → App/sox b/SoundflowerBed/sox → App/sox
diff --git a/SoundflowerBed/toggle_record → App/toggle_record b/SoundflowerBed/toggle_record → App/toggle_record
diff --git a/Source/Info.plist → Extension/Info.plist b/Source/Info.plist → Extension/Info.plist
diff --git a/Source/Soundflower.xcconfig → Extension/Soundflower.xcconfig b/Source/Soundflower.xcconfig → Extension/Soundflower.xcconfig
diff --git a/Source/Soundflower.xcodeproj/project.pbxproj → ...ion/Soundflower.xcodeproj/project.pbxproj b/Source/Soundflower.xcodeproj/project.pbxproj → ...ion/Soundflower.xcodeproj/project.pbxproj
diff --git a/Source/SoundflowerClip.cpp → Extension/SoundflowerClip.cpp b/Source/SoundflowerClip.cpp → Extension/SoundflowerClip.cpp
diff --git a/Source/SoundflowerDevice.cpp → Extension/SoundflowerDevice.cpp b/Source/SoundflowerDevice.cpp → Extension/SoundflowerDevice.cpp
diff --git a/Source/SoundflowerDevice.h → Extension/SoundflowerDevice.h b/Source/SoundflowerDevice.h → Extension/SoundflowerDevice.h
diff --git a/Source/SoundflowerEngine.cpp → Extension/SoundflowerEngine.cpp b/Source/SoundflowerEngine.cpp → Extension/SoundflowerEngine.cpp
diff --git a/Source/SoundflowerEngine.h → Extension/SoundflowerEngine.h b/Source/SoundflowerEngine.h → Extension/SoundflowerEngine.h
diff --git a/Makefile b/Makefile
@@ -2,8 +2,8 @@ SHELL=/bin/sh
 
 ROOT=$$(pwd)
 PRODUCT_NAME=WavTap
-KEXT_DIR=$(ROOT)/Source
-APP_DIR=$(ROOT)/SoundflowerBed
+KEXT_DIR=$(ROOT)/Extension
+APP_DIR=$(ROOT)/App
 KEXT_BUILD_DIR=$(KEXT_DIR)/Build/UninstalledProducts
 APP_BUILD_DIR=$(APP_DIR)/build/UninstalledProducts
 APP_INSTALL_DIR=/Applications
@@ -21,7 +21,7 @@ clean-kext:
 	rm -rf $(KEXT_DIR)/Build
 
 clean-app:
-	rm -rf $(APP_BUILD_DIR)
+	rm -rf $(APP_DIR)/build/UninstalledProducts
 
 uninstall-kext:
 	if [[ "$(shell kextstat | grep $(PRODUCT_NAME) | grep -v grep)" ]]; then sudo kextunload /System/Library/Extensions/$(PRODUCT_NAME).kext; fi