git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/libunicode - Add C++ wrappers
[tpg/acess2.git]
/
Tools
/
nativelib
/
Makefile
diff --git
a/Tools/nativelib/Makefile
b/Tools/nativelib/Makefile
index
e8e7f55
..
8a8fc33
100644
(file)
--- a/
Tools/nativelib/Makefile
+++ b/
Tools/nativelib/Makefile
@@
-3,12
+3,15
@@
KERNEL_DIR := ../../KernelLand/Kernel
NOBJ := logging.o misc.o threads_int.o
NOBJ := logging.o misc.o threads_int.o
-LOBJ := threads.o time.o mutex.o rwlock.o semaphore.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/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/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 += 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)
NOBJ := $(NOBJ:%.o=obj/%.o)
LOBJ := $(LOBJ:%.o=obj/%.o)
@@
-16,7
+19,7
@@
KOBJ := $(KOBJ:%.o=obj/_Kernel/%.o)
OBJ := $(NOBJ) $(LOBJ) $(KOBJ)
BIN := ../libnativelib.a
OBJ := $(NOBJ) $(LOBJ) $(KOBJ)
BIN := ../libnativelib.a
-CFLAGS := -Wall -std=c99
-Werror
+CFLAGS := -Wall -std=c99
CPPFLAGS := -I include
CPPFLAGS := -I include
@@
-28,18
+31,20
@@
clean:
$(RM) $(BIN) $(OBJ)
$(BIN): $(OBJ)
$(RM) $(BIN) $(OBJ)
$(BIN): $(OBJ)
- ar cr
u
$(BIN) $(OBJ)
+ ar cr $(BIN) $(OBJ)
-$(NOBJ): obj/%.o: %.c
+$(NOBJ): obj/%.o: %.c
Makefile
@echo [CC Native] $@
@mkdir -p $(dir $@)
@echo [CC Native] $@
@mkdir -p $(dir $@)
- @$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)
-$(LOBJ): 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 $@)
@echo [CC Local] $@
@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
-$(KOBJ): obj/_Kernel/%.o: $(KERNEL_DIR)/%.c
+$(KOBJ): obj/_Kernel/%.o: $(KERNEL_DIR)/%.c
Makefile
@echo [CC Kernel] $@
@mkdir -p $(dir $@)
@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)
UCC
git Repository :: git.ucc.asn.au