Usermode/libaxwin4 - Handle demarshal failure

[tpg/acess2.git] / Tools / nativelib / Makefile

diff --git a/Tools/nativelib/Makefile b/Tools/nativelib/Makefile
index 84ac328..8a8fc33 100644 (file)
--- a/Tools/nativelib/Makefile
+++ b/Tools/nativelib/Makefile
@@ -1,15 +1,25 @@
 
 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 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)
-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
+CFLAGS := -Wall -std=c99
 CPPFLAGS := -I include
 
 
@@ -21,14 +31,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 [email protected] -MT $@ -MP $(CFLAGS) $(CPPFLAGS)
+$(LOBJ): obj/%.o: %.c Makefile
+       @echo [CC Local] $@
+       @mkdir -p $(dir $@)
+       @$(CC) -o $@ -c $< -MMD -MF [email protected] -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 [email protected] -MT $@ -MP $(CFLAGS) $(CPPFLAGS) -I $(KERNEL_DIR)/include
 
+-include $(OBJ:%=%.dep)