SimpleOS

LXR

Navigation



Site hébergé par : enix

The LXR Cross Referencer for SOS

source navigation ]
diff markup ]
identifier search ]
general search ]
 
 
Article:1 ] [ 2 ] [ 3 ] [ 4 ] [ 5 ] [ 6 ] [ 6.5 ] [ 7 ] [ 7.5 ] [ 8 ] [ 9 ] [ 9.5 ]

Diff markup

Differences between /Makefile (Article 9.5) and /Makefile (Article 8)


001 ## Copyright (C) 2004,2005  The SOS Team          001 ## Copyright (C) 2004,2005  The SOS Team
002 ##                                                002 ##
003 ## This program is free software; you can redi    003 ## This program is free software; you can redistribute it and/or
004 ## modify it under the terms of the GNU Genera    004 ## modify it under the terms of the GNU General Public License
005 ## as published by the Free Software Foundatio    005 ## as published by the Free Software Foundation; either version 2
006 ## of the License, or (at your option) any lat    006 ## of the License, or (at your option) any later version.
007 ##                                                007 ## 
008 ## This program is distributed in the hope tha    008 ## This program is distributed in the hope that it will be useful,
009 ## but WITHOUT ANY WARRANTY; without even the     009 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
010 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR    010 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
011 ## GNU General Public License for more details    011 ## GNU General Public License for more details.
012 ##                                                012 ## 
013 ## You should have received a copy of the GNU     013 ## You should have received a copy of the GNU General Public License
014 ## along with this program; if not, write to t    014 ## along with this program; if not, write to the Free Software
015 ## Foundation, Inc., 59 Temple Place - Suite 3    015 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
016 ## USA.                                           016 ## USA. 
017                                                   017 
018 CC=gcc                                            018 CC=gcc
019 LD=ld                                             019 LD=ld
020 CP=cp                                             020 CP=cp
021 STRIP=strip                                       021 STRIP=strip
022 CFLAGS  = -Wall -nostdinc -ffreestanding -DKER !! 022 CFLAGS  = -Wall -nostdinc -ffreestanding -DKERNEL_SOS -O
023 LIBGCC  = $(shell $(CC) -print-libgcc-file-nam    023 LIBGCC  = $(shell $(CC) -print-libgcc-file-name) # To benefit from FP/64bits artihm.
024 LDFLAGS = --warn-common -nostdlib                 024 LDFLAGS = --warn-common -nostdlib
025 OBJECTS = bootstrap/multiboot.o                !! 025 OBJECTS = bootstrap/multiboot.o                                 \
026           hwcore/idt.o hwcore/gdt.o            !! 026           hwcore/idt.o hwcore/gdt.o                             \
027           hwcore/swintr.o hwcore/swintr_wrappe !! 027           hwcore/swintr.o hwcore/swintr_wrappers.o              \
028           hwcore/exception.o hwcore/exception_ !! 028           hwcore/exception.o hwcore/exception_wrappers.o        \
029           hwcore/irq.o hwcore/irq_wrappers.o h !! 029           hwcore/irq.o hwcore/irq_wrappers.o hwcore/i8259.o     \
030           hwcore/paging.o hwcore/i8254.o       !! 030           hwcore/paging.o hwcore/i8254.o                        \
031           hwcore/cpu_context.o hwcore/cpu_cont !! 031           hwcore/cpu_context.o hwcore/cpu_context_switch.o      \
032           hwcore/mm_context.o                  !! 032           hwcore/mm_context.o                                   \
033           sos/kmem_vmm.o sos/kmem_slab.o sos/k !! 033           sos/kmem_vmm.o sos/kmem_slab.o sos/kmalloc.o          \
034           sos/physmem.o sos/klibc.o            !! 034           sos/physmem.o sos/klibc.o                             \
035           sos/thread.o sos/kwaitq.o            !! 035           sos/thread.o sos/kwaitq.o                             \
036           sos/time.o sos/sched.o sos/ksynch.o  !! 036           sos/time.o sos/sched.o sos/ksynch.o                   \
037           sos/process.o sos/syscall.o          !! 037           sos/process.o sos/syscall.o                           \
038           sos/assert.o sos/main.o sos/mouse_si !! 038           sos/assert.o sos/main.o sos/mouse_sim.o               \
039           sos/uaccess.o sos/calcload.o         !! 039           sos/uaccess.o sos/calcload.o                          \
040           sos/umem_vmm.o sos/binfmt_elf32.o    !! 040           sos/umem_vmm.o sos/binfmt_elf32.o                     \
041           drivers/x86_videomem.o drivers/bochs !! 041           drivers/x86_videomem.o drivers/bochs.o                \
042           drivers/zero.o drivers/mem.o         !! 042           drivers/zero.o drivers/mem.o                          \
043           drivers/ide.o drivers/kbd.o drivers/ !! 043           sos/hash.o sos/fs.o sos/fs_nscache.o                  \
044           drivers/serial.o drivers/tty.o drive !! 044           drivers/fs_virtfs.o                                   \
045           drivers/console.o                    << 
046           sos/hash.o sos/fs.o sos/fs_nscache.o << 
047           drivers/fs_virtfs.o sos/chardev.o so << 
048           sos/blkcache.o sos/fs_pagecache.o    << 
049           userland/userprogs.kimg                 045           userland/userprogs.kimg
050                                                   046 
051 KERNEL_OBJ   = sos.elf                            047 KERNEL_OBJ   = sos.elf
052 KERNEL_LOAD  = sos.gz                             048 KERNEL_LOAD  = sos.gz
053 MULTIBOOT_IMAGE = fd.img                          049 MULTIBOOT_IMAGE = fd.img
054 PWD := $(shell pwd | sed 's/"/\\\"/g;s/\$$/\\\ !! 050 PWD := $(shell pwd)
055                                                   051 
056 # Main target                                     052 # Main target
057 all: $(MULTIBOOT_IMAGE)                           053 all: $(MULTIBOOT_IMAGE)
058                                                   054 
059 $(MULTIBOOT_IMAGE): $(KERNEL_LOAD)                055 $(MULTIBOOT_IMAGE): $(KERNEL_LOAD)
060         ./support/build_image.sh $@ $<            056         ./support/build_image.sh $@ $<
061                                                   057 
062 $(KERNEL_LOAD): $(KERNEL_OBJ)                     058 $(KERNEL_LOAD): $(KERNEL_OBJ)
063         $(CP) $< $<.strip && $(STRIP) -sx -R . !! 059         $(CP) $< $<.strip && $(STRIP) -sx $<.strip
064         gzip < $<.strip > $@                      060         gzip < $<.strip > $@
065                                                   061 
066 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds       062 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds
067         $(LD) $(LDFLAGS) -T ./support/sos.lds     063         $(LD) $(LDFLAGS) -T ./support/sos.lds -o $@ $(OBJECTS) $(LIBGCC)
068         -nm -C $@ | cut -d ' ' -f 1,3 > sos.ma    064         -nm -C $@ | cut -d ' ' -f 1,3 > sos.map
069         size $@                                   065         size $@
070                                                   066 
071 -include .mkvars                                  067 -include .mkvars
072                                                   068 
073 # Create the userland programs to include in t    069 # Create the userland programs to include in the kernel image
074 userland/userprogs.kimg: FORCE                    070 userland/userprogs.kimg: FORCE
075         $(MAKE) -C userland                       071         $(MAKE) -C userland
076                                                   072 
077 # Create objects from C source code               073 # Create objects from C source code
078 %.o: %.c                                          074 %.o: %.c
079         $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -o  !! 075         $(CC) -I$(PWD) -c $< $(CFLAGS) -o $@
080                                                   076 
081 # Create objects from assembler (.S) source co    077 # Create objects from assembler (.S) source code
082 %.o: %.S                                          078 %.o: %.S
083         $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -DA !! 079         $(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_SOURCE=1 -o $@
084                                                   080 
085 FORCE:                                            081 FORCE:
086         @                                         082         @
087                                                   083 
088 # Clean directory                                 084 # Clean directory
089 clean:                                            085 clean:
090         $(RM) fd*.img *.o mtoolsrc *~ menu.txt !! 086         $(RM) *.img *.o mtoolsrc *~ menu.txt *.img *.elf *.bin *.strip *.map
091         $(RM) *.log *.out bochs* sos.gz           087         $(RM) *.log *.out bochs* sos.gz
092         $(RM) bootstrap/*.o bootstrap/*~          088         $(RM) bootstrap/*.o bootstrap/*~
093         $(RM) drivers/*.o drivers/*~              089         $(RM) drivers/*.o drivers/*~
094         $(RM) hwcore/*.o hwcore/*~                090         $(RM) hwcore/*.o hwcore/*~
095         $(RM) sos/*.o sos/*~                      091         $(RM) sos/*.o sos/*~
096         $(RM) support/*~                          092         $(RM) support/*~
097         $(RM) extra/*~                            093         $(RM) extra/*~
098         $(MAKE) -C extra clean                 << 
099         $(MAKE) -C userland clean                 094         $(MAKE) -C userland clean
                                                      

source navigation ] diff markup ] identifier search ] general search ]