Merge branch 'master' into proc-work
[akaros.git] / kern / src / Makefrag
index 87e1654..724d6bf 100644 (file)
@@ -27,6 +27,8 @@ KERN_SRCFILES := $(KERN_ARCH_SRCFILES) \
                  $(KERN_SRC_DIR)/manager.c \
                  $(KERN_SRC_DIR)/syscall.c \
                  $(KERN_SRC_DIR)/timer.c \
+                 $(KERN_SRC_DIR)/kfs.c \
+                 $(KERN_SRC_DIR)/process.c \
                  $(KERN_SRC_DIR)/kmalloc.c \
                  $(KERN_SRC_DIR)/testing.c
 
@@ -34,19 +36,20 @@ KERN_SRCFILES := $(KERN_ARCH_SRCFILES) \
 KERN_SRCFILES := $(wildcard $(KERN_SRCFILES))
 
 KERN_APPFILES := \
-                    $(USER_APPS_ROSLIB_DIR)/proctests \
-                    $(USER_APPS_ROSLIB_DIR)/fptest \
-                    $(USER_APPS_ROSLIB_DIR)/null \
-                    $(USER_APPS_ROSLIB_DIR)/hello
+                 $(USER_APPS_ROSLIB_DIR)/proctests \
+                 $(USER_APPS_ROSLIB_DIR)/fptest \
+                 $(USER_APPS_ROSLIB_DIR)/null \
+                 $(USER_APPS_ROSLIB_DIR)/spawn \
+                 $(USER_APPS_ROSLIB_DIR)/hello
 
 ifeq ($(TARGET_ARCH),i386)
        KERN_APPFILES += \
-                           $(USER_APPS_PARLIB_DIR)/channel_test_client \
-                           $(USER_APPS_PARLIB_DIR)/channel_test_server \
-                           $(USER_APPS_ROSLIB_DIR)/measurements
-       #                    $(USER_APPS_PARLIB_DIR)/draw_nanwan
-       #                    $(USER_APPS_PARLIB_DIR)/open_read \
-       #                    $(USER_APPS_PARLIB_DIR)/hello
+                        $(USER_APPS_PARLIB_DIR)/channel_test_client \
+                        $(USER_APPS_PARLIB_DIR)/channel_test_server \
+                        $(USER_APPS_ROSLIB_DIR)/measurements
+#                       $(USER_APPS_PARLIB_DIR)/draw_nanwan \
+#                       $(USER_APPS_PARLIB_DIR)/open_read \
+#                       $(USER_APPS_PARLIB_DIR)/hello
 endif
 
 KERN_LDFLAGS   := $(KERN_LDFLAGS) -L$(OBJDIR)/$(KERN_DIR) \
@@ -79,7 +82,6 @@ $(OBJDIR)/$(KERN_DIR)/%.o: $(KERN_DIR)/%.S
        $(V)$(CC) $(KERN_CFLAGS) -c -o $@ $<
 
 $(OBJDIR)/$(KERN_DIR)/kernel: $(KERN_LDDEPENDS)
-       echo $(KERN_SRCFILES)
        @echo + ld [KERN] $@
        $(V)$(LD) -o $@ $(KERN_LDFLAGS) $(KERN_OBJFILES) $(KERN_LDLIBS) \
                        $(KERN_GCC_LIB) -b binary $(KERN_APPFILES)