X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2Fnativelib%2FMakefile;h=6b1957ed3685a2f536efbc1ecdd6004633dad0ad;hb=083c31409b9f25c96807ab8fef8ac79e8fe4cf9e;hp=84ac32890473434c9edac955c5cc89c54ef04925;hpb=d4b0e2edda3080715434db09cf2e25ea52d4340f;p=tpg%2Facess2.git

diff --git a/Tools/nativelib/Makefile b/Tools/nativelib/Makefile
index 84ac3289..6b1957ed 100644
--- a/Tools/nativelib/Makefile
+++ b/Tools/nativelib/Makefile
@@ -1,12 +1,21 @@
 
 KERNEL_DIR := ../../KernelLand/Kernel
 
-NOBJ := logging.o misc.o
-KOBJ := threads.o time.o mutex.o
+NOBJ := logging.o misc.o threads_int.o
+
+LOBJ := threads.o time.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
 
 NOBJ := $(NOBJ:%.o=obj/%.o)
-KOBJ := $(KOBJ:%.o=obj/%.o)
-OBJ := $(NOBJ) $(KOBJ)
+LOBJ := $(LOBJ:%.o=obj/%.o)
+KOBJ := $(KOBJ:%.o=obj/_Kernel/%.o)
+OBJ := $(NOBJ) $(LOBJ) $(KOBJ)
 BIN := ../libnativelib.a
 
 CFLAGS := -Wall -std=c99 -Werror
@@ -21,14 +30,20 @@ clean:
 	$(RM) $(BIN) $(OBJ)
 
 $(BIN): $(OBJ)
-	ar cru $(BIN) $(OBJ)
+	ar cr $(BIN) $(OBJ)
 
-$(NOBJ): obj/%.o: %.c
+$(NOBJ): obj/%.o: %.c Makefile
 	@echo [CC Native] $@
 	@mkdir -p $(dir $@)
-	@$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)
-$(KOBJ): obj/%.o: %.c
+	@$(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 $< $(CFLAGS) $(CPPFLAGS) -I $(KERNEL_DIR)/include
+	@$(CC) -o $@ -c $< -MMD -MF $@.dep -MT $@ -MP $(CFLAGS) $(CPPFLAGS) -I $(KERNEL_DIR)/include
 
+-include $(OBJ:%=%.dep)