Index: trunk/i386/modules/MakeInc.dir
===================================================================
--- trunk/i386/modules/MakeInc.dir	(revision 799)
+++ trunk/i386/modules/MakeInc.dir	(revision 800)
@@ -1,5 +1,5 @@
 OBJROOT = ../../../obj/i386/modules/$(DIR)
-SYMROOT = ../../../sym/i386/modules/
+SYMROOT = ../../../sym/i386/
 DSTROOT = ../../../dst/i386/
 
 UTILDIR = ../../util
@@ -7,21 +7,12 @@
 LIBSAIODIR = ../../libsaio
 BOOT2DIR = ../../boot2
 
-MODULE_DEPENDENCIES := $(foreach x,$(MODULE_DEPENDENCIES),-weak_library $(SYMROOT)/$(x).dylib)
-MODULE_OBJECTS := $(foreach x,$(MODULE_OBJS),$(OBJROOT)/$(x))
+MODULE_DEPENDENCIES := $(foreach x,$(MODULE_DEPENDENCIES),-weak_library $(SYMROOT)/modules/$(x).dylib)
 
-CPP = g++ -fno-exceptions -fno-rtti
 
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-
-
 INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
 
-dylib: ${OBJROOT} ${MODULE_OBJECTS} dylib_final
+dylib: ${OBJROOT} ${MODULE_OBJS} dylib_final
 
 dylib_final: 
 	@rm -rf $(SYMROOT)/$(MODULE_NAME).dylib	#ensure module doesn't link with old version of self
@@ -41,11 +32,10 @@
 	-weak_library $(OBJROOT)/../../boot2/Symbols_LINKER_ONLY.dylib \
 	$(MODULE_DEPENDENCIES) \
 	-macosx_version_min 10.6 \
-	-o $(SYMROOT)/$(MODULE_NAME).dylib
+	-o $(SYMROOT)/modules/$(MODULE_NAME).dylib
 	
 	@cp -rf include/* ../module_includes/ &> /dev/null || true
 	
-	
 %.o: %.c
 	@echo "\t[CC] $<"
 	@$(CC) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
@@ -54,27 +44,18 @@
 	@echo "\t[CPP] $<"
 	@$(CPP) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
 
-$(OBJROOT)/%.o: %.c
-	@echo "\t[CC] $<"
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$@"
-
-$(OBJROOT)/%.o: %.cpp
-	@echo "\t[CPP] $<"
-	@$(CPP) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$@"
-
-
 clean:
 	@echo "\t[RM] $(OBJROOT)"
 	@rm -rf ${OBJROOT}
 	@echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib"
-	@rm -rf $(SYMROOT)/$(MODULE_NAME).dylib &> /dev/null
+	@rm -rf $(SYMROOT)/modules/$(MODULE_NAME).dylib &> /dev/null
 	
 
-$(DIRS_NEEDED) $(INSTALLDIR) $(SRCROOT):
-	@echo "\t[MKDIR] $@/"
-	@$(MKDIRS) $@/
+	
 
 
-
 # dependencies
 #-include $(OBJROOT)/Makedep
+
+include ../../MakeInc.dir
+
Index: trunk/i386/modules/Makefile
===================================================================
--- trunk/i386/modules/Makefile	(revision 799)
+++ trunk/i386/modules/Makefile	(revision 800)
@@ -1,7 +1,7 @@
 #	Makefile for i386 modules
 
 # The order of building is important.
-SUBDIRS = klibc uClibc++ Resolution KernelPatcher KextPatcher
+SUBDIRS = klibc uClibc++ Resolution
 #SUBDIRS = klibc uClibc++ Resolution HelloWorld
 
 
@@ -21,23 +21,22 @@
 #
 # these paths are only valid in subdirectories of this directory
 #
-OBJROOT=../../obj/i386/modules/
-SYMROOT=../../sym/i386/modules/
-DSTROOT=../../dst/i386/modules/
+OBJROOT=`pwd`/../../obj/i386/modules/
+SYMROOT=`pwd`/../../sym/i386/modules/
+DSTROOT=`pwd`/../../dst/i386/modules/
 SRCROOT=/tmp
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-DIRS_NEEDED = $(OBJROOT) $(SYMROOT) module_includes
 
-all embedtheme optionrom tags debug: $(DIRS_NEEDED)
+all embedtheme optionrom tags debug install installhdrs: objroot_dirs
 	@for i in ${SUBDIRS}; \
 	do \
 		echo ================= make $@ for $$i =================; \
 		( cd $$i; $(MKDIRS) $(OBJROOT)/$$i; ${MAKE}					  \
-			"OBJROOT=../$(OBJROOT)/$$i"			  \
-		  	"SYMROOT=../$(SYMROOT)/"				  \
-			"DSTROOT=../$(DSTROOT)/"				  \
+			"OBJROOT=$(OBJROOT)/$$i"			  \
+		  	"SYMROOT=$(SYMROOT)/"				  \
+			"DSTROOT=$(DSTROOT)/"				  \
 			"SRCROOT=$(SRCROOT)"				  \
 			"RC_ARCHS=$(RC_ARCHS)"				  \
 			"RC_KANJI=$(RC_KANJI)"				  \
@@ -46,17 +45,13 @@
 		) || exit $$?; 						  \
 	done
 
-	
-clean:
-	@echo "\t[RM] $(OBJROOT)"
-	@rm -rf ${OBJROOT}
-	@echo "\t[RM] $(SYMROOT)"
-	@rm -rf ${SYMROOT}
-	@echo "\t[RM] module_includes"
-	@rm -rf module_includes &> /dev/null
+objroot_dirs:
+	@rm -rf "$(OBJROOT)" 
+	@mkdir "$(OBJROOT)" &> /dev/null
+	@rm -rf module_includes
+	@mkdir module_includes
+	@rm -rf "$(SYMROOT)/modules/"
+	@mkdir "$(SYMROOT)/modules/"
 
-
-
-include ../MakeInc.dir
-
-
+installsrc:
+	tar cf - . | (cd ${SRCROOT}; tar xfBp -)