Merge branch 'master' into proc-work
[akaros.git] / kern / src / Makefrag
index 5c7cfa0..724d6bf 100644 (file)
@@ -36,17 +36,21 @@ 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)/spawn \
-                    $(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_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
+endif
 
 KERN_LDFLAGS   := $(KERN_LDFLAGS) -L$(OBJDIR)/$(KERN_DIR) \
                   -T $(ARCH_DIR)/$(TARGET_ARCH)/kernel.ld