update Makefile to new lkl

Author: luciang

Makefile

@@ -2,78 +2,93 @@ CROSS=i586-mingw32msvc-
 CC=$(CROSS)gcc
 AS=$(CROSS)as
 DLLTOOL=$(CROSS)dlltool
-HERE=$(PWD)
+MKDIR=mkdir -p
 
+HERE=$(PWD)
 LKL_SOURCE=$(HERE)/../linux-2.6
-LKL=lkl/vmlinux
+
 
 SRCS=$(shell find $(1) -type f -name '*.c')
 OBJS=$(patsubst %.c,%.o,$(call SRCS,$(1)))
 DEPS=$(patsubst %.c,.deps/%.d,$(call SRCS,$(1)))
 
-INC=include/asm include/asm-generic include/x86 include/linux include/drivers
-MKDIR=mkdir -p
+
+INC=include/asm include/asm-generic include/x86 include/linux
+CFLAGS=-Iinclude -D_WIN32_WINNT=0x0500 -Wall -Wno-multichar
+
+
+ntk_CROSS=i586-mingw32msvc-
+ntk_LD_FLAGS=-Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -nostartfiles \
+                -lntoskrnl -lhal -nostdlib -shared
+ntk_EXTRA_CFLAGS=-gstabs+ -D_WIN32_WINNT=0x0500
+
 
 all: lklvfs.sys
 
 include/asm:
-	-$(MKDIR) `dirname $@` || true
+	-$(MKDIR) `dirname $@`
 	ln -s $(LKL_SOURCE)/arch/lkl/include/asm include/asm
 
 include/x86:
-	-$(MKDIR) `dirname $@` || true
+	-$(MKDIR) `dirname $@`
 	ln -s $(LKL_SOURCE)/arch/x86 include/x86
 
 include/asm-generic:
-	-$(MKDIR) `dirname $@` || true
+	-$(MKDIR) `dirname $@`
 	ln -s $(LKL_SOURCE)/include/asm-generic include/asm-generic
 
 include/linux:
-	-$(MKDIR) `dirname $@` || true
+	-$(MKDIR) `dirname $@`
 	ln -s $(LKL_SOURCE)/include/linux include/linux
 
-include/drivers:
-	-$(MKDIR) `dirname $@` || true
-	ln -s $(HERE)/drivers/ include/drivers
+%/.config: %.config
+	-$(MKDIR) `dirname $@` && \
+	cp $< $@
 
-lkl/.config: $(LKL_SOURCE)
-	-$(MKDIR) `dirname $@` || true
-	cp $^/arch/lkl/defconfig $@
+%/vmlinux: %/.config
+	cd $(LKL_SOURCE) && \
+	$(MAKE) O=$(HERE)/$* ARCH=lkl \
+	CROSS_COMPILE=$($*_CROSS) \
+	EXTRA_CFLAGS="$($*_EXTRA_CFLAGS) $(CFLAGS)" \
+	vmlinux
 
-lkl/vmlinux: lkl/.config $(call SRCS,drivers) drivers/Makefile Makefile
+%/lkl.a: %/.config
 	cd $(LKL_SOURCE) && \
-	$(MAKE) O=$(HERE)/lkl ARCH=lkl CROSS_COMPILE=i586-mingw32msvc- \
-		LKL_DRIVERS=$(HERE)/drivers/ \
-		vmlinux
+	$(MAKE) O=$(HERE)/$* ARCH=lkl \
+	CROSS_COMPILE=$($*_CROSS) \
+	EXTRA_CFLAGS="$($*_EXTRA_CFLAGS) $(CFLAGS)" \
+	lkl.a
 
-CFLAGS=-Iinclude -D_WIN32_WINNT=0x0500 -Wall -Wno-multichar
 
 lib/%.a: lib/%.def
 	$(DLLTOOL) --as=$(AS) -k --output-lib $@ --def $^
 
-LKLVFS_SRC = $(call OBJS,src) lib/libmingw-patch.a lkl/vmlinux
+LKLVFS_SRC = $(call OBJS,src) lib/libmingw-patch.a ntk/vmlinux ntk/lkl.a
 
 lklvfs.sys: $(INC) $(LKLVFS_SRC)
-	i586-mingw32msvc-gcc -Wall -s \
-	$(LKLVFS_SRC) -Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 \
+	$(CC) -Wall -s \
+	$(LKLVFS_SRC) /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/libgcc.a \
+	-Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 \
 	-nostartfiles -Llib -lmingw-patch -lntoskrnl -lhal -nostdlib \
 	-shared -o $@
 
 clean:
 	rm -rf .deps lklvfs.sys
-	rm -f drivers/*.o drivers/.*.o.cmd drivers/built-in.o
 	rm -f src/*.o
 
 clean-all: clean
-	rm -f  include/asm include/x86 \
-	include/asm-generic include/linux $(call OBJS,src) lib/*.a
-	rm -fr lkl
+	rm -f  include/asm include/x86 include/asm-generic include/linux
+	rm -f  $(call OBJS,src) lib/*.a
+	rm -fr ntk
+
+TAGS: $(call SRCS,src) Makefile include/*.h
+	etags $^
 
-TAGS: $(call SRCS,src) $(call SRCS,drivers) Makefile include/*.h
+TAGS-all: $(call SRCS,src) Makefile include/*.h
 	cd $(LKL_SOURCE) && \
-	$(MAKE) O=$(HERE)/lkl ARCH=lkl CROSS_COMPILE=i586-mingw32msvc- TAGS
+	$(MAKE) O=$(HERE)/ntk ARCH=lkl CROSS_COMPILE=$(CROSS) TAGS
 	etags -f TAGS.tmp $^
-	cat lkl/TAGS TAGS.tmp > TAGS
+	cat ntk/TAGS TAGS.tmp > TAGS
 	rm TAGS.tmp
 
 .deps/%.d: %.c