Changeset 27 for trunk/Makefile.x86

Timestamp:

Jun 19, 2017, 8:13:59 PM (7 years ago)

Author:

max@…

Message:

cosmetic

File:

• trunk/Makefile.x86 (modified) (15 diffs)

trunk/Makefile.x86

@@ -1 +1 @@
 #############################################################################
-#                                               ALMOS-MKH  Makefile for x86_64                      #
+#                       ALMOS-MKH  Makefile for x86_64                      #
 #############################################################################
 
@@ -10 +10 @@
 
 # Export all variables to applications sub-Makefile.
-export 
+export
 CC = gcc
 AS = as
@@ -18 +18 @@
 
 
-# Rules that don't build target files 
+# Rules that don't build target files
 # always out-of-date, need to be regenerated everytime they are called
 .PHONY: compile                         \
@@ -29 +29 @@
                 build/kernel/kernel.elf 
 
-# Objects to be linked for the soclib drivers library 
+# Objects to be linked for the soclib drivers library
 DRIVERS_OBJS = build/kernel/drivers/soclib_tty.o  \
                build/kernel/drivers/soclib_bdv.o  \
@@ -40 +40 @@
                build/kernel/drivers/soclib_iob.o
 
-# Objects to be linked for kernel.elf generation 
+# Objects to be linked for kernel.elf generation
 KERN_OBJS       = build/kernel/kern/kernel_init.o     \
               build/kernel/kern/printk.o          \
@@ -78 +78 @@
               build/kernel/devices/dev_dma.o      \
               build/kernel/devices/dev_fbf.o      \
-              build/kernel/devices/dev_iob.o 
+              build/kernel/devices/dev_iob.o
 
 MM_OBJS     = build/kernel/mm/ppm.o               \
@@ -139 +139 @@
               build/kernel/syscalls/sys_clock.o           \
               build/kernel/syscalls/sys_alarm.o           \
-              build/kernel/syscalls/sys_rmdir.o    
+              build/kernel/syscalls/sys_rmdir.o
 
 SYS_OBJS_3  = build/kernel/syscalls/sys_utls.o            \
@@ -150 +150 @@
               build/kernel/syscalls/sys_exec.o            \
               build/kernel/syscalls/sys_stat.o            \
-              build/kernel/syscalls/sys_trace.o         
+              build/kernel/syscalls/sys_trace.o
 
 SYS_OBJS_4  = build/kernel/syscalls/sys_madvise.o         \
@@ -163 +163 @@
               build/kernel/syscalls/sys_gettimeofday.o
 
-SYS_OBJS_5  = build/kernel/syscalls/sys_times.o 
+SYS_OBJS_5  = build/kernel/syscalls/sys_times.o
 
 
@@ -172 +172 @@
 
 # List of directories to be searched for included files
-# when compiling for kernel.elf generation 
+# when compiling for kernel.elf generation
 KERNEL_INCLUDE = -Ikernel                \
                  -Ikernel/kern           \
@@ -200 +200 @@
 # The Mtools used to build the FAT32 disk image perfom a few sanity checks, to
 # make sure that the disk is indeed an MS-DOS disk. However, the size of the
-# disk image used by ALMOS-VM is not MS-DOS compliant. 
+# disk image used by ALMOS-VM is not MS-DOS compliant.
 # Setting this variable prevents these checks.
 MTOOLS_SKIP_CHECK := 1
@@ -219 +219 @@
         @mkdir -p build/kernel/libk
         @mkdir -p build/kernel/drivers
-        @mkdir -p build/kernel/vfs 
+        @mkdir -p build/kernel/vfs
         @mkdir -p build/kernel/syscalls
         @mkdir -p hdd
@@ -232 +232 @@
 
 ##############################################################
-# Rule to copy the files generated by the virtual prototype 
+# Rule to copy the files generated by the virtual prototype
 # from the virtual disk 'home' directory to the current directory.
 extract:
         mcopy -o -i $(DISK_IMAGE) ::/home .
 
-# Rules to delete all binary files from Unix File System 
+# Rules to delete all binary files from Unix File System
 # without modifying the virtual disk.
 clean:
@@ -267 +267 @@
 
 ##############################
-# rules to compile the drivers 
+# rules to compile the drivers
 build/kernel/drivers/%.o:       kernel/drivers/soclib/%.c   \
                                 kernel/drivers/soclib/%.h   \
@@ -365 +365 @@
                                 $(SYS_OBJS_2)               \
                                 $(SYS_OBJS_3)               \
-                                                                kernel/kernel_x86.ld         
-        $(LD) -o $@ -z max-page-size=0x1000 -T kernel/kernel_x86.ld                     \
+                                                                kernel/kernel_x86.ld
+        $(LD) -o $@ -z max-page-size=0x1000 -T kernel/kernel_x86.ld  \
           $(KERN_OBJS) $(HAL_OBJS) $(DEV_OBJS) $(MM_OBJS)   \
           $(LIBK_OBJS) $(DRIVERS_OBJS) $(VFS_OBJS)          \
           $(SYS_OBJS_0) $(SYS_OBJS_1) $(SYS_OBJS_2)         \
           $(SYS_OBJS_3)
-          
+
 
 #   $(SYS_OBJS_4) $(SYS_OBJS_5)
-          
+
         $(DU) -D $@ > $@.txt
         mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel