i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops.. accidentally overwrote changes by Marcus -- they're back in now

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1693 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Daniel Reinhold
2002-10-26 20:23:12 +00:00
parent be36cedec2
commit 28d2a30e96
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+20 -20
View File
@@ -146,23 +146,21 @@ OBOS_FLOPPY = floppy.$(OBOS_ARCH) ;
rule SetupIncludes rule SetupIncludes
{ {
# XXX add "mail" and "opengl" later # XXX add "mail" and "opengl" later
OS_INCLUDES ?= . add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media midi midi2 net storage support translation ; local os_includes = add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media midi midi2 net storage support translation ;
# include the local directory # Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times.
UseHeaders . ;
# Use headers directory, to allow to do things like include <posix/string.h> # Use headers directory, to allow to do things like include <posix/string.h>
SubDirHdrs [ FDirName $(OBOS_TOP) headers ] ; HDRS = [ FDirName $(OBOS_TOP) headers ] ;
# Use posix headers directory # Use posix headers directory
SubDirHdrs [ FDirName $(OBOS_TOP) headers posix ] ; HDRS += [ FDirName $(OBOS_TOP) headers posix ] ;
# Use public OS header directories # Use public OS header directories
UseHeaders [ PublicHeaders $(OS_INCLUDES) ] ; HDRS += [ PublicHeaders $(os_includes) ] ;
# Used as a fallback, the R5 header directories (we should remove this as soon as possible) # Used as a fallback, the R5 header directories (we should remove this as soon as possible)
UseHeaders /boot/develop/headers/posix ; HDRS += /boot/develop/headers/posix /boot/develop/headers/cpp ;
UseHeaders /boot/develop/headers/cpp ;
} }
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@@ -295,6 +293,8 @@ rule TestLib
local headerDirs = $(5) ; local headerDirs = $(5) ;
local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : $(headerDirs) ; TestObjects $(sources) : $(headerDirs) ;
@@ -322,6 +322,8 @@ rule R5TestLib
local libraries = $(4) ; local libraries = $(4) ;
local objects = [ R5ObjectNames $(sources) ] ; local objects = [ R5ObjectNames $(sources) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : : true ; TestObjects $(sources) : : true ;
@@ -370,6 +372,8 @@ rule UnitTest
local headerDirs = $(5) ; local headerDirs = $(5) ;
local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : $(headerDirs) ; TestObjects $(sources) : $(headerDirs) ;
@@ -396,6 +400,8 @@ rule R5UnitTest
local libraries = $(4) ; local libraries = $(4) ;
local objects = [ R5ObjectNames $(sources) ] ; local objects = [ R5ObjectNames $(sources) ] ;
SetupIncludes ;
# Our Main replacement. # Our Main replacement.
MainFromObjects $(target) : $(objects) ; MainFromObjects $(target) : $(objects) ;
TestObjects $(sources) : : true ; TestObjects $(sources) : : true ;
@@ -453,6 +459,7 @@ rule TestObjects
OPTIM = ; OPTIM = ;
} }
SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
# compile # compile
@@ -777,7 +784,6 @@ rule UseHeaders
rule UseCppUnitHeaders rule UseCppUnitHeaders
{ {
SetupIncludes ; #serious hack
SubDirHdrs [ FDirName $(OBOS_TOP) headers tools cppunit ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers tools cppunit ] ;
} }
@@ -1085,17 +1091,12 @@ rule SetupKernel
local _objs = $(1:S=$(SUFOBJ)) ; local _objs = $(1:S=$(SUFOBJ)) ;
# XXX add "mail" and "opengl" later #Setup Kernel header directories
OS_INCLUDES ?= . add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media midi midi2 net storage support translation ; local kernel_includes = add-ons/file_system add-ons/graphics device drivers kernel storage support ;
# include current directory
UseHeaders . ;
# Use posix headers directory # Use posix headers directory
SubDirHdrs [ FDirName $(OBOS_TOP) headers posix ] ; HDRS = [ FDirName $(OBOS_TOP) headers posix ] ;
# Use public OS header directories # Use public OS header directories
UseHeaders [ PublicHeaders $(OS_INCLUDES) ] ; HDRS += [ PublicHeaders $(kernel_includes) ] ;
UsePrivateHeaders kernel ; UsePrivateHeaders kernel ;
UsePrivateHeaders libroot ; UsePrivateHeaders libroot ;
@@ -1350,8 +1351,6 @@ FT2_LIB = freetype ;
rule UseFreeTypeHeaders rule UseFreeTypeHeaders
{ {
SubDirHdrs $(FT2_INCLUDE) ; SubDirHdrs $(FT2_INCLUDE) ;
SetupIncludes ;
} }
rule UseFreeTypeObjectHeaders rule UseFreeTypeObjectHeaders
@@ -1384,6 +1383,7 @@ rule FT2_Library
local library = lib$(1).so ; local library = lib$(1).so ;
local sources = $(2) ; local sources = $(2) ;
SetupIncludes ;
SetupObjectsDir ; SetupObjectsDir ;
MakeLocateObjects $(sources) ; MakeLocateObjects $(sources) ;
Objects $(sources) ; Objects $(sources) ;