Commit c21eba0d authored by Dave Watson's avatar Dave Watson Committed by Sara Golemon

updating folly makefiles

Summary:
Update Makefile.am with recent files.

Leaves out io/Compression because it uses lz4, of which there are no prebuilt packages for ubuntu (didn't check fedora, but I assume it is the same story there)

Test Plan: on ubuntu 12.10, ./configure, make, make install

Reviewed By: tudorb@fb.com

FB internal diff: D1030008
parent 722ef0f3
...@@ -15,30 +15,40 @@ lib_LTLIBRARIES = \ ...@@ -15,30 +15,40 @@ lib_LTLIBRARIES = \
follyincludedir = $(includedir)/folly follyincludedir = $(includedir)/folly
nobase_follyinclude_HEADERS = \ nobase_follyinclude_HEADERS = \
ApplyTuple.h \
Arena.h \ Arena.h \
Arena-inl.h \ Arena-inl.h \
AtomicBitSet.h \
AtomicHashArray.h \ AtomicHashArray.h \
AtomicHashArray-inl.h \ AtomicHashArray-inl.h \
AtomicHashMap.h \ AtomicHashMap.h \
AtomicHashMap-inl.h \ AtomicHashMap-inl.h \
Benchmark.h \ Benchmark.h \
Bits.h \ Bits.h \
Chrono.h \
ConcurrentSkipList.h \ ConcurrentSkipList.h \
ConcurrentSkipList-inl.h \ ConcurrentSkipList-inl.h \
Conv.h \ Conv.h \
detail/AtomicHashUtils.h \ detail/AtomicHashUtils.h \
detail/BitIteratorDetail.h \ detail/BitIteratorDetail.h \
detail/BitsDetail.h \
detail/DiscriminatedPtrDetail.h \ detail/DiscriminatedPtrDetail.h \
detail/FileUtilDetail.h \
detail/FingerprintPolynomial.h \ detail/FingerprintPolynomial.h \
detail/Futex.h \
detail/GroupVarintDetail.h \ detail/GroupVarintDetail.h \
detail/MPMCPipelineDetail.h \
detail/SlowFingerprint.h \ detail/SlowFingerprint.h \
detail/Stats.h \
detail/ThreadLocalDetail.h \ detail/ThreadLocalDetail.h \
DiscriminatedPtr.h \ DiscriminatedPtr.h \
DynamicConverter.h \
dynamic.h \ dynamic.h \
dynamic-inl.h \ dynamic-inl.h \
eventfd.h \
FBString.h \ FBString.h \
FBVector.h \ FBVector.h \
File.h \
FileUtil.h \
Fingerprint.h \ Fingerprint.h \
folly-config.h \ folly-config.h \
Foreach.h \ Foreach.h \
...@@ -47,15 +57,27 @@ nobase_follyinclude_HEADERS = \ ...@@ -47,15 +57,27 @@ nobase_follyinclude_HEADERS = \
Format-inl.h \ Format-inl.h \
GroupVarint.h \ GroupVarint.h \
Hash.h \ Hash.h \
Histogram.h \
Histogram-inl.h \
IntrusiveList.h \ IntrusiveList.h \
io/Cursor.h \
io/IOBuf.h \
io/IOBufQueue.h \
io/RecordIO.h \
io/RecordIO-inl.h \
io/TypedIOBuf.h \
json.h \ json.h \
Lazy.h \
Likely.h \ Likely.h \
Logging.h \ Logging.h \
Malloc.h \ Malloc.h \
MapUtil.h \ MapUtil.h \
Memory.h \
MemoryMapping.h \
MoveWrapper.h \
MPMCPipeline.h \
MPMCQueue.h \
Optional.h \
PackedSyncPtr.h \ PackedSyncPtr.h \
Padded.h \
Portability.h \ Portability.h \
Preprocessor.h \ Preprocessor.h \
ProducerConsumerQueue.h \ ProducerConsumerQueue.h \
...@@ -68,9 +90,15 @@ nobase_follyinclude_HEADERS = \ ...@@ -68,9 +90,15 @@ nobase_follyinclude_HEADERS = \
sorted_vector_types.h \ sorted_vector_types.h \
SpookyHashV1.h \ SpookyHashV1.h \
SpookyHashV2.h \ SpookyHashV2.h \
StlAllocator.h \ stats/BucketedTimeSeries-defs.h \
stats/BucketedTimeSeries.h \
stats/Histogram-defs.h \
stats/Histogram.h \
stats/MultiLevelTimeSeries-defs.h \
stats/MultiLevelTimeSeries.h \
String.h \ String.h \
String-inl.h \ String-inl.h \
Subprocess.h \
Synchronized.h \ Synchronized.h \
test/FBStringTestBenchmarks.cpp.h \ test/FBStringTestBenchmarks.cpp.h \
test/FBVectorTestBenchmarks.cpp.h \ test/FBVectorTestBenchmarks.cpp.h \
...@@ -83,7 +111,10 @@ nobase_follyinclude_HEADERS = \ ...@@ -83,7 +111,10 @@ nobase_follyinclude_HEADERS = \
ThreadLocal.h \ ThreadLocal.h \
TimeoutQueue.h \ TimeoutQueue.h \
Traits.h \ Traits.h \
Unicode.h Unicode.h \
Uri.h \
Uri-inl.h \
Varint.h
FormatTables.cpp: build/generate_format_tables.py FormatTables.cpp: build/generate_format_tables.py
build/generate_format_tables.py build/generate_format_tables.py
...@@ -95,22 +126,31 @@ GroupVarintTables.cpp: build/generate_varint_tables.py ...@@ -95,22 +126,31 @@ GroupVarintTables.cpp: build/generate_varint_tables.py
build/generate_varint_tables.py build/generate_varint_tables.py
libfolly_la_SOURCES = \ libfolly_la_SOURCES = \
Random.cpp \ Benchmark.cpp \
Range.cpp \ Bits.cpp \
Unicode.cpp \
Conv.cpp \ Conv.cpp \
json.cpp \
dynamic.cpp \ dynamic.cpp \
GroupVarint.cpp \ File.cpp \
GroupVarintTables.cpp \ FileUtil.cpp \
EscapeTables.cpp \
ThreadCachedArena.cpp \
Format.cpp \ Format.cpp \
FormatTables.cpp \ FormatTables.cpp \
String.cpp \ GroupVarint.cpp \
Bits.cpp \ io/IOBuf.cpp \
io/IOBufQueue.cpp \
io/RecordIO.cpp \
json.cpp \
MemoryMapping.cpp \
Random.cpp \
Range.cpp \
SpookyHashV1.cpp \ SpookyHashV1.cpp \
SpookyHashV2.cpp SpookyHashV2.cpp \
stats/Instantiations.cpp \
String.cpp \
Subprocess.cpp \
ThreadCachedArena.cpp \
TimeoutQueue.cpp \
Unicode.cpp \
Uri.cpp
if !HAVE_LINUX if !HAVE_LINUX
nobase_follyinclude_HEADERS += detail/Clock.h nobase_follyinclude_HEADERS += detail/Clock.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment