X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2Fnativelib%2FMakefile;h=8a8fc3300df42bc687a288a33f0fb6d672e0d0f9;hb=3c283c4831c40c14d308a54cefb997832a860bca;hp=2a6eb6df653a00e136f3e6109653dd59e0f41320;hpb=c3b821ccc009ec819f2580a53c0ed423aad43bf9;p=tpg%2Facess2.git

diff --git a/Tools/nativelib/Makefile b/Tools/nativelib/Makefile
index 2a6eb6df..8a8fc330 100644
--- a/Tools/nativelib/Makefile
+++ b/Tools/nativelib/Makefile
@@ -1,12 +1,25 @@
 
 KERNEL_DIR := ../../KernelLand/Kernel
 
-NOBJ := logging.o misc.o
-KOBJ := threads.o time.o mutex.o
-OBJ := $(NOBJ) $(KOBJ)
+NOBJ := logging.o misc.o threads_int.o
+
+LOBJ := threads.o time.o dummy_iocache.o
+# mutex.o rwlock.o semaphore.o
+
+KOBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/io.o vfs/dir.o
+KOBJ += vfs/nodecache.o vfs/mount.o vfs/memfile.o vfs/select.o
+KOBJ += vfs/fs/root.o vfs/fs/devfs.o
+KOBJ += drv/proc.o
+KOBJ += mutex.o rwlock.o semaphore.o events.o
+KOBJ += utf16.o lib.o
+
+NOBJ := $(NOBJ:%.o=obj/%.o)
+LOBJ := $(LOBJ:%.o=obj/%.o)
+KOBJ := $(KOBJ:%.o=obj/_Kernel/%.o)
+OBJ := $(NOBJ) $(LOBJ) $(KOBJ)
 BIN := ../libnativelib.a
 
-CFLAGS := -Wall -std=c99 -Werror
+CFLAGS := -Wall -std=c99
 CPPFLAGS := -I include
 
 
@@ -18,10 +31,20 @@ clean:
 	$(RM) $(BIN) $(OBJ)
 
 $(BIN): $(OBJ)
-	ar cru $(BIN) $(OBJ)
-
-$(NOBJ): %.o: %.c
-	$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)
-$(KOBJ): %.o: %.c
-	$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS) -I $(KERNEL_DIR)/include
-
+	ar cr $(BIN) $(OBJ)
+
+$(NOBJ): obj/%.o: %.c Makefile
+	@echo [CC Native] $@
+	@mkdir -p $(dir $@)
+	@$(CC) -o $@ -c $< -MMD -MF $@.dep -MT $@ -MP $(CFLAGS) $(CPPFLAGS)
+$(LOBJ): obj/%.o: %.c Makefile
+	@echo [CC Local] $@
+	@mkdir -p $(dir $@)
+	@$(CC) -o $@ -c $< -MMD -MF $@.dep -MT $@ -MP $(CFLAGS) $(CPPFLAGS) -I $(KERNEL_DIR)/include
+
+$(KOBJ): obj/_Kernel/%.o: $(KERNEL_DIR)/%.c Makefile
+	@echo [CC Kernel] $@
+	@mkdir -p $(dir $@)
+	@$(CC) -o $@ -c $< -MMD -MF $@.dep -MT $@ -MP $(CFLAGS) $(CPPFLAGS) -I $(KERNEL_DIR)/include
+
+-include $(OBJ:%=%.dep)