X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2FMakefile;fp=AcessNative%2Facesskernel_src%2FMakefile;h=00ba77578db14e9182832662b2ffcb0520abe68a;hb=c3cbbd71507f45fae706cb1396327a9f7abc02f9;hp=f831a431f5979b743b7583e4ca21feec6dd48cb4;hpb=02f33541cab4bb1010c3388de7aaa49751e553a3;p=tpg%2Facess2.git diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile index f831a431..00ba7757 100644 --- a/AcessNative/acesskernel_src/Makefile +++ b/AcessNative/acesskernel_src/Makefile @@ -14,6 +14,7 @@ endif KERNEL_SRC = ../../KernelLand/Kernel/ LDACESS_SRC = ../../Usermode/Libraries/ld-acess.so_src/ +# - Kernel objects (from KernelLand/Kernel) KERNEL_OBJ := logging.o adt.o lib.o debug.o messages.o drvutil_disk.o drvutil_video.o KERNEL_OBJ += mutex.o semaphore.o rwlock.o workqueue.o events.o #KERNEL_OBJ += libc.o @@ -24,16 +25,16 @@ KERNEL_OBJ += drv/fifo.o drv/proc.o drv/dgram_pipe.o KERNEL_OBJ += drv/vterm.o drv/vterm_font.o drv/vterm_output.o drv/vterm_input.o drv/vterm_termbuf.o KERNEL_OBJ += drv/vterm_vt100.o drv/vterm_2d.o KERNEL_OBJ += drv/pty.o - -N_OBJ := main.o +# - Native (unsullied) objects +N_OBJ := main.o net_wrap.o +# - Local objects (use the kernel includes) +OBJ := helpers.o threads.o threads_glue.o server.o syscalls.o time.o +OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o +OBJ += net.o BUILDINFO_OBJ := obj-$(PLATFORM)/buildinfo.o BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c) -OBJ := helpers.o threads.o threads_glue.o server.o syscalls.o time.o -OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o -OBJ += net.o net_wrap.o - OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ)) N_OBJ := $(addprefix obj-$(PLATFORM)/,$(N_OBJ)) K_OBJ := $(addprefix $(KERNEL_SRC)obj-native-$(PLATFORM)/,$(KERNEL_OBJ))