mirror of
https://review.haiku-os.org/haiku
synced 2024-11-23 07:18:40 +01:00
Adjusted the SubDir and SubInclude parameters.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@15 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
8b3bd88c41
commit
54f76689cb
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel ;
|
||||
SubDir OBOS_TOP src kernel ;
|
||||
|
||||
KernelStaticLibraryObjects libkern.a :
|
||||
<$(SOURCE_GRIST)!libc!locale>ctype.o
|
||||
@ -855,13 +855,13 @@ BuildKernel $(OBOS_KERNEL) : $(OBOS_KERNEL_CONFIG) ;
|
||||
|
||||
KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(SUBDIR)/boot/arch/$(OBOS_ARCH)/bootblock.bin ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel boot ;
|
||||
SubInclude OBOS_TOP sources os kits kernel core ;
|
||||
SubInclude OBOS_TOP sources os kits kernel drivers ;
|
||||
SubInclude OBOS_TOP sources os kits kernel global ;
|
||||
SubInclude OBOS_TOP sources os kits kernel glue ;
|
||||
SubInclude OBOS_TOP sources os kits kernel libc ;
|
||||
SubInclude OBOS_TOP sources os kits kernel libm ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps ;
|
||||
SubInclude OBOS_TOP sources os kits kernel add-ons ;
|
||||
SubInclude OBOS_TOP sources os kits kernel libroot ;
|
||||
SubInclude OBOS_TOP src kernel boot ;
|
||||
SubInclude OBOS_TOP src kernel core ;
|
||||
SubInclude OBOS_TOP src kernel drivers ;
|
||||
SubInclude OBOS_TOP src kernel global ;
|
||||
SubInclude OBOS_TOP src kernel glue ;
|
||||
SubInclude OBOS_TOP src kernel libc ;
|
||||
SubInclude OBOS_TOP src kernel libm ;
|
||||
SubInclude OBOS_TOP src kernel apps ;
|
||||
SubInclude OBOS_TOP src kernel add-ons ;
|
||||
SubInclude OBOS_TOP src kernel libroot ;
|
||||
|
@ -1,19 +1,19 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps ;
|
||||
SubDir OBOS_TOP src kernel apps ;
|
||||
|
||||
KernelObjects false_main.c fibo_main.c init.c true_main.c ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel apps uname ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps echo ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps filetest ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps fortune ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps hostname ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps ls ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps mount ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps ps ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps rld ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps shell ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps sockettest ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps testapp ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps testdigit ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps tests ;
|
||||
SubInclude OBOS_TOP sources os kits kernel apps unmount ;
|
||||
SubInclude OBOS_TOP src kernel apps uname ;
|
||||
SubInclude OBOS_TOP src kernel apps echo ;
|
||||
SubInclude OBOS_TOP src kernel apps filetest ;
|
||||
SubInclude OBOS_TOP src kernel apps fortune ;
|
||||
SubInclude OBOS_TOP src kernel apps hostname ;
|
||||
SubInclude OBOS_TOP src kernel apps ls ;
|
||||
SubInclude OBOS_TOP src kernel apps mount ;
|
||||
SubInclude OBOS_TOP src kernel apps ps ;
|
||||
SubInclude OBOS_TOP src kernel apps rld ;
|
||||
SubInclude OBOS_TOP src kernel apps shell ;
|
||||
SubInclude OBOS_TOP src kernel apps sockettest ;
|
||||
SubInclude OBOS_TOP src kernel apps testapp ;
|
||||
SubInclude OBOS_TOP src kernel apps testdigit ;
|
||||
SubInclude OBOS_TOP src kernel apps tests ;
|
||||
SubInclude OBOS_TOP src kernel apps unmount ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps echo ;
|
||||
SubDir OBOS_TOP src kernel apps echo ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps filetest ;
|
||||
SubDir OBOS_TOP src kernel apps filetest ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps fortune ;
|
||||
SubDir OBOS_TOP src kernel apps fortune ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps hostname ;
|
||||
SubDir OBOS_TOP src kernel apps hostname ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps ls ;
|
||||
SubDir OBOS_TOP src kernel apps ls ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps mount ;
|
||||
SubDir OBOS_TOP src kernel apps mount ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps ps ;
|
||||
SubDir OBOS_TOP src kernel apps ps ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c ;
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps rld ;
|
||||
SubDir OBOS_TOP src kernel apps rld ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>rld.c
|
||||
<$(SOURCE_GRIST)>rld0.c
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps shell ;
|
||||
SubDir OBOS_TOP src kernel apps shell ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c
|
||||
<$(SOURCE_GRIST)>args.c
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps sockettest ;
|
||||
SubDir OBOS_TOP src kernel apps sockettest ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps testapp ;
|
||||
SubDir OBOS_TOP src kernel apps testapp ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps testdigit ;
|
||||
SubDir OBOS_TOP src kernel apps testdigit ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps tests ;
|
||||
SubDir OBOS_TOP src kernel apps tests ;
|
||||
|
||||
KernelObjects
|
||||
<$(SOURCE_GRIST)>thread_test.c
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps uname ;
|
||||
SubDir OBOS_TOP src kernel apps uname ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic -Wno-unused ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel apps unmount ;
|
||||
SubDir OBOS_TOP src kernel apps unmount ;
|
||||
|
||||
KernelObjects <$(SOURCE_GRIST)>main.c : -fpic ;
|
||||
|
@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot ;
|
||||
SubDir OBOS_TOP src kernel boot ;
|
||||
|
||||
SystemMain bootmaker : bootmaker.c : $(OBOS_KERNEL) ;
|
||||
SystemMain bin2h : bin2h.c ;
|
||||
SystemMain bin2asm : bin2asm.c ;
|
||||
SystemMain makeflop : makeflop.c : $(OBOS_FLOPPY) ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch ;
|
||||
SubInclude OBOS_TOP src kernel boot arch ;
|
||||
|
@ -1,10 +1,10 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch ;
|
||||
SubDir OBOS_TOP src kernel boot arch ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch alpha ;
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch x86 ;
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch m68k ;
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch mips ;
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch ppc ;
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch sh4 ;
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch sparc ;
|
||||
SubInclude OBOS_TOP sources os kits kernel boot arch sparc64 ;
|
||||
SubInclude OBOS_TOP src kernel boot arch alpha ;
|
||||
SubInclude OBOS_TOP src kernel boot arch x86 ;
|
||||
SubInclude OBOS_TOP src kernel boot arch m68k ;
|
||||
SubInclude OBOS_TOP src kernel boot arch mips ;
|
||||
SubInclude OBOS_TOP src kernel boot arch ppc ;
|
||||
SubInclude OBOS_TOP src kernel boot arch sh4 ;
|
||||
SubInclude OBOS_TOP src kernel boot arch sparc ;
|
||||
SubInclude OBOS_TOP src kernel boot arch sparc64 ;
|
||||
|
@ -1,2 +1,2 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch alpha ;
|
||||
SubDir OBOS_TOP src kernel boot arch alpha ;
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch m68k ;
|
||||
SubDir OBOS_TOP src kernel boot arch m68k ;
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch mips ;
|
||||
SubDir OBOS_TOP src kernel boot arch mips ;
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch ppc ;
|
||||
SubDir OBOS_TOP src kernel boot arch ppc ;
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch sh4 ;
|
||||
SubDir OBOS_TOP src kernel boot arch sh4 ;
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch sparc ;
|
||||
SubDir OBOS_TOP src kernel boot arch sparc ;
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch sparc64 ;
|
||||
SubDir OBOS_TOP src kernel boot arch sparc64 ;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel boot arch x86 ;
|
||||
SubDir OBOS_TOP src kernel boot arch x86 ;
|
||||
|
||||
KernelObjects
|
||||
<$(SOURCE_GRIST)>stage2.c
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core ;
|
||||
SubDir OBOS_TOP src kernel core ;
|
||||
|
||||
KernelObjects
|
||||
<$(SOURCE_GRIST)>cbuf.c
|
||||
@ -36,8 +36,8 @@ KernelLd linkhack.so :
|
||||
-shared -Bdynamic
|
||||
;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel core addons ;
|
||||
SubInclude OBOS_TOP sources os kits kernel core arch ;
|
||||
SubInclude OBOS_TOP sources os kits kernel core fs ;
|
||||
SubInclude OBOS_TOP sources os kits kernel core vm ;
|
||||
SubInclude OBOS_TOP sources os kits kernel core net ;
|
||||
SubInclude OBOS_TOP src kernel core addons ;
|
||||
SubInclude OBOS_TOP src kernel core arch ;
|
||||
SubInclude OBOS_TOP src kernel core fs ;
|
||||
SubInclude OBOS_TOP src kernel core vm ;
|
||||
SubInclude OBOS_TOP src kernel core net ;
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core addons ;
|
||||
SubDir OBOS_TOP src kernel core addons ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel core addons bus_managers ;
|
||||
SubInclude OBOS_TOP sources os kits kernel core addons fs ;
|
||||
SubInclude OBOS_TOP src kernel core addons bus_managers ;
|
||||
SubInclude OBOS_TOP src kernel core addons fs ;
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core addons bus_managers ;
|
||||
SubDir OBOS_TOP src kernel core addons bus_managers ;
|
||||
|
||||
KernelStaticLibrary libbus :
|
||||
<$(SOURCE_GRIST)>bus_init.c
|
||||
@ -10,4 +10,4 @@ KernelStaticLibrary libbus :
|
||||
-fno-pic
|
||||
;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel core addons bus_managers isa ;
|
||||
SubInclude OBOS_TOP src kernel core addons bus_managers isa ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core addons bus_managers isa ;
|
||||
SubDir OBOS_TOP src kernel core addons bus_managers isa ;
|
||||
|
||||
KernelObjects isa.c : -fno-pic ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core addons bus_managers pci ;
|
||||
SubDir OBOS_TOP src kernel core addons bus_managers pci ;
|
||||
|
||||
KernelStaticLibrary libbuspci : pci.c pci_bus.c ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core arch ;
|
||||
SubDir OBOS_TOP src kernel core arch ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel core arch $(OBOS_TARGET_DIR) ;
|
||||
SubInclude OBOS_TOP src kernel core arch $(OBOS_TARGET_DIR) ;
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core arch x86 ;
|
||||
SubDir OBOS_TOP src kernel core arch x86 ;
|
||||
|
||||
KernelStaticLibrary libx86 :
|
||||
<$(SOURCE_GRIST)>arch_cpu.c
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core fs ;
|
||||
SubDir OBOS_TOP src kernel core fs ;
|
||||
|
||||
KernelStaticLibrary libfs :
|
||||
<$(SOURCE_GRIST)>bootfs.c
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel core vm ;
|
||||
SubDir OBOS_TOP src kernel core vm ;
|
||||
|
||||
KernelStaticLibrary libvm :
|
||||
<$(SOURCE_GRIST)>vm.c
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers ;
|
||||
SubDir OBOS_TOP src kernel drivers ;
|
||||
|
||||
KernelStaticLibrary libdrivers :
|
||||
<$(SOURCE_GRIST)>dev.c
|
||||
@ -14,5 +14,5 @@ KernelStaticLibrary libdrivers :
|
||||
-fno-pic -Wno-unused
|
||||
;
|
||||
|
||||
#SubInclude OBOS_TOP sources os kits kernel drivers arch ;
|
||||
SubInclude OBOS_TOP sources os kits kernel drivers common ;
|
||||
#SubInclude OBOS_TOP src kernel drivers arch ;
|
||||
SubInclude OBOS_TOP src kernel drivers common ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers arch ;
|
||||
SubDir OBOS_TOP src kernel drivers arch ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel drivers arch $(OBOS_ARCH) ;
|
||||
SubInclude OBOS_TOP src kernel drivers arch $(OBOS_ARCH) ;
|
||||
|
@ -1,5 +1,5 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers arch x86 ;
|
||||
SubDir OBOS_TOP src kernel drivers arch x86 ;
|
||||
|
||||
SubInclude OBOS_TOP sources os kits kernel drivers arch x86 console ;
|
||||
SubInclude OBOS_TOP sources os kits kernel drivers arch x86 keyboard ;
|
||||
SubInclude OBOS_TOP sources os kits kernel drivers arch x86 ps2mouse ;
|
||||
SubInclude OBOS_TOP src kernel drivers arch x86 console ;
|
||||
SubInclude OBOS_TOP src kernel drivers arch x86 keyboard ;
|
||||
SubInclude OBOS_TOP src kernel drivers arch x86 ps2mouse ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers arch i386 console ;
|
||||
SubDir OBOS_TOP src kernel drivers arch x86 console ;
|
||||
|
||||
KernelObjects console.c : -fnopic ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers arch x86 ide ;
|
||||
SubDir OBOS_TOP src kernel drivers arch x86 ide ;
|
||||
|
||||
KernelStaticLibrary libide : ide.c ide_raw.c ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers arch x86 keyboard ;
|
||||
SubDir OBOS_TOP src kernel drivers arch x86 keyboard ;
|
||||
|
||||
KernelObjects keyboard.c : -fno-pic ;
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers arch x86 ps2mouse ;
|
||||
SubDir OBOS_TOP src kernel drivers arch x86 ps2mouse ;
|
||||
|
||||
KernelObjects ps2mouse.c : -D_PS2MOUSE_ ;
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel drivers fb_console ;
|
||||
SubDir OBOS_TOP src kernel drivers fb_console ;
|
||||
|
||||
KernelStaticLibrary fb_console : fb_console.c ;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP sources os kits kernel glue ;
|
||||
SubDir OBOS_TOP src kernel glue ;
|
||||
|
||||
KernelObjects lib0.c crt0.c ;
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
SubDir OBOS_TOP sources os kits kernel libroot ;
|
||||
SubDir OBOS_TOP src kernel libroot ;
|
||||
|
||||
KernelObjects libroot.c : -fPIC -DPIC ;
|
||||
|
Loading…
Reference in New Issue
Block a user