Fix zlib-dependencies of (boot & standard) packagefs.

* Some files that depend on zlib.h weren't declared as such, which
  could cause multijob builds to fail.
This commit is contained in:
Oliver Tappe
2014-05-24 20:26:41 +02:00
parent faff1dfe57
commit 06ed405803
2 changed files with 14 additions and 15 deletions
@@ -6,7 +6,7 @@ UsePrivateKernelHeaders ;
UsePrivateHeaders package shared storage ; UsePrivateHeaders package shared storage ;
local subDirs = local subDirs =
indices indices
nodes nodes
package package
@@ -106,7 +106,8 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1 =
Includes Includes
[ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES) [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ] $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
: [ BuildFeatureAttribute zlib : headers ] ; : [ BuildFeatureAttribute zlib : headers ] ;
local libSharedSources = local libSharedSources =
@@ -17,19 +17,11 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits support ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits support ] ;
BootStaticLibrary boot_packagefs : HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
packagefs.cpp
PackageSettingsItem.cpp
# package kit
# package kit/hpkg
BlockBufferPool.cpp BlockBufferPool.cpp
BlockBufferPoolImpl.cpp BlockBufferPoolImpl.cpp
BlockBufferPoolNoLock.cpp
BufferDataOutput.cpp BufferDataOutput.cpp
BufferPool.cpp BufferPool.cpp
PoolBuffer.cpp
DataReader.cpp DataReader.cpp
ErrorOutput.cpp ErrorOutput.cpp
FDDataReader.cpp FDDataReader.cpp
@@ -41,7 +33,15 @@ BootStaticLibrary boot_packagefs :
PackageFileHeapAccessorBase.cpp PackageFileHeapAccessorBase.cpp
PackageFileHeapReader.cpp PackageFileHeapReader.cpp
PackageReaderImpl.cpp PackageReaderImpl.cpp
PoolBuffer.cpp
ReaderImplBase.cpp ReaderImplBase.cpp
;
BootStaticLibrary boot_packagefs :
packagefs.cpp
PackageSettingsItem.cpp
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
# compression # compression
DataIO.cpp DataIO.cpp
@@ -51,8 +51,6 @@ BootStaticLibrary boot_packagefs :
: -fno-pic : -fno-pic
; ;
Includes [ Includes [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
FGristFiles ZlibCompressionBase.cpp package/hpkg/ZlibCompressor.h ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
shared/ZlibDecompressor.h
]
: [ BuildFeatureAttribute zlib : headers ] ; : [ BuildFeatureAttribute zlib : headers ] ;