Index: trunk/i386/modules/MakeInc.dir =================================================================== --- trunk/i386/modules/MakeInc.dir (revision 779) +++ trunk/i386/modules/MakeInc.dir (revision 780) @@ -1,11 +1,7 @@ -include ../../MakePaths.dir -include ../../MakeInc.dir +OBJROOT = ../../../obj/i386/modules/$(DIR) +SYMROOT = ../../../sym/i386/ +DSTROOT = ../../../dst/i386/ -OBJROOT=../../../obj/i386/$(DIR) -SYMROOT=../../../sym/i386/ -DSTROOT=../../../dst/i386/ - - UTILDIR = ../../util LIBSADIR = ../../libsa LIBSAIODIR = ../../libsaio @@ -16,7 +12,7 @@ INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone -dylib: ${MODULE_OBJS} 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 @@ -48,8 +44,18 @@ @echo "\t[CPP] $<" @$(CPP) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@" +clean: + @echo "\t[RM] $(OBJROOT)" + @rm -rf ${OBJROOT} + @echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib" + @rm -rf $(SYMROOT)/modules/$(MODULE_NAME).dylib &> /dev/null + + # dependencies #-include $(OBJROOT)/Makedep + +include ../../MakeInc.dir + Index: trunk/i386/modules/HelloWorld/Makefile =================================================================== --- trunk/i386/modules/HelloWorld/Makefile (revision 779) +++ trunk/i386/modules/HelloWorld/Makefile (revision 780) @@ -3,7 +3,7 @@ MODULE_COMPAT_VERSION = "1.0.0" #MODULE_START = _$(MODULE_NAME)_start MODULE_START = __Z16HelloWorld_startv -MODULE_DEPENDENCIES = +MODULE_DEPENDENCIES = uClibc++ DIR = HelloWorld Index: trunk/i386/modules/Makefile =================================================================== --- trunk/i386/modules/Makefile (revision 779) +++ trunk/i386/modules/Makefile (revision 780) @@ -21,9 +21,9 @@ # # these paths are only valid in subdirectories of this directory # -OBJROOT=`pwd`/../../obj/i386/ -SYMROOT=`pwd`/../../sym/i386/ -DSTROOT=`pwd`/../../dst/i386/ +OBJROOT=`pwd`/../../obj/i386/modules/ +SYMROOT=`pwd`/../../sym/i386/modules/ +DSTROOT=`pwd`/../../dst/i386/modules/ SRCROOT=/tmp VPATH = $(OBJROOT):$(SYMROOT) @@ -35,8 +35,8 @@ echo ================= make $@ for $$i =================; \ ( cd $$i; $(MKDIRS) $(OBJROOT)/$$i; ${MAKE} \ "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)" \ - "DSTROOT=$(DSTROOT)" \ + "SYMROOT=$(SYMROOT)/" \ + "DSTROOT=$(DSTROOT)/" \ "SRCROOT=$(SRCROOT)" \ "RC_ARCHS=$(RC_ARCHS)" \ "RC_KANJI=$(RC_KANJI)" \