google_hash 0.8.1 → 0.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (121) hide show
  1. data/ChangeLog.txt +2 -0
  2. data/VERSION +1 -1
  3. data/ext/clean.bat +0 -0
  4. data/ext/clean.sh +4 -0
  5. data/ext/extconf.rb +4 -5
  6. data/ext/go.bat +0 -0
  7. data/ext/sparsehash-2.0.2/AUTHORS +2 -0
  8. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/COPYING +0 -0
  9. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/ChangeLog +60 -0
  10. data/ext/sparsehash-2.0.2/INSTALL +365 -0
  11. data/ext/sparsehash-2.0.2/Makefile +1336 -0
  12. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/Makefile.am +97 -40
  13. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/Makefile.in +538 -256
  14. data/ext/sparsehash-2.0.2/NEWS +188 -0
  15. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/README +4 -10
  16. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/README_windows.txt +3 -3
  17. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/TODO +0 -0
  18. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/aclocal.m4 +266 -166
  19. data/ext/sparsehash-2.0.2/allocator.patch +31 -0
  20. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/config.guess +235 -234
  21. data/ext/sparsehash-2.0.2/config.status +1238 -0
  22. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/config.sub +198 -64
  23. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/configure +1118 -1000
  24. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/configure.ac +4 -5
  25. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/depcomp +136 -36
  26. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/dense_hash_map.html +182 -67
  27. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/dense_hash_set.html +173 -74
  28. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/designstyle.css +0 -6
  29. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/implementation.html +0 -0
  30. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/index.html +4 -5
  31. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/performance.html +1 -1
  32. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/sparse_hash_map.html +190 -58
  33. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/sparse_hash_set.html +180 -65
  34. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/doc/sparsetable.html +1 -1
  35. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/Makefile +0 -0
  36. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/README +0 -0
  37. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/example.c +1 -0
  38. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/libchash.c +1 -0
  39. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/experimental/libchash.h +1 -0
  40. data/ext/sparsehash-2.0.2/install-sh +520 -0
  41. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/acx_pthread.m4 +34 -0
  42. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/google_namespace.m4 +0 -0
  43. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/namespaces.m4 +0 -0
  44. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/stl_hash.m4 +0 -0
  45. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/m4/stl_hash_fun.m4 +0 -0
  46. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/missing +60 -44
  47. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb.sh +0 -0
  48. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/README +0 -0
  49. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/changelog +42 -0
  50. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/compat +0 -0
  51. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/control +1 -1
  52. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/copyright +5 -4
  53. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/docs +0 -0
  54. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/deb/rules +0 -0
  55. data/ext/sparsehash-2.0.2/packages/deb/sparsehash.dirs +5 -0
  56. data/ext/sparsehash-2.0.2/packages/deb/sparsehash.install +6 -0
  57. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/rpm.sh +1 -1
  58. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/packages/rpm/rpm.spec +5 -3
  59. data/ext/{sparsehash-1.8.1/google-sparsehash.sln → sparsehash-2.0.2/sparsehash.sln} +0 -0
  60. data/ext/sparsehash-2.0.2/src/config.h +132 -0
  61. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/config.h.in +0 -3
  62. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/config.h.include +0 -1
  63. data/ext/sparsehash-2.0.2/src/google/dense_hash_map +34 -0
  64. data/ext/sparsehash-2.0.2/src/google/dense_hash_set +34 -0
  65. data/ext/sparsehash-2.0.2/src/google/sparse_hash_map +34 -0
  66. data/ext/sparsehash-2.0.2/src/google/sparse_hash_set +34 -0
  67. data/ext/sparsehash-2.0.2/src/google/sparsehash/densehashtable.h +34 -0
  68. data/ext/sparsehash-2.0.2/src/google/sparsehash/hashtable-common.h +34 -0
  69. data/ext/sparsehash-2.0.2/src/google/sparsehash/libc_allocator_with_realloc.h +34 -0
  70. data/ext/sparsehash-2.0.2/src/google/sparsehash/sparsehashtable.h +34 -0
  71. data/ext/sparsehash-2.0.2/src/google/sparsetable +34 -0
  72. data/ext/sparsehash-2.0.2/src/google/template_util.h +34 -0
  73. data/ext/sparsehash-2.0.2/src/google/type_traits.h +34 -0
  74. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/hash_test_interface.h +64 -37
  75. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/hashtable_test.cc +415 -141
  76. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/libc_allocator_with_realloc_test.cc +16 -23
  77. data/ext/sparsehash-2.0.2/src/simple_compat_test.cc +106 -0
  78. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/simple_test.cc +8 -5
  79. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/dense_hash_map +80 -37
  80. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/dense_hash_set +64 -34
  81. data/ext/{sparsehash-1.8.1/src/google/sparsehash → sparsehash-2.0.2/src/sparsehash/internal}/densehashtable.h +247 -173
  82. data/ext/sparsehash-2.0.2/src/sparsehash/internal/hashtable-common.h +381 -0
  83. data/ext/{sparsehash-1.8.1/src/google/sparsehash → sparsehash-2.0.2/src/sparsehash/internal}/libc_allocator_with_realloc.h +5 -7
  84. data/ext/{sparsehash-1.8.1/src/google/sparsehash → sparsehash-2.0.2/src/sparsehash/internal}/sparsehashtable.h +154 -93
  85. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/sparse_hash_map +96 -36
  86. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/sparse_hash_set +85 -32
  87. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/sparsetable +520 -258
  88. data/ext/sparsehash-2.0.2/src/sparsehash/template_util.h +134 -0
  89. data/ext/{sparsehash-1.8.1/src/google → sparsehash-2.0.2/src/sparsehash}/type_traits.h +153 -35
  90. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/sparsetable_unittest.cc +108 -22
  91. data/ext/sparsehash-2.0.2/src/stamp-h1 +1 -0
  92. data/ext/sparsehash-2.0.2/src/template_util_unittest.cc +134 -0
  93. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/testutil.h +16 -1
  94. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/time_hash_map.cc +259 -94
  95. data/ext/sparsehash-2.0.2/src/type_traits_unittest.cc +636 -0
  96. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/windows/config.h +4 -4
  97. data/ext/sparsehash-2.0.2/src/windows/google/sparsehash/sparseconfig.h +49 -0
  98. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/windows/port.cc +1 -0
  99. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/src/windows/port.h +4 -13
  100. data/ext/sparsehash-2.0.2/src/windows/sparsehash/internal/sparseconfig.h +49 -0
  101. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/hashtable_test/hashtable_test.vcproj +11 -11
  102. data/ext/sparsehash-2.0.2/vsprojects/libc_allocator_with_realloc_test/libc_allocator_with_realloc_test.vcproj +161 -0
  103. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/simple_test/simple_test.vcproj +10 -10
  104. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/sparsetable_unittest/sparsetable_unittest.vcproj +4 -4
  105. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/time_hash_map/time_hash_map.vcproj +10 -10
  106. data/ext/{sparsehash-1.8.1 → sparsehash-2.0.2}/vsprojects/type_traits_unittest/type_traits_unittest.vcproj +3 -3
  107. data/ext/spec.bat +0 -0
  108. data/ext/template/google_hash.cpp.erb +6 -5
  109. metadata +106 -86
  110. data/ext/sparsehash-1.8.1/AUTHORS +0 -2
  111. data/ext/sparsehash-1.8.1/INSTALL +0 -236
  112. data/ext/sparsehash-1.8.1/NEWS +0 -71
  113. data/ext/sparsehash-1.8.1/compile +0 -99
  114. data/ext/sparsehash-1.8.1/install-sh +0 -323
  115. data/ext/sparsehash-1.8.1/m4/stl_namespace.m4 +0 -25
  116. data/ext/sparsehash-1.8.1/mkinstalldirs +0 -158
  117. data/ext/sparsehash-1.8.1/packages/deb/sparsehash.dirs +0 -2
  118. data/ext/sparsehash-1.8.1/packages/deb/sparsehash.install +0 -2
  119. data/ext/sparsehash-1.8.1/src/google/sparsehash/hashtable-common.h +0 -178
  120. data/ext/sparsehash-1.8.1/src/type_traits_unittest.cc +0 -502
  121. data/ext/sparsehash-1.8.1/src/windows/google/sparsehash/sparseconfig.h +0 -32
@@ -3,7 +3,7 @@
3
3
  # Make sure that when we re-make ./configure, we get the macros we need
4
4
  ACLOCAL_AMFLAGS = -I m4
5
5
 
6
- # This is so we can #include <google/foo>
6
+ # This is so we can #include <sparsehash/foo>
7
7
  AM_CPPFLAGS = -I$(top_srcdir)/src
8
8
 
9
9
  # These are good warnings to turn on by default
@@ -11,17 +11,6 @@ if GCC
11
11
  AM_CXXFLAGS = -Wall -W -Wwrite-strings -Woverloaded-virtual -Wshadow
12
12
  endif
13
13
 
14
- googleincludedir = $(includedir)/google
15
- ## The .h files you want to install (that is, .h files that people
16
- ## who install this package can include in their own applications.)
17
- googleinclude_HEADERS = \
18
- src/google/dense_hash_map \
19
- src/google/dense_hash_set \
20
- src/google/sparse_hash_map \
21
- src/google/sparse_hash_set \
22
- src/google/sparsetable \
23
- src/google/type_traits.h
24
-
25
14
  docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
26
15
  ## This is for HTML and other documentation you want to install.
27
16
  ## Add your documentation files (in doc/) in addition to these boilerplate
@@ -41,7 +30,7 @@ dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt
41
30
  ## The libraries (.so's) you want to install
42
31
  lib_LTLIBRARIES =
43
32
  ## The location of the windows project file for each binary we make
44
- WINDOWS_PROJECTS = google-sparsehash.sln
33
+ WINDOWS_PROJECTS = sparsehash.sln
45
34
 
46
35
  ## unittests you want to run when people type 'make check'.
47
36
  ## TESTS is for binary unittests, check_SCRIPTS for script-based unittests.
@@ -65,12 +54,12 @@ WINDOWS_PROJECTS += vsprojects/time_hash_map/time_hash_map.vcproj
65
54
  # Thus, we create a "minimal" config.h, called sparseconfig.h, that
66
55
  # includes only the #defines we really need, and that are unlikely to
67
56
  # change from system to system. NOTE: The awk command is equivalent to
68
- # fgrep -B2 -f- $(top_builddir)/src/config.h \
69
- # fgrep -vx -e -- > _sparsehash_config
57
+ # fgrep -B2 -f$(top_builddir)/src/config.h.include $(top_builddir)/src/config.h
58
+ # | fgrep -vx -e -- > _sparsehash_config
70
59
  # For correctness, it depends on the fact config.h.include does not have
71
60
  # any lines starting with #.
72
- src/google/sparsehash/sparseconfig.h: $(top_builddir)/src/config.h \
73
- $(top_srcdir)/src/config.h.include
61
+ src/sparsehash/internal/sparseconfig.h: $(top_builddir)/src/config.h \
62
+ $(top_srcdir)/src/config.h.include
74
63
  [ -d $(@D) ] || mkdir -p $(@D)
75
64
  echo "/*" > $(@D)/_sparsehash_config
76
65
  echo " * NOTE: This file is for internal use only." >> $(@D)/_sparsehash_config
@@ -89,40 +78,78 @@ src/google/sparsehash/sparseconfig.h: $(top_builddir)/src/config.h \
89
78
  >> $(@D)/_sparsehash_config
90
79
  mv -f $(@D)/_sparsehash_config $@
91
80
  # This is how we tell automake about auto-generated .h files
92
- BUILT_SOURCES = src/google/sparsehash/sparseconfig.h
93
- CLEANFILES = src/google/sparsehash/sparseconfig.h
81
+ BUILT_SOURCES = src/sparsehash/internal/sparseconfig.h
82
+ CLEANFILES = src/sparsehash/internal/sparseconfig.h
94
83
 
95
- sparsehashincludedir = $(googleincludedir)/sparsehash
84
+ sparsehashincludedir = $(includedir)/sparsehash
85
+ ## The .h files you want to install (that is, .h files that people
86
+ ## who install this package can include in their own applications.)
96
87
  sparsehashinclude_HEADERS = \
97
- src/google/sparsehash/densehashtable.h \
98
- src/google/sparsehash/sparsehashtable.h \
99
- src/google/sparsehash/hashtable-common.h \
88
+ src/sparsehash/dense_hash_map \
89
+ src/sparsehash/dense_hash_set \
90
+ src/sparsehash/sparse_hash_map \
91
+ src/sparsehash/sparse_hash_set \
92
+ src/sparsehash/sparsetable \
93
+ src/sparsehash/template_util.h \
94
+ src/sparsehash/type_traits.h
95
+
96
+ internalincludedir = $(sparsehashincludedir)/internal
97
+ internalinclude_HEADERS = \
98
+ src/sparsehash/internal/densehashtable.h \
99
+ src/sparsehash/internal/sparsehashtable.h \
100
+ src/sparsehash/internal/hashtable-common.h \
101
+ src/sparsehash/internal/libc_allocator_with_realloc.h
102
+ nodist_internalinclude_HEADERS = src/sparsehash/internal/sparseconfig.h
103
+
104
+ # This is for backwards compatibility only.
105
+ googleincludedir = $(includedir)/google
106
+ googleinclude_HEADERS = \
107
+ src/google/dense_hash_map \
108
+ src/google/dense_hash_set \
109
+ src/google/sparse_hash_map \
110
+ src/google/sparse_hash_set \
111
+ src/google/sparsetable \
112
+ src/google/template_util.h \
113
+ src/google/type_traits.h
114
+
115
+ googleinternalincludedir = $(includedir)/google/sparsehash
116
+ googleinternalinclude_HEADERS= \
117
+ src/google/sparsehash/densehashtable.h \
118
+ src/google/sparsehash/sparsehashtable.h \
119
+ src/google/sparsehash/hashtable-common.h \
100
120
  src/google/sparsehash/libc_allocator_with_realloc.h
101
- nodist_sparsehashinclude_HEADERS = src/google/sparsehash/sparseconfig.h
121
+
122
+ TESTS += template_util_unittest
123
+ # TODO(csilvers): Update windows projects for template_util_unittest.
124
+ # WINDOWS_PROJECTS += vsprojects/template_util_unittest/template_util_unittest.vcproj
125
+ template_util_unittest_SOURCES = \
126
+ src/template_util_unittest.cc \
127
+ src/sparsehash/template_util.h
128
+ nodist_template_util_unittest_SOURCES = $(nodist_internalinclude_HEADERS)
102
129
 
103
130
  TESTS += type_traits_unittest
104
131
  WINDOWS_PROJECTS += vsprojects/type_traits_unittest/type_traits_unittest.vcproj
105
132
  type_traits_unittest_SOURCES = \
106
133
  src/type_traits_unittest.cc \
107
- $(sparsehashinclude_HEADERS) \
108
- src/google/type_traits.h
109
- nodist_type_traits_unittest_SOURCES = $(nodist_sparsehashinclude_HEADERS)
134
+ $(internalinclude_HEADERS) \
135
+ src/sparsehash/type_traits.h
136
+ nodist_type_traits_unittest_SOURCES = $(nodist_internalinclude_HEADERS)
110
137
 
111
138
  TESTS += libc_allocator_with_realloc_test
112
139
  WINDOWS_PROJECTS += vsprojects/libc_allocator_with_realloc_test/libc_allocator_with_realloc_test.vcproj
113
140
  libc_allocator_with_realloc_test_SOURCES = \
114
141
  src/libc_allocator_with_realloc_test.cc \
115
- $(sparsehashinclude_HEADERS) \
116
- src/google/sparsehash/libc_allocator_with_realloc.h
142
+ $(internalinclude_HEADERS) \
143
+ src/sparsehash/internal/libc_allocator_with_realloc.h
117
144
 
118
145
 
119
146
  TESTS += sparsetable_unittest
120
147
  WINDOWS_PROJECTS += vsprojects/sparsetable_unittest/sparsetable_unittest.vcproj
121
148
  sparsetable_unittest_SOURCES = \
122
149
  src/sparsetable_unittest.cc \
123
- $(sparsehashinclude_HEADERS) \
124
- src/google/sparsetable
125
- nodist_sparsetable_unittest_SOURCES = $(nodist_sparsehashinclude_HEADERS)
150
+ $(internalinclude_HEADERS) \
151
+ src/sparsehash/sparsetable
152
+ nodist_sparsetable_unittest_SOURCES = $(nodist_internalinclude_HEADERS)
126
153
 
127
154
  TESTS += hashtable_test
128
155
  WINDOWS_PROJECTS += vsprojects/hashtable_test/hashtable_test.vcproj
@@ -130,23 +157,30 @@ hashtable_test_SOURCES = \
130
157
  src/hashtable_test.cc \
131
158
  src/hash_test_interface.h \
132
159
  src/testutil.h \
133
- $(googleinclude_HEADERS) \
134
- $(sparsehashinclude_HEADERS)
135
- nodist_hashtable_test_SOURCES = $(nodist_sparsehashinclude_HEADERS)
160
+ $(sparsehashinclude_HEADERS) \
161
+ $(internalinclude_HEADERS)
162
+ nodist_hashtable_test_SOURCES = $(nodist_internalinclude_HEADERS)
136
163
 
137
164
  TESTS += simple_test
138
165
  WINDOWS_PROJECTS += vsprojects/simple_test/simple_test.vcproj
139
166
  simple_test_SOURCES = \
140
167
  src/simple_test.cc \
141
- $(sparsehashinclude_HEADERS)
142
- nodist_simple_test_SOURCES = $(nodist_sparsehashinclude_HEADERS)
168
+ $(internalinclude_HEADERS)
169
+ nodist_simple_test_SOURCES = $(nodist_internalinclude_HEADERS)
143
170
 
171
+ TESTS += simple_compat_test
172
+ simple_compat_test_SOURCES = \
173
+ src/simple_compat_test.cc \
174
+ $(internalinclude_HEADERS) \
175
+ $(googleinclude_HEADERS) \
176
+ $(googleinternalinclude_HEADERS)
177
+ nodist_simple_compat_test_SOURCES = $(nodist_internalinclude_HEADERS)
144
178
 
145
179
  time_hash_map_SOURCES = \
146
180
  src/time_hash_map.cc \
147
- $(sparsehashinclude_HEADERS) \
148
- $(googleinclude_HEADERS)
149
- nodist_time_hash_map_SOURCES = $(nodist_sparsehashinclude_HEADERS)
181
+ $(internalinclude_HEADERS) \
182
+ $(sparsehashinclude_HEADERS)
183
+ nodist_time_hash_map_SOURCES = $(nodist_internalinclude_HEADERS)
150
184
 
151
185
  # If tcmalloc is installed, use it with time_hash_map; it gives us
152
186
  # heap-usage statistics for the hash_map routines, which is very nice
@@ -163,6 +197,29 @@ rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
163
197
  deb: dist-gzip packages/deb.sh packages/deb/*
164
198
  @cd packages && ./deb.sh ${PACKAGE} ${VERSION}
165
199
 
200
+ # http://linux.die.net/man/1/pkg-config, http://pkg-config.freedesktop.org/wiki
201
+ pkgconfigdir = $(libdir)/pkgconfig
202
+ pkgconfig_DATA = lib${PACKAGE}.pc
203
+ CLEANFILES += $(pkgconfig_DATA)
204
+
205
+ # I get the description and URL lines from the rpm spec. I use sed to
206
+ # try to rewrite exec_prefix, libdir, and includedir in terms of
207
+ # prefix, if possible.
208
+ lib${PACKAGE}.pc: Makefile packages/rpm/rpm.spec
209
+ echo 'prefix=$(prefix)' > "$@".tmp
210
+ echo 'exec_prefix='`echo '$(exec_prefix)' | sed 's@^$(prefix)@$${prefix}@'` >> "$@".tmp
211
+ echo 'libdir='`echo '$(libdir)' | sed 's@^$(exec_prefix)@$${exec_prefix}@'` >> "$@".tmp
212
+ echo 'includedir='`echo '$(includedir)' | sed 's@^$(prefix)@$${prefix}@'` >> "$@".tmp
213
+ echo '' >> "$@".tmp
214
+ echo 'Name: $(PACKAGE)' >> "$@".tmp
215
+ echo 'Version: $(VERSION)' >> "$@".tmp
216
+ -grep '^Summary:' $(top_srcdir)/packages/rpm/rpm.spec | sed s/^Summary:/Description:/ | head -n1 >> "$@".tmp
217
+ -grep '^URL: ' $(top_srcdir)/packages/rpm/rpm.spec >> "$@".tmp
218
+ echo 'Requires:' >> "$@".tmp
219
+ echo 'Libs:' >> "$@".tmp
220
+ echo 'Cflags: -I$${includedir}' >> "$@".tmp
221
+ mv -f "$@".tmp "$@"
222
+
166
223
  # Windows wants write permission to .vcproj files and maybe even sln files.
167
224
  dist-hook:
168
225
  test -e "$(distdir)/vsprojects" \
@@ -1,8 +1,9 @@
1
- # Makefile.in generated by automake 1.9.6 from Makefile.am.
1
+ # Makefile.in generated by automake 1.11.1 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
4
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
- # 2003, 2004, 2005 Free Software Foundation, Inc.
5
+ # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6
+ # Inc.
6
7
  # This Makefile.in is free software; the Free Software Foundation
7
8
  # gives unlimited permission to copy and/or distribute it,
8
9
  # with or without modifications, as long as this notice is preserved.
@@ -17,15 +18,12 @@
17
18
 
18
19
 
19
20
 
20
- srcdir = @srcdir@
21
- top_srcdir = @top_srcdir@
22
21
  VPATH = @srcdir@
23
22
  pkgdatadir = $(datadir)/@PACKAGE@
24
- pkglibdir = $(libdir)/@PACKAGE@
25
23
  pkgincludedir = $(includedir)/@PACKAGE@
26
- top_builddir = .
24
+ pkglibdir = $(libdir)/@PACKAGE@
25
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
27
26
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
28
- INSTALL = @INSTALL@
29
27
  install_sh_DATA = $(install_sh) -c -m 644
30
28
  install_sh_PROGRAM = $(install_sh) -c
31
29
  install_sh_SCRIPT = $(install_sh) -c
@@ -39,43 +37,65 @@ PRE_UNINSTALL = :
39
37
  POST_UNINSTALL = :
40
38
  build_triplet = @build@
41
39
  host_triplet = @host@
40
+ TESTS = template_util_unittest$(EXEEXT) type_traits_unittest$(EXEEXT) \
41
+ libc_allocator_with_realloc_test$(EXEEXT) \
42
+ sparsetable_unittest$(EXEEXT) hashtable_test$(EXEEXT) \
43
+ simple_test$(EXEEXT) simple_compat_test$(EXEEXT)
42
44
  noinst_PROGRAMS = $(am__EXEEXT_1) time_hash_map$(EXEEXT)
45
+ subdir = .
43
46
  DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
44
- $(googleinclude_HEADERS) $(sparsehashinclude_HEADERS) \
47
+ $(googleinclude_HEADERS) $(googleinternalinclude_HEADERS) \
48
+ $(internalinclude_HEADERS) $(sparsehashinclude_HEADERS) \
45
49
  $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
46
50
  $(top_srcdir)/configure $(top_srcdir)/src/config.h.in AUTHORS \
47
- COPYING ChangeLog INSTALL NEWS TODO compile config.guess \
48
- config.sub depcomp install-sh missing mkinstalldirs
49
- subdir = .
51
+ COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
52
+ depcomp install-sh missing
50
53
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
51
54
  am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
52
55
  $(top_srcdir)/m4/google_namespace.m4 \
53
56
  $(top_srcdir)/m4/namespaces.m4 $(top_srcdir)/m4/stl_hash.m4 \
54
- $(top_srcdir)/m4/stl_hash_fun.m4 \
55
- $(top_srcdir)/m4/stl_namespace.m4 $(top_srcdir)/configure.ac
57
+ $(top_srcdir)/m4/stl_hash_fun.m4 $(top_srcdir)/configure.ac
56
58
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
57
59
  $(ACLOCAL_M4)
58
60
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
59
- configure.lineno configure.status.lineno
60
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
61
+ configure.lineno config.status.lineno
62
+ mkinstalldirs = $(install_sh) -d
61
63
  CONFIG_HEADER = $(top_builddir)/src/config.h
62
64
  CONFIG_CLEAN_FILES =
65
+ CONFIG_CLEAN_VPATH_FILES =
63
66
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
64
67
  am__vpath_adj = case $$p in \
65
68
  $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
66
69
  *) f=$$p;; \
67
70
  esac;
68
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
71
+ am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
72
+ am__install_max = 40
73
+ am__nobase_strip_setup = \
74
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
75
+ am__nobase_strip = \
76
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
77
+ am__nobase_list = $(am__nobase_strip_setup); \
78
+ for p in $$list; do echo "$$p $$p"; done | \
79
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
80
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
81
+ if (++n[$$2] == $(am__install_max)) \
82
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
83
+ END { for (dir in files) print dir, files[dir] }'
84
+ am__base_list = \
85
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
86
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
69
87
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \
70
- "$(DESTDIR)$(googleincludedir)" \
71
- "$(DESTDIR)$(sparsehashincludedir)" \
88
+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(googleincludedir)" \
89
+ "$(DESTDIR)$(googleinternalincludedir)" \
90
+ "$(DESTDIR)$(internalincludedir)" \
91
+ "$(DESTDIR)$(internalincludedir)" \
72
92
  "$(DESTDIR)$(sparsehashincludedir)"
73
- libLTLIBRARIES_INSTALL = $(INSTALL)
74
93
  LTLIBRARIES = $(lib_LTLIBRARIES)
75
- am__EXEEXT_1 = type_traits_unittest$(EXEEXT) \
94
+ am__EXEEXT_1 = template_util_unittest$(EXEEXT) \
95
+ type_traits_unittest$(EXEEXT) \
76
96
  libc_allocator_with_realloc_test$(EXEEXT) \
77
97
  sparsetable_unittest$(EXEEXT) hashtable_test$(EXEEXT) \
78
- simple_test$(EXEEXT)
98
+ simple_test$(EXEEXT) simple_compat_test$(EXEEXT)
79
99
  PROGRAMS = $(noinst_PROGRAMS)
80
100
  am__objects_1 =
81
101
  am_hashtable_test_OBJECTS = hashtable_test.$(OBJEXT) $(am__objects_1) \
@@ -89,6 +109,12 @@ am_libc_allocator_with_realloc_test_OBJECTS = \
89
109
  libc_allocator_with_realloc_test_OBJECTS = \
90
110
  $(am_libc_allocator_with_realloc_test_OBJECTS)
91
111
  libc_allocator_with_realloc_test_LDADD = $(LDADD)
112
+ am_simple_compat_test_OBJECTS = simple_compat_test.$(OBJEXT) \
113
+ $(am__objects_1) $(am__objects_1) $(am__objects_1)
114
+ nodist_simple_compat_test_OBJECTS = $(am__objects_1)
115
+ simple_compat_test_OBJECTS = $(am_simple_compat_test_OBJECTS) \
116
+ $(nodist_simple_compat_test_OBJECTS)
117
+ simple_compat_test_LDADD = $(LDADD)
92
118
  am_simple_test_OBJECTS = simple_test.$(OBJEXT) $(am__objects_1)
93
119
  nodist_simple_test_OBJECTS = $(am__objects_1)
94
120
  simple_test_OBJECTS = $(am_simple_test_OBJECTS) \
@@ -100,21 +126,29 @@ nodist_sparsetable_unittest_OBJECTS = $(am__objects_1)
100
126
  sparsetable_unittest_OBJECTS = $(am_sparsetable_unittest_OBJECTS) \
101
127
  $(nodist_sparsetable_unittest_OBJECTS)
102
128
  sparsetable_unittest_LDADD = $(LDADD)
129
+ am_template_util_unittest_OBJECTS = template_util_unittest.$(OBJEXT)
130
+ nodist_template_util_unittest_OBJECTS = $(am__objects_1)
131
+ template_util_unittest_OBJECTS = $(am_template_util_unittest_OBJECTS) \
132
+ $(nodist_template_util_unittest_OBJECTS)
133
+ template_util_unittest_LDADD = $(LDADD)
103
134
  am_time_hash_map_OBJECTS = time_hash_map-time_hash_map.$(OBJEXT) \
104
135
  $(am__objects_1) $(am__objects_1)
105
136
  nodist_time_hash_map_OBJECTS = $(am__objects_1)
106
137
  time_hash_map_OBJECTS = $(am_time_hash_map_OBJECTS) \
107
138
  $(nodist_time_hash_map_OBJECTS)
108
139
  time_hash_map_DEPENDENCIES =
140
+ time_hash_map_LINK = $(CXXLD) $(time_hash_map_CXXFLAGS) $(CXXFLAGS) \
141
+ $(time_hash_map_LDFLAGS) $(LDFLAGS) -o $@
109
142
  am_type_traits_unittest_OBJECTS = type_traits_unittest.$(OBJEXT) \
110
143
  $(am__objects_1)
111
144
  nodist_type_traits_unittest_OBJECTS = $(am__objects_1)
112
145
  type_traits_unittest_OBJECTS = $(am_type_traits_unittest_OBJECTS) \
113
146
  $(nodist_type_traits_unittest_OBJECTS)
114
147
  type_traits_unittest_LDADD = $(LDADD)
115
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
148
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
116
149
  depcomp = $(SHELL) $(top_srcdir)/depcomp
117
150
  am__depfiles_maybe = depfiles
151
+ am__mv = mv -f
118
152
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
119
153
  $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
120
154
  CXXLD = $(CXX)
@@ -126,39 +160,41 @@ CCLD = $(CC)
126
160
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
127
161
  SOURCES = $(hashtable_test_SOURCES) $(nodist_hashtable_test_SOURCES) \
128
162
  $(libc_allocator_with_realloc_test_SOURCES) \
129
- $(simple_test_SOURCES) $(nodist_simple_test_SOURCES) \
130
- $(sparsetable_unittest_SOURCES) \
163
+ $(simple_compat_test_SOURCES) \
164
+ $(nodist_simple_compat_test_SOURCES) $(simple_test_SOURCES) \
165
+ $(nodist_simple_test_SOURCES) $(sparsetable_unittest_SOURCES) \
131
166
  $(nodist_sparsetable_unittest_SOURCES) \
167
+ $(template_util_unittest_SOURCES) \
168
+ $(nodist_template_util_unittest_SOURCES) \
132
169
  $(time_hash_map_SOURCES) $(nodist_time_hash_map_SOURCES) \
133
170
  $(type_traits_unittest_SOURCES) \
134
171
  $(nodist_type_traits_unittest_SOURCES)
135
172
  DIST_SOURCES = $(hashtable_test_SOURCES) \
136
173
  $(libc_allocator_with_realloc_test_SOURCES) \
137
- $(simple_test_SOURCES) $(sparsetable_unittest_SOURCES) \
138
- $(time_hash_map_SOURCES) $(type_traits_unittest_SOURCES)
139
- dist_docDATA_INSTALL = $(INSTALL_DATA)
140
- DATA = $(dist_doc_DATA)
141
- googleincludeHEADERS_INSTALL = $(INSTALL_HEADER)
142
- nodist_sparsehashincludeHEADERS_INSTALL = $(INSTALL_HEADER)
143
- sparsehashincludeHEADERS_INSTALL = $(INSTALL_HEADER)
144
- HEADERS = $(googleinclude_HEADERS) $(nodist_sparsehashinclude_HEADERS) \
174
+ $(simple_compat_test_SOURCES) $(simple_test_SOURCES) \
175
+ $(sparsetable_unittest_SOURCES) \
176
+ $(template_util_unittest_SOURCES) $(time_hash_map_SOURCES) \
177
+ $(type_traits_unittest_SOURCES)
178
+ DATA = $(dist_doc_DATA) $(pkgconfig_DATA)
179
+ HEADERS = $(googleinclude_HEADERS) $(googleinternalinclude_HEADERS) \
180
+ $(internalinclude_HEADERS) $(nodist_internalinclude_HEADERS) \
145
181
  $(sparsehashinclude_HEADERS)
146
182
  ETAGS = etags
147
183
  CTAGS = ctags
184
+ am__tty_colors = \
185
+ red=; grn=; lgn=; blu=; std=
148
186
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
149
187
  distdir = $(PACKAGE)-$(VERSION)
150
188
  top_distdir = $(distdir)
151
189
  am__remove_distdir = \
152
- { test ! -d $(distdir) \
153
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
154
- && rm -fr $(distdir); }; }
190
+ { test ! -d "$(distdir)" \
191
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
192
+ && rm -fr "$(distdir)"; }; }
155
193
  DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
156
194
  GZIP_ENV = --best
157
195
  distuninstallcheck_listfiles = find . -type f -print
158
196
  distcleancheck_listfiles = find . -type f -print
159
197
  ACLOCAL = @ACLOCAL@
160
- AMDEP_FALSE = @AMDEP_FALSE@
161
- AMDEP_TRUE = @AMDEP_TRUE@
162
198
  AMTAR = @AMTAR@
163
199
  AUTOCONF = @AUTOCONF@
164
200
  AUTOHEADER = @AUTOHEADER@
@@ -181,9 +217,8 @@ ECHO_N = @ECHO_N@
181
217
  ECHO_T = @ECHO_T@
182
218
  EGREP = @EGREP@
183
219
  EXEEXT = @EXEEXT@
184
- GCC_FALSE = @GCC_FALSE@
185
- GCC_TRUE = @GCC_TRUE@
186
220
  GREP = @GREP@
221
+ INSTALL = @INSTALL@
187
222
  INSTALL_DATA = @INSTALL_DATA@
188
223
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
189
224
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -193,6 +228,7 @@ LIBOBJS = @LIBOBJS@
193
228
  LIBS = @LIBS@
194
229
  LTLIBOBJS = @LTLIBOBJS@
195
230
  MAKEINFO = @MAKEINFO@
231
+ MKDIR_P = @MKDIR_P@
196
232
  OBJEXT = @OBJEXT@
197
233
  PACKAGE = @PACKAGE@
198
234
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -209,13 +245,13 @@ SET_MAKE = @SET_MAKE@
209
245
  SHELL = @SHELL@
210
246
  STRIP = @STRIP@
211
247
  VERSION = @VERSION@
248
+ abs_builddir = @abs_builddir@
249
+ abs_srcdir = @abs_srcdir@
250
+ abs_top_builddir = @abs_top_builddir@
251
+ abs_top_srcdir = @abs_top_srcdir@
212
252
  ac_ct_CC = @ac_ct_CC@
213
253
  ac_ct_CXX = @ac_ct_CXX@
214
254
  acx_pthread_config = @acx_pthread_config@
215
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
216
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
217
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
218
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
219
255
  am__include = @am__include@
220
256
  am__leading_dot = @am__leading_dot@
221
257
  am__quote = @am__quote@
@@ -227,6 +263,7 @@ build_alias = @build_alias@
227
263
  build_cpu = @build_cpu@
228
264
  build_os = @build_os@
229
265
  build_vendor = @build_vendor@
266
+ builddir = @builddir@
230
267
  datadir = @datadir@
231
268
  datarootdir = @datarootdir@
232
269
  docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
@@ -254,28 +291,23 @@ program_transform_name = @program_transform_name@
254
291
  psdir = @psdir@
255
292
  sbindir = @sbindir@
256
293
  sharedstatedir = @sharedstatedir@
294
+ srcdir = @srcdir@
257
295
  sysconfdir = @sysconfdir@
258
296
  target_alias = @target_alias@
259
297
  tcmalloc_flags = @tcmalloc_flags@
260
298
  tcmalloc_libs = @tcmalloc_libs@
299
+ top_build_prefix = @top_build_prefix@
300
+ top_builddir = @top_builddir@
301
+ top_srcdir = @top_srcdir@
261
302
 
262
303
  # Make sure that when we re-make ./configure, we get the macros we need
263
304
  ACLOCAL_AMFLAGS = -I m4
264
305
 
265
- # This is so we can #include <google/foo>
306
+ # This is so we can #include <sparsehash/foo>
266
307
  AM_CPPFLAGS = -I$(top_srcdir)/src
267
308
 
268
309
  # These are good warnings to turn on by default
269
310
  @GCC_TRUE@AM_CXXFLAGS = -Wall -W -Wwrite-strings -Woverloaded-virtual -Wshadow
270
- googleincludedir = $(includedir)/google
271
- googleinclude_HEADERS = \
272
- src/google/dense_hash_map \
273
- src/google/dense_hash_set \
274
- src/google/sparse_hash_map \
275
- src/google/sparse_hash_set \
276
- src/google/sparsetable \
277
- src/google/type_traits.h
278
-
279
311
  dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt \
280
312
  TODO \
281
313
  doc/dense_hash_map.html \
@@ -289,70 +321,115 @@ dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt
289
321
  doc/designstyle.css
290
322
 
291
323
  lib_LTLIBRARIES =
292
- WINDOWS_PROJECTS = google-sparsehash.sln \
324
+ WINDOWS_PROJECTS = sparsehash.sln \
293
325
  vsprojects/time_hash_map/time_hash_map.vcproj \
294
326
  vsprojects/type_traits_unittest/type_traits_unittest.vcproj \
295
327
  vsprojects/libc_allocator_with_realloc_test/libc_allocator_with_realloc_test.vcproj \
296
328
  vsprojects/sparsetable_unittest/sparsetable_unittest.vcproj \
297
329
  vsprojects/hashtable_test/hashtable_test.vcproj \
298
330
  vsprojects/simple_test/simple_test.vcproj
299
- TESTS = type_traits_unittest libc_allocator_with_realloc_test \
300
- sparsetable_unittest hashtable_test simple_test
301
331
  check_SCRIPTS =
302
332
  TESTS_ENVIRONMENT =
303
333
  # This is how we tell automake about auto-generated .h files
304
- BUILT_SOURCES = src/google/sparsehash/sparseconfig.h
305
- CLEANFILES = src/google/sparsehash/sparseconfig.h
306
- sparsehashincludedir = $(googleincludedir)/sparsehash
334
+ BUILT_SOURCES = src/sparsehash/internal/sparseconfig.h
335
+ CLEANFILES = src/sparsehash/internal/sparseconfig.h $(pkgconfig_DATA)
336
+ sparsehashincludedir = $(includedir)/sparsehash
307
337
  sparsehashinclude_HEADERS = \
308
- src/google/sparsehash/densehashtable.h \
309
- src/google/sparsehash/sparsehashtable.h \
310
- src/google/sparsehash/hashtable-common.h \
338
+ src/sparsehash/dense_hash_map \
339
+ src/sparsehash/dense_hash_set \
340
+ src/sparsehash/sparse_hash_map \
341
+ src/sparsehash/sparse_hash_set \
342
+ src/sparsehash/sparsetable \
343
+ src/sparsehash/template_util.h \
344
+ src/sparsehash/type_traits.h
345
+
346
+ internalincludedir = $(sparsehashincludedir)/internal
347
+ internalinclude_HEADERS = \
348
+ src/sparsehash/internal/densehashtable.h \
349
+ src/sparsehash/internal/sparsehashtable.h \
350
+ src/sparsehash/internal/hashtable-common.h \
351
+ src/sparsehash/internal/libc_allocator_with_realloc.h
352
+
353
+ nodist_internalinclude_HEADERS = src/sparsehash/internal/sparseconfig.h
354
+
355
+ # This is for backwards compatibility only.
356
+ googleincludedir = $(includedir)/google
357
+ googleinclude_HEADERS = \
358
+ src/google/dense_hash_map \
359
+ src/google/dense_hash_set \
360
+ src/google/sparse_hash_map \
361
+ src/google/sparse_hash_set \
362
+ src/google/sparsetable \
363
+ src/google/template_util.h \
364
+ src/google/type_traits.h
365
+
366
+ googleinternalincludedir = $(includedir)/google/sparsehash
367
+ googleinternalinclude_HEADERS = \
368
+ src/google/sparsehash/densehashtable.h \
369
+ src/google/sparsehash/sparsehashtable.h \
370
+ src/google/sparsehash/hashtable-common.h \
311
371
  src/google/sparsehash/libc_allocator_with_realloc.h
312
372
 
313
- nodist_sparsehashinclude_HEADERS = src/google/sparsehash/sparseconfig.h
373
+ # TODO(csilvers): Update windows projects for template_util_unittest.
374
+ # WINDOWS_PROJECTS += vsprojects/template_util_unittest/template_util_unittest.vcproj
375
+ template_util_unittest_SOURCES = \
376
+ src/template_util_unittest.cc \
377
+ src/sparsehash/template_util.h
378
+
379
+ nodist_template_util_unittest_SOURCES = $(nodist_internalinclude_HEADERS)
314
380
  type_traits_unittest_SOURCES = \
315
381
  src/type_traits_unittest.cc \
316
- $(sparsehashinclude_HEADERS) \
317
- src/google/type_traits.h
382
+ $(internalinclude_HEADERS) \
383
+ src/sparsehash/type_traits.h
318
384
 
319
- nodist_type_traits_unittest_SOURCES = $(nodist_sparsehashinclude_HEADERS)
385
+ nodist_type_traits_unittest_SOURCES = $(nodist_internalinclude_HEADERS)
320
386
  libc_allocator_with_realloc_test_SOURCES = \
321
387
  src/libc_allocator_with_realloc_test.cc \
322
- $(sparsehashinclude_HEADERS) \
323
- src/google/sparsehash/libc_allocator_with_realloc.h
388
+ $(internalinclude_HEADERS) \
389
+ src/sparsehash/internal/libc_allocator_with_realloc.h
324
390
 
325
391
  sparsetable_unittest_SOURCES = \
326
392
  src/sparsetable_unittest.cc \
327
- $(sparsehashinclude_HEADERS) \
328
- src/google/sparsetable
393
+ $(internalinclude_HEADERS) \
394
+ src/sparsehash/sparsetable
329
395
 
330
- nodist_sparsetable_unittest_SOURCES = $(nodist_sparsehashinclude_HEADERS)
396
+ nodist_sparsetable_unittest_SOURCES = $(nodist_internalinclude_HEADERS)
331
397
  hashtable_test_SOURCES = \
332
398
  src/hashtable_test.cc \
333
399
  src/hash_test_interface.h \
334
400
  src/testutil.h \
335
- $(googleinclude_HEADERS) \
336
- $(sparsehashinclude_HEADERS)
401
+ $(sparsehashinclude_HEADERS) \
402
+ $(internalinclude_HEADERS)
337
403
 
338
- nodist_hashtable_test_SOURCES = $(nodist_sparsehashinclude_HEADERS)
404
+ nodist_hashtable_test_SOURCES = $(nodist_internalinclude_HEADERS)
339
405
  simple_test_SOURCES = \
340
406
  src/simple_test.cc \
341
- $(sparsehashinclude_HEADERS)
407
+ $(internalinclude_HEADERS)
408
+
409
+ nodist_simple_test_SOURCES = $(nodist_internalinclude_HEADERS)
410
+ simple_compat_test_SOURCES = \
411
+ src/simple_compat_test.cc \
412
+ $(internalinclude_HEADERS) \
413
+ $(googleinclude_HEADERS) \
414
+ $(googleinternalinclude_HEADERS)
342
415
 
343
- nodist_simple_test_SOURCES = $(nodist_sparsehashinclude_HEADERS)
416
+ nodist_simple_compat_test_SOURCES = $(nodist_internalinclude_HEADERS)
344
417
  time_hash_map_SOURCES = \
345
418
  src/time_hash_map.cc \
346
- $(sparsehashinclude_HEADERS) \
347
- $(googleinclude_HEADERS)
419
+ $(internalinclude_HEADERS) \
420
+ $(sparsehashinclude_HEADERS)
348
421
 
349
- nodist_time_hash_map_SOURCES = $(nodist_sparsehashinclude_HEADERS)
422
+ nodist_time_hash_map_SOURCES = $(nodist_internalinclude_HEADERS)
350
423
 
351
424
  # If tcmalloc is installed, use it with time_hash_map; it gives us
352
425
  # heap-usage statistics for the hash_map routines, which is very nice
353
426
  time_hash_map_CXXFLAGS = @tcmalloc_flags@ $(AM_CXXFLAGS)
354
427
  time_hash_map_LDFLAGS = @tcmalloc_flags@
355
428
  time_hash_map_LDADD = @tcmalloc_libs@
429
+
430
+ # http://linux.die.net/man/1/pkg-config, http://pkg-config.freedesktop.org/wiki
431
+ pkgconfigdir = $(libdir)/pkgconfig
432
+ pkgconfig_DATA = lib${PACKAGE}.pc
356
433
  EXTRA_DIST = packages/rpm.sh packages/rpm/rpm.spec packages/deb.sh packages/deb \
357
434
  src/config.h.include src/windows $(WINDOWS_PROJECTS) experimental
358
435
 
@@ -367,15 +444,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
367
444
  @for dep in $?; do \
368
445
  case '$(am__configure_deps)' in \
369
446
  *$$dep*) \
370
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
371
- cd $(srcdir) && $(AUTOMAKE) --gnu \
447
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
448
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
372
449
  && exit 0; \
373
450
  exit 1;; \
374
451
  esac; \
375
452
  done; \
376
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
377
- cd $(top_srcdir) && \
378
- $(AUTOMAKE) --gnu Makefile
453
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
454
+ $(am__cd) $(top_srcdir) && \
455
+ $(AUTOMAKE) --gnu Makefile
379
456
  .PRECIOUS: Makefile
380
457
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
381
458
  @case '$?' in \
@@ -391,21 +468,22 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
391
468
  $(SHELL) ./config.status --recheck
392
469
 
393
470
  $(top_srcdir)/configure: $(am__configure_deps)
394
- cd $(srcdir) && $(AUTOCONF)
471
+ $(am__cd) $(srcdir) && $(AUTOCONF)
395
472
  $(ACLOCAL_M4): $(am__aclocal_m4_deps)
396
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
473
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
474
+ $(am__aclocal_m4_deps):
397
475
 
398
476
  src/config.h: src/stamp-h1
399
477
  @if test ! -f $@; then \
400
478
  rm -f src/stamp-h1; \
401
- $(MAKE) src/stamp-h1; \
479
+ $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; \
402
480
  else :; fi
403
481
 
404
482
  src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
405
483
  @rm -f src/stamp-h1
406
484
  cd $(top_builddir) && $(SHELL) ./config.status src/config.h
407
485
  $(top_srcdir)/src/config.h.in: $(am__configure_deps)
408
- cd $(top_srcdir) && $(AUTOHEADER)
486
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
409
487
  rm -f src/stamp-h1
410
488
  touch $@
411
489
 
@@ -413,21 +491,25 @@ distclean-hdr:
413
491
  -rm -f src/config.h src/stamp-h1
414
492
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
415
493
  @$(NORMAL_INSTALL)
416
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
417
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
494
+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
495
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
496
+ list2=; for p in $$list; do \
418
497
  if test -f $$p; then \
419
- f=$(am__strip_dir) \
420
- echo " $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
421
- $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
498
+ list2="$$list2 $$p"; \
422
499
  else :; fi; \
423
- done
500
+ done; \
501
+ test -z "$$list2" || { \
502
+ echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$list '$(DESTDIR)$(libdir)'"; \
503
+ $(INSTALL) $(INSTALL_STRIP_FLAG) $$list "$(DESTDIR)$(libdir)"; \
504
+ }
424
505
 
425
506
  uninstall-libLTLIBRARIES:
426
507
  @$(NORMAL_UNINSTALL)
427
- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
428
- p=$(am__strip_dir) \
429
- echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
430
- rm -f "$(DESTDIR)$(libdir)/$$p"; \
508
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
509
+ for p in $$list; do \
510
+ $(am__strip_dir) \
511
+ echo " rm -f '$(DESTDIR)$(libdir)/$$f'"; \
512
+ rm -f "$(DESTDIR)$(libdir)/$$f"; \
431
513
  done
432
514
 
433
515
  clean-libLTLIBRARIES:
@@ -443,22 +525,28 @@ clean-noinstPROGRAMS:
443
525
  -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
444
526
  hashtable_test$(EXEEXT): $(hashtable_test_OBJECTS) $(hashtable_test_DEPENDENCIES)
445
527
  @rm -f hashtable_test$(EXEEXT)
446
- $(CXXLINK) $(hashtable_test_LDFLAGS) $(hashtable_test_OBJECTS) $(hashtable_test_LDADD) $(LIBS)
528
+ $(CXXLINK) $(hashtable_test_OBJECTS) $(hashtable_test_LDADD) $(LIBS)
447
529
  libc_allocator_with_realloc_test$(EXEEXT): $(libc_allocator_with_realloc_test_OBJECTS) $(libc_allocator_with_realloc_test_DEPENDENCIES)
448
530
  @rm -f libc_allocator_with_realloc_test$(EXEEXT)
449
- $(CXXLINK) $(libc_allocator_with_realloc_test_LDFLAGS) $(libc_allocator_with_realloc_test_OBJECTS) $(libc_allocator_with_realloc_test_LDADD) $(LIBS)
531
+ $(CXXLINK) $(libc_allocator_with_realloc_test_OBJECTS) $(libc_allocator_with_realloc_test_LDADD) $(LIBS)
532
+ simple_compat_test$(EXEEXT): $(simple_compat_test_OBJECTS) $(simple_compat_test_DEPENDENCIES)
533
+ @rm -f simple_compat_test$(EXEEXT)
534
+ $(CXXLINK) $(simple_compat_test_OBJECTS) $(simple_compat_test_LDADD) $(LIBS)
450
535
  simple_test$(EXEEXT): $(simple_test_OBJECTS) $(simple_test_DEPENDENCIES)
451
536
  @rm -f simple_test$(EXEEXT)
452
- $(CXXLINK) $(simple_test_LDFLAGS) $(simple_test_OBJECTS) $(simple_test_LDADD) $(LIBS)
537
+ $(CXXLINK) $(simple_test_OBJECTS) $(simple_test_LDADD) $(LIBS)
453
538
  sparsetable_unittest$(EXEEXT): $(sparsetable_unittest_OBJECTS) $(sparsetable_unittest_DEPENDENCIES)
454
539
  @rm -f sparsetable_unittest$(EXEEXT)
455
- $(CXXLINK) $(sparsetable_unittest_LDFLAGS) $(sparsetable_unittest_OBJECTS) $(sparsetable_unittest_LDADD) $(LIBS)
540
+ $(CXXLINK) $(sparsetable_unittest_OBJECTS) $(sparsetable_unittest_LDADD) $(LIBS)
541
+ template_util_unittest$(EXEEXT): $(template_util_unittest_OBJECTS) $(template_util_unittest_DEPENDENCIES)
542
+ @rm -f template_util_unittest$(EXEEXT)
543
+ $(CXXLINK) $(template_util_unittest_OBJECTS) $(template_util_unittest_LDADD) $(LIBS)
456
544
  time_hash_map$(EXEEXT): $(time_hash_map_OBJECTS) $(time_hash_map_DEPENDENCIES)
457
545
  @rm -f time_hash_map$(EXEEXT)
458
- $(CXXLINK) $(time_hash_map_LDFLAGS) $(time_hash_map_OBJECTS) $(time_hash_map_LDADD) $(LIBS)
546
+ $(time_hash_map_LINK) $(time_hash_map_OBJECTS) $(time_hash_map_LDADD) $(LIBS)
459
547
  type_traits_unittest$(EXEEXT): $(type_traits_unittest_OBJECTS) $(type_traits_unittest_DEPENDENCIES)
460
548
  @rm -f type_traits_unittest$(EXEEXT)
461
- $(CXXLINK) $(type_traits_unittest_LDFLAGS) $(type_traits_unittest_OBJECTS) $(type_traits_unittest_LDADD) $(LIBS)
549
+ $(CXXLINK) $(type_traits_unittest_OBJECTS) $(type_traits_unittest_LDADD) $(LIBS)
462
550
 
463
551
  mostlyclean-compile:
464
552
  -rm -f *.$(OBJEXT)
@@ -468,222 +556,327 @@ distclean-compile:
468
556
 
469
557
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtable_test.Po@am__quote@
470
558
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libc_allocator_with_realloc_test.Po@am__quote@
559
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_compat_test.Po@am__quote@
471
560
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_test.Po@am__quote@
472
561
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparsetable_unittest.Po@am__quote@
562
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template_util_unittest.Po@am__quote@
473
563
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_hash_map-time_hash_map.Po@am__quote@
474
564
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/type_traits_unittest.Po@am__quote@
475
565
 
476
566
  .cc.o:
477
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
478
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
567
+ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
568
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
479
569
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
480
570
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
481
571
  @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
482
572
 
483
573
  .cc.obj:
484
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
485
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
574
+ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
575
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
486
576
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
487
577
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
488
578
  @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
489
579
 
490
580
  hashtable_test.o: src/hashtable_test.cc
491
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hashtable_test.o -MD -MP -MF "$(DEPDIR)/hashtable_test.Tpo" -c -o hashtable_test.o `test -f 'src/hashtable_test.cc' || echo '$(srcdir)/'`src/hashtable_test.cc; \
492
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/hashtable_test.Tpo" "$(DEPDIR)/hashtable_test.Po"; else rm -f "$(DEPDIR)/hashtable_test.Tpo"; exit 1; fi
581
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hashtable_test.o -MD -MP -MF $(DEPDIR)/hashtable_test.Tpo -c -o hashtable_test.o `test -f 'src/hashtable_test.cc' || echo '$(srcdir)/'`src/hashtable_test.cc
582
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hashtable_test.Tpo $(DEPDIR)/hashtable_test.Po
493
583
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/hashtable_test.cc' object='hashtable_test.o' libtool=no @AMDEPBACKSLASH@
494
584
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
495
585
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hashtable_test.o `test -f 'src/hashtable_test.cc' || echo '$(srcdir)/'`src/hashtable_test.cc
496
586
 
497
587
  hashtable_test.obj: src/hashtable_test.cc
498
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hashtable_test.obj -MD -MP -MF "$(DEPDIR)/hashtable_test.Tpo" -c -o hashtable_test.obj `if test -f 'src/hashtable_test.cc'; then $(CYGPATH_W) 'src/hashtable_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/hashtable_test.cc'; fi`; \
499
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/hashtable_test.Tpo" "$(DEPDIR)/hashtable_test.Po"; else rm -f "$(DEPDIR)/hashtable_test.Tpo"; exit 1; fi
588
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hashtable_test.obj -MD -MP -MF $(DEPDIR)/hashtable_test.Tpo -c -o hashtable_test.obj `if test -f 'src/hashtable_test.cc'; then $(CYGPATH_W) 'src/hashtable_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/hashtable_test.cc'; fi`
589
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hashtable_test.Tpo $(DEPDIR)/hashtable_test.Po
500
590
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/hashtable_test.cc' object='hashtable_test.obj' libtool=no @AMDEPBACKSLASH@
501
591
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
502
592
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hashtable_test.obj `if test -f 'src/hashtable_test.cc'; then $(CYGPATH_W) 'src/hashtable_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/hashtable_test.cc'; fi`
503
593
 
504
594
  libc_allocator_with_realloc_test.o: src/libc_allocator_with_realloc_test.cc
505
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libc_allocator_with_realloc_test.o -MD -MP -MF "$(DEPDIR)/libc_allocator_with_realloc_test.Tpo" -c -o libc_allocator_with_realloc_test.o `test -f 'src/libc_allocator_with_realloc_test.cc' || echo '$(srcdir)/'`src/libc_allocator_with_realloc_test.cc; \
506
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libc_allocator_with_realloc_test.Tpo" "$(DEPDIR)/libc_allocator_with_realloc_test.Po"; else rm -f "$(DEPDIR)/libc_allocator_with_realloc_test.Tpo"; exit 1; fi
595
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libc_allocator_with_realloc_test.o -MD -MP -MF $(DEPDIR)/libc_allocator_with_realloc_test.Tpo -c -o libc_allocator_with_realloc_test.o `test -f 'src/libc_allocator_with_realloc_test.cc' || echo '$(srcdir)/'`src/libc_allocator_with_realloc_test.cc
596
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libc_allocator_with_realloc_test.Tpo $(DEPDIR)/libc_allocator_with_realloc_test.Po
507
597
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/libc_allocator_with_realloc_test.cc' object='libc_allocator_with_realloc_test.o' libtool=no @AMDEPBACKSLASH@
508
598
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
509
599
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libc_allocator_with_realloc_test.o `test -f 'src/libc_allocator_with_realloc_test.cc' || echo '$(srcdir)/'`src/libc_allocator_with_realloc_test.cc
510
600
 
511
601
  libc_allocator_with_realloc_test.obj: src/libc_allocator_with_realloc_test.cc
512
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libc_allocator_with_realloc_test.obj -MD -MP -MF "$(DEPDIR)/libc_allocator_with_realloc_test.Tpo" -c -o libc_allocator_with_realloc_test.obj `if test -f 'src/libc_allocator_with_realloc_test.cc'; then $(CYGPATH_W) 'src/libc_allocator_with_realloc_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/libc_allocator_with_realloc_test.cc'; fi`; \
513
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libc_allocator_with_realloc_test.Tpo" "$(DEPDIR)/libc_allocator_with_realloc_test.Po"; else rm -f "$(DEPDIR)/libc_allocator_with_realloc_test.Tpo"; exit 1; fi
602
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libc_allocator_with_realloc_test.obj -MD -MP -MF $(DEPDIR)/libc_allocator_with_realloc_test.Tpo -c -o libc_allocator_with_realloc_test.obj `if test -f 'src/libc_allocator_with_realloc_test.cc'; then $(CYGPATH_W) 'src/libc_allocator_with_realloc_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/libc_allocator_with_realloc_test.cc'; fi`
603
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libc_allocator_with_realloc_test.Tpo $(DEPDIR)/libc_allocator_with_realloc_test.Po
514
604
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/libc_allocator_with_realloc_test.cc' object='libc_allocator_with_realloc_test.obj' libtool=no @AMDEPBACKSLASH@
515
605
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
516
606
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libc_allocator_with_realloc_test.obj `if test -f 'src/libc_allocator_with_realloc_test.cc'; then $(CYGPATH_W) 'src/libc_allocator_with_realloc_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/libc_allocator_with_realloc_test.cc'; fi`
517
607
 
608
+ simple_compat_test.o: src/simple_compat_test.cc
609
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple_compat_test.o -MD -MP -MF $(DEPDIR)/simple_compat_test.Tpo -c -o simple_compat_test.o `test -f 'src/simple_compat_test.cc' || echo '$(srcdir)/'`src/simple_compat_test.cc
610
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/simple_compat_test.Tpo $(DEPDIR)/simple_compat_test.Po
611
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/simple_compat_test.cc' object='simple_compat_test.o' libtool=no @AMDEPBACKSLASH@
612
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
613
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o simple_compat_test.o `test -f 'src/simple_compat_test.cc' || echo '$(srcdir)/'`src/simple_compat_test.cc
614
+
615
+ simple_compat_test.obj: src/simple_compat_test.cc
616
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple_compat_test.obj -MD -MP -MF $(DEPDIR)/simple_compat_test.Tpo -c -o simple_compat_test.obj `if test -f 'src/simple_compat_test.cc'; then $(CYGPATH_W) 'src/simple_compat_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/simple_compat_test.cc'; fi`
617
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/simple_compat_test.Tpo $(DEPDIR)/simple_compat_test.Po
618
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/simple_compat_test.cc' object='simple_compat_test.obj' libtool=no @AMDEPBACKSLASH@
619
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
620
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o simple_compat_test.obj `if test -f 'src/simple_compat_test.cc'; then $(CYGPATH_W) 'src/simple_compat_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/simple_compat_test.cc'; fi`
621
+
518
622
  simple_test.o: src/simple_test.cc
519
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple_test.o -MD -MP -MF "$(DEPDIR)/simple_test.Tpo" -c -o simple_test.o `test -f 'src/simple_test.cc' || echo '$(srcdir)/'`src/simple_test.cc; \
520
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/simple_test.Tpo" "$(DEPDIR)/simple_test.Po"; else rm -f "$(DEPDIR)/simple_test.Tpo"; exit 1; fi
623
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple_test.o -MD -MP -MF $(DEPDIR)/simple_test.Tpo -c -o simple_test.o `test -f 'src/simple_test.cc' || echo '$(srcdir)/'`src/simple_test.cc
624
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/simple_test.Tpo $(DEPDIR)/simple_test.Po
521
625
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/simple_test.cc' object='simple_test.o' libtool=no @AMDEPBACKSLASH@
522
626
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
523
627
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o simple_test.o `test -f 'src/simple_test.cc' || echo '$(srcdir)/'`src/simple_test.cc
524
628
 
525
629
  simple_test.obj: src/simple_test.cc
526
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple_test.obj -MD -MP -MF "$(DEPDIR)/simple_test.Tpo" -c -o simple_test.obj `if test -f 'src/simple_test.cc'; then $(CYGPATH_W) 'src/simple_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/simple_test.cc'; fi`; \
527
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/simple_test.Tpo" "$(DEPDIR)/simple_test.Po"; else rm -f "$(DEPDIR)/simple_test.Tpo"; exit 1; fi
630
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT simple_test.obj -MD -MP -MF $(DEPDIR)/simple_test.Tpo -c -o simple_test.obj `if test -f 'src/simple_test.cc'; then $(CYGPATH_W) 'src/simple_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/simple_test.cc'; fi`
631
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/simple_test.Tpo $(DEPDIR)/simple_test.Po
528
632
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/simple_test.cc' object='simple_test.obj' libtool=no @AMDEPBACKSLASH@
529
633
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
530
634
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o simple_test.obj `if test -f 'src/simple_test.cc'; then $(CYGPATH_W) 'src/simple_test.cc'; else $(CYGPATH_W) '$(srcdir)/src/simple_test.cc'; fi`
531
635
 
532
636
  sparsetable_unittest.o: src/sparsetable_unittest.cc
533
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sparsetable_unittest.o -MD -MP -MF "$(DEPDIR)/sparsetable_unittest.Tpo" -c -o sparsetable_unittest.o `test -f 'src/sparsetable_unittest.cc' || echo '$(srcdir)/'`src/sparsetable_unittest.cc; \
534
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sparsetable_unittest.Tpo" "$(DEPDIR)/sparsetable_unittest.Po"; else rm -f "$(DEPDIR)/sparsetable_unittest.Tpo"; exit 1; fi
637
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sparsetable_unittest.o -MD -MP -MF $(DEPDIR)/sparsetable_unittest.Tpo -c -o sparsetable_unittest.o `test -f 'src/sparsetable_unittest.cc' || echo '$(srcdir)/'`src/sparsetable_unittest.cc
638
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sparsetable_unittest.Tpo $(DEPDIR)/sparsetable_unittest.Po
535
639
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/sparsetable_unittest.cc' object='sparsetable_unittest.o' libtool=no @AMDEPBACKSLASH@
536
640
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
537
641
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sparsetable_unittest.o `test -f 'src/sparsetable_unittest.cc' || echo '$(srcdir)/'`src/sparsetable_unittest.cc
538
642
 
539
643
  sparsetable_unittest.obj: src/sparsetable_unittest.cc
540
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sparsetable_unittest.obj -MD -MP -MF "$(DEPDIR)/sparsetable_unittest.Tpo" -c -o sparsetable_unittest.obj `if test -f 'src/sparsetable_unittest.cc'; then $(CYGPATH_W) 'src/sparsetable_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/sparsetable_unittest.cc'; fi`; \
541
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sparsetable_unittest.Tpo" "$(DEPDIR)/sparsetable_unittest.Po"; else rm -f "$(DEPDIR)/sparsetable_unittest.Tpo"; exit 1; fi
644
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sparsetable_unittest.obj -MD -MP -MF $(DEPDIR)/sparsetable_unittest.Tpo -c -o sparsetable_unittest.obj `if test -f 'src/sparsetable_unittest.cc'; then $(CYGPATH_W) 'src/sparsetable_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/sparsetable_unittest.cc'; fi`
645
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sparsetable_unittest.Tpo $(DEPDIR)/sparsetable_unittest.Po
542
646
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/sparsetable_unittest.cc' object='sparsetable_unittest.obj' libtool=no @AMDEPBACKSLASH@
543
647
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
544
648
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sparsetable_unittest.obj `if test -f 'src/sparsetable_unittest.cc'; then $(CYGPATH_W) 'src/sparsetable_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/sparsetable_unittest.cc'; fi`
545
649
 
650
+ template_util_unittest.o: src/template_util_unittest.cc
651
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT template_util_unittest.o -MD -MP -MF $(DEPDIR)/template_util_unittest.Tpo -c -o template_util_unittest.o `test -f 'src/template_util_unittest.cc' || echo '$(srcdir)/'`src/template_util_unittest.cc
652
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/template_util_unittest.Tpo $(DEPDIR)/template_util_unittest.Po
653
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/template_util_unittest.cc' object='template_util_unittest.o' libtool=no @AMDEPBACKSLASH@
654
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
655
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o template_util_unittest.o `test -f 'src/template_util_unittest.cc' || echo '$(srcdir)/'`src/template_util_unittest.cc
656
+
657
+ template_util_unittest.obj: src/template_util_unittest.cc
658
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT template_util_unittest.obj -MD -MP -MF $(DEPDIR)/template_util_unittest.Tpo -c -o template_util_unittest.obj `if test -f 'src/template_util_unittest.cc'; then $(CYGPATH_W) 'src/template_util_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/template_util_unittest.cc'; fi`
659
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/template_util_unittest.Tpo $(DEPDIR)/template_util_unittest.Po
660
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/template_util_unittest.cc' object='template_util_unittest.obj' libtool=no @AMDEPBACKSLASH@
661
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
662
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o template_util_unittest.obj `if test -f 'src/template_util_unittest.cc'; then $(CYGPATH_W) 'src/template_util_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/template_util_unittest.cc'; fi`
663
+
546
664
  time_hash_map-time_hash_map.o: src/time_hash_map.cc
547
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_hash_map_CXXFLAGS) $(CXXFLAGS) -MT time_hash_map-time_hash_map.o -MD -MP -MF "$(DEPDIR)/time_hash_map-time_hash_map.Tpo" -c -o time_hash_map-time_hash_map.o `test -f 'src/time_hash_map.cc' || echo '$(srcdir)/'`src/time_hash_map.cc; \
548
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/time_hash_map-time_hash_map.Tpo" "$(DEPDIR)/time_hash_map-time_hash_map.Po"; else rm -f "$(DEPDIR)/time_hash_map-time_hash_map.Tpo"; exit 1; fi
665
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_hash_map_CXXFLAGS) $(CXXFLAGS) -MT time_hash_map-time_hash_map.o -MD -MP -MF $(DEPDIR)/time_hash_map-time_hash_map.Tpo -c -o time_hash_map-time_hash_map.o `test -f 'src/time_hash_map.cc' || echo '$(srcdir)/'`src/time_hash_map.cc
666
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/time_hash_map-time_hash_map.Tpo $(DEPDIR)/time_hash_map-time_hash_map.Po
549
667
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/time_hash_map.cc' object='time_hash_map-time_hash_map.o' libtool=no @AMDEPBACKSLASH@
550
668
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
551
669
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_hash_map_CXXFLAGS) $(CXXFLAGS) -c -o time_hash_map-time_hash_map.o `test -f 'src/time_hash_map.cc' || echo '$(srcdir)/'`src/time_hash_map.cc
552
670
 
553
671
  time_hash_map-time_hash_map.obj: src/time_hash_map.cc
554
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_hash_map_CXXFLAGS) $(CXXFLAGS) -MT time_hash_map-time_hash_map.obj -MD -MP -MF "$(DEPDIR)/time_hash_map-time_hash_map.Tpo" -c -o time_hash_map-time_hash_map.obj `if test -f 'src/time_hash_map.cc'; then $(CYGPATH_W) 'src/time_hash_map.cc'; else $(CYGPATH_W) '$(srcdir)/src/time_hash_map.cc'; fi`; \
555
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/time_hash_map-time_hash_map.Tpo" "$(DEPDIR)/time_hash_map-time_hash_map.Po"; else rm -f "$(DEPDIR)/time_hash_map-time_hash_map.Tpo"; exit 1; fi
672
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_hash_map_CXXFLAGS) $(CXXFLAGS) -MT time_hash_map-time_hash_map.obj -MD -MP -MF $(DEPDIR)/time_hash_map-time_hash_map.Tpo -c -o time_hash_map-time_hash_map.obj `if test -f 'src/time_hash_map.cc'; then $(CYGPATH_W) 'src/time_hash_map.cc'; else $(CYGPATH_W) '$(srcdir)/src/time_hash_map.cc'; fi`
673
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/time_hash_map-time_hash_map.Tpo $(DEPDIR)/time_hash_map-time_hash_map.Po
556
674
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/time_hash_map.cc' object='time_hash_map-time_hash_map.obj' libtool=no @AMDEPBACKSLASH@
557
675
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
558
676
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_hash_map_CXXFLAGS) $(CXXFLAGS) -c -o time_hash_map-time_hash_map.obj `if test -f 'src/time_hash_map.cc'; then $(CYGPATH_W) 'src/time_hash_map.cc'; else $(CYGPATH_W) '$(srcdir)/src/time_hash_map.cc'; fi`
559
677
 
560
678
  type_traits_unittest.o: src/type_traits_unittest.cc
561
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT type_traits_unittest.o -MD -MP -MF "$(DEPDIR)/type_traits_unittest.Tpo" -c -o type_traits_unittest.o `test -f 'src/type_traits_unittest.cc' || echo '$(srcdir)/'`src/type_traits_unittest.cc; \
562
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/type_traits_unittest.Tpo" "$(DEPDIR)/type_traits_unittest.Po"; else rm -f "$(DEPDIR)/type_traits_unittest.Tpo"; exit 1; fi
679
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT type_traits_unittest.o -MD -MP -MF $(DEPDIR)/type_traits_unittest.Tpo -c -o type_traits_unittest.o `test -f 'src/type_traits_unittest.cc' || echo '$(srcdir)/'`src/type_traits_unittest.cc
680
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/type_traits_unittest.Tpo $(DEPDIR)/type_traits_unittest.Po
563
681
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/type_traits_unittest.cc' object='type_traits_unittest.o' libtool=no @AMDEPBACKSLASH@
564
682
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
565
683
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o type_traits_unittest.o `test -f 'src/type_traits_unittest.cc' || echo '$(srcdir)/'`src/type_traits_unittest.cc
566
684
 
567
685
  type_traits_unittest.obj: src/type_traits_unittest.cc
568
- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT type_traits_unittest.obj -MD -MP -MF "$(DEPDIR)/type_traits_unittest.Tpo" -c -o type_traits_unittest.obj `if test -f 'src/type_traits_unittest.cc'; then $(CYGPATH_W) 'src/type_traits_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/type_traits_unittest.cc'; fi`; \
569
- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/type_traits_unittest.Tpo" "$(DEPDIR)/type_traits_unittest.Po"; else rm -f "$(DEPDIR)/type_traits_unittest.Tpo"; exit 1; fi
686
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT type_traits_unittest.obj -MD -MP -MF $(DEPDIR)/type_traits_unittest.Tpo -c -o type_traits_unittest.obj `if test -f 'src/type_traits_unittest.cc'; then $(CYGPATH_W) 'src/type_traits_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/type_traits_unittest.cc'; fi`
687
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/type_traits_unittest.Tpo $(DEPDIR)/type_traits_unittest.Po
570
688
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/type_traits_unittest.cc' object='type_traits_unittest.obj' libtool=no @AMDEPBACKSLASH@
571
689
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
572
690
  @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o type_traits_unittest.obj `if test -f 'src/type_traits_unittest.cc'; then $(CYGPATH_W) 'src/type_traits_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/type_traits_unittest.cc'; fi`
573
- uninstall-info-am:
574
691
  install-dist_docDATA: $(dist_doc_DATA)
575
692
  @$(NORMAL_INSTALL)
576
- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
577
- @list='$(dist_doc_DATA)'; for p in $$list; do \
693
+ test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
694
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
695
+ for p in $$list; do \
578
696
  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
579
- f=$(am__strip_dir) \
580
- echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
581
- $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
697
+ echo "$$d$$p"; \
698
+ done | $(am__base_list) | \
699
+ while read files; do \
700
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
701
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
582
702
  done
583
703
 
584
704
  uninstall-dist_docDATA:
585
705
  @$(NORMAL_UNINSTALL)
586
- @list='$(dist_doc_DATA)'; for p in $$list; do \
587
- f=$(am__strip_dir) \
588
- echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
589
- rm -f "$(DESTDIR)$(docdir)/$$f"; \
706
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
707
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
708
+ test -n "$$files" || exit 0; \
709
+ echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
710
+ cd "$(DESTDIR)$(docdir)" && rm -f $$files
711
+ install-pkgconfigDATA: $(pkgconfig_DATA)
712
+ @$(NORMAL_INSTALL)
713
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
714
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
715
+ for p in $$list; do \
716
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
717
+ echo "$$d$$p"; \
718
+ done | $(am__base_list) | \
719
+ while read files; do \
720
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
721
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
590
722
  done
723
+
724
+ uninstall-pkgconfigDATA:
725
+ @$(NORMAL_UNINSTALL)
726
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
727
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
728
+ test -n "$$files" || exit 0; \
729
+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
730
+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
591
731
  install-googleincludeHEADERS: $(googleinclude_HEADERS)
592
732
  @$(NORMAL_INSTALL)
593
- test -z "$(googleincludedir)" || $(mkdir_p) "$(DESTDIR)$(googleincludedir)"
594
- @list='$(googleinclude_HEADERS)'; for p in $$list; do \
733
+ test -z "$(googleincludedir)" || $(MKDIR_P) "$(DESTDIR)$(googleincludedir)"
734
+ @list='$(googleinclude_HEADERS)'; test -n "$(googleincludedir)" || list=; \
735
+ for p in $$list; do \
595
736
  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
596
- f=$(am__strip_dir) \
597
- echo " $(googleincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(googleincludedir)/$$f'"; \
598
- $(googleincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(googleincludedir)/$$f"; \
737
+ echo "$$d$$p"; \
738
+ done | $(am__base_list) | \
739
+ while read files; do \
740
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(googleincludedir)'"; \
741
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(googleincludedir)" || exit $$?; \
599
742
  done
600
743
 
601
744
  uninstall-googleincludeHEADERS:
602
745
  @$(NORMAL_UNINSTALL)
603
- @list='$(googleinclude_HEADERS)'; for p in $$list; do \
604
- f=$(am__strip_dir) \
605
- echo " rm -f '$(DESTDIR)$(googleincludedir)/$$f'"; \
606
- rm -f "$(DESTDIR)$(googleincludedir)/$$f"; \
746
+ @list='$(googleinclude_HEADERS)'; test -n "$(googleincludedir)" || list=; \
747
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
748
+ test -n "$$files" || exit 0; \
749
+ echo " ( cd '$(DESTDIR)$(googleincludedir)' && rm -f" $$files ")"; \
750
+ cd "$(DESTDIR)$(googleincludedir)" && rm -f $$files
751
+ install-googleinternalincludeHEADERS: $(googleinternalinclude_HEADERS)
752
+ @$(NORMAL_INSTALL)
753
+ test -z "$(googleinternalincludedir)" || $(MKDIR_P) "$(DESTDIR)$(googleinternalincludedir)"
754
+ @list='$(googleinternalinclude_HEADERS)'; test -n "$(googleinternalincludedir)" || list=; \
755
+ for p in $$list; do \
756
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
757
+ echo "$$d$$p"; \
758
+ done | $(am__base_list) | \
759
+ while read files; do \
760
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(googleinternalincludedir)'"; \
761
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(googleinternalincludedir)" || exit $$?; \
607
762
  done
608
- install-nodist_sparsehashincludeHEADERS: $(nodist_sparsehashinclude_HEADERS)
763
+
764
+ uninstall-googleinternalincludeHEADERS:
765
+ @$(NORMAL_UNINSTALL)
766
+ @list='$(googleinternalinclude_HEADERS)'; test -n "$(googleinternalincludedir)" || list=; \
767
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
768
+ test -n "$$files" || exit 0; \
769
+ echo " ( cd '$(DESTDIR)$(googleinternalincludedir)' && rm -f" $$files ")"; \
770
+ cd "$(DESTDIR)$(googleinternalincludedir)" && rm -f $$files
771
+ install-internalincludeHEADERS: $(internalinclude_HEADERS)
609
772
  @$(NORMAL_INSTALL)
610
- test -z "$(sparsehashincludedir)" || $(mkdir_p) "$(DESTDIR)$(sparsehashincludedir)"
611
- @list='$(nodist_sparsehashinclude_HEADERS)'; for p in $$list; do \
773
+ test -z "$(internalincludedir)" || $(MKDIR_P) "$(DESTDIR)$(internalincludedir)"
774
+ @list='$(internalinclude_HEADERS)'; test -n "$(internalincludedir)" || list=; \
775
+ for p in $$list; do \
612
776
  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
613
- f=$(am__strip_dir) \
614
- echo " $(nodist_sparsehashincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(sparsehashincludedir)/$$f'"; \
615
- $(nodist_sparsehashincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(sparsehashincludedir)/$$f"; \
777
+ echo "$$d$$p"; \
778
+ done | $(am__base_list) | \
779
+ while read files; do \
780
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(internalincludedir)'"; \
781
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(internalincludedir)" || exit $$?; \
616
782
  done
617
783
 
618
- uninstall-nodist_sparsehashincludeHEADERS:
784
+ uninstall-internalincludeHEADERS:
619
785
  @$(NORMAL_UNINSTALL)
620
- @list='$(nodist_sparsehashinclude_HEADERS)'; for p in $$list; do \
621
- f=$(am__strip_dir) \
622
- echo " rm -f '$(DESTDIR)$(sparsehashincludedir)/$$f'"; \
623
- rm -f "$(DESTDIR)$(sparsehashincludedir)/$$f"; \
786
+ @list='$(internalinclude_HEADERS)'; test -n "$(internalincludedir)" || list=; \
787
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
788
+ test -n "$$files" || exit 0; \
789
+ echo " ( cd '$(DESTDIR)$(internalincludedir)' && rm -f" $$files ")"; \
790
+ cd "$(DESTDIR)$(internalincludedir)" && rm -f $$files
791
+ install-nodist_internalincludeHEADERS: $(nodist_internalinclude_HEADERS)
792
+ @$(NORMAL_INSTALL)
793
+ test -z "$(internalincludedir)" || $(MKDIR_P) "$(DESTDIR)$(internalincludedir)"
794
+ @list='$(nodist_internalinclude_HEADERS)'; test -n "$(internalincludedir)" || list=; \
795
+ for p in $$list; do \
796
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
797
+ echo "$$d$$p"; \
798
+ done | $(am__base_list) | \
799
+ while read files; do \
800
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(internalincludedir)'"; \
801
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(internalincludedir)" || exit $$?; \
624
802
  done
803
+
804
+ uninstall-nodist_internalincludeHEADERS:
805
+ @$(NORMAL_UNINSTALL)
806
+ @list='$(nodist_internalinclude_HEADERS)'; test -n "$(internalincludedir)" || list=; \
807
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
808
+ test -n "$$files" || exit 0; \
809
+ echo " ( cd '$(DESTDIR)$(internalincludedir)' && rm -f" $$files ")"; \
810
+ cd "$(DESTDIR)$(internalincludedir)" && rm -f $$files
625
811
  install-sparsehashincludeHEADERS: $(sparsehashinclude_HEADERS)
626
812
  @$(NORMAL_INSTALL)
627
- test -z "$(sparsehashincludedir)" || $(mkdir_p) "$(DESTDIR)$(sparsehashincludedir)"
628
- @list='$(sparsehashinclude_HEADERS)'; for p in $$list; do \
813
+ test -z "$(sparsehashincludedir)" || $(MKDIR_P) "$(DESTDIR)$(sparsehashincludedir)"
814
+ @list='$(sparsehashinclude_HEADERS)'; test -n "$(sparsehashincludedir)" || list=; \
815
+ for p in $$list; do \
629
816
  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
630
- f=$(am__strip_dir) \
631
- echo " $(sparsehashincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(sparsehashincludedir)/$$f'"; \
632
- $(sparsehashincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(sparsehashincludedir)/$$f"; \
817
+ echo "$$d$$p"; \
818
+ done | $(am__base_list) | \
819
+ while read files; do \
820
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(sparsehashincludedir)'"; \
821
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(sparsehashincludedir)" || exit $$?; \
633
822
  done
634
823
 
635
824
  uninstall-sparsehashincludeHEADERS:
636
825
  @$(NORMAL_UNINSTALL)
637
- @list='$(sparsehashinclude_HEADERS)'; for p in $$list; do \
638
- f=$(am__strip_dir) \
639
- echo " rm -f '$(DESTDIR)$(sparsehashincludedir)/$$f'"; \
640
- rm -f "$(DESTDIR)$(sparsehashincludedir)/$$f"; \
641
- done
826
+ @list='$(sparsehashinclude_HEADERS)'; test -n "$(sparsehashincludedir)" || list=; \
827
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
828
+ test -n "$$files" || exit 0; \
829
+ echo " ( cd '$(DESTDIR)$(sparsehashincludedir)' && rm -f" $$files ")"; \
830
+ cd "$(DESTDIR)$(sparsehashincludedir)" && rm -f $$files
642
831
 
643
832
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
644
833
  list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
645
834
  unique=`for i in $$list; do \
646
835
  if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
647
836
  done | \
648
- $(AWK) ' { files[$$0] = 1; } \
649
- END { for (i in files) print i; }'`; \
837
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
838
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
650
839
  mkid -fID $$unique
651
840
  tags: TAGS
652
841
 
653
842
  TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
654
843
  $(TAGS_FILES) $(LISP)
655
- tags=; \
844
+ set x; \
656
845
  here=`pwd`; \
657
846
  list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
658
847
  unique=`for i in $$list; do \
659
848
  if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
660
849
  done | \
661
- $(AWK) ' { files[$$0] = 1; } \
662
- END { for (i in files) print i; }'`; \
663
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
850
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
851
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
852
+ shift; \
853
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
664
854
  test -n "$$unique" || unique=$$empty_fix; \
665
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
666
- $$tags $$unique; \
855
+ if test $$# -gt 0; then \
856
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
857
+ "$$@" $$unique; \
858
+ else \
859
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
860
+ $$unique; \
861
+ fi; \
667
862
  fi
668
863
  ctags: CTAGS
669
864
  CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
670
865
  $(TAGS_FILES) $(LISP)
671
- tags=; \
672
- here=`pwd`; \
673
866
  list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
674
867
  unique=`for i in $$list; do \
675
868
  if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
676
869
  done | \
677
- $(AWK) ' { files[$$0] = 1; } \
678
- END { for (i in files) print i; }'`; \
679
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
870
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
871
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
872
+ test -z "$(CTAGS_ARGS)$$unique" \
680
873
  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
681
- $$tags $$unique
874
+ $$unique
682
875
 
683
876
  GTAGS:
684
877
  here=`$(am__cd) $(top_builddir) && pwd` \
685
- && cd $(top_srcdir) \
686
- && gtags -i $(GTAGS_ARGS) $$here
878
+ && $(am__cd) $(top_srcdir) \
879
+ && gtags -i $(GTAGS_ARGS) "$$here"
687
880
 
688
881
  distclean-tags:
689
882
  -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -691,7 +884,8 @@ distclean-tags:
691
884
  check-TESTS: $(TESTS)
692
885
  @failed=0; all=0; xfail=0; xpass=0; skip=0; \
693
886
  srcdir=$(srcdir); export srcdir; \
694
- list='$(TESTS)'; \
887
+ list=' $(TESTS) '; \
888
+ $(am__tty_colors); \
695
889
  if test -n "$$list"; then \
696
890
  for tst in $$list; do \
697
891
  if test -f ./$$tst; then dir=./; \
@@ -700,49 +894,63 @@ check-TESTS: $(TESTS)
700
894
  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
701
895
  all=`expr $$all + 1`; \
702
896
  case " $(XFAIL_TESTS) " in \
703
- *" $$tst "*) \
897
+ *[\ \ ]$$tst[\ \ ]*) \
704
898
  xpass=`expr $$xpass + 1`; \
705
899
  failed=`expr $$failed + 1`; \
706
- echo "XPASS: $$tst"; \
900
+ col=$$red; res=XPASS; \
707
901
  ;; \
708
902
  *) \
709
- echo "PASS: $$tst"; \
903
+ col=$$grn; res=PASS; \
710
904
  ;; \
711
905
  esac; \
712
906
  elif test $$? -ne 77; then \
713
907
  all=`expr $$all + 1`; \
714
908
  case " $(XFAIL_TESTS) " in \
715
- *" $$tst "*) \
909
+ *[\ \ ]$$tst[\ \ ]*) \
716
910
  xfail=`expr $$xfail + 1`; \
717
- echo "XFAIL: $$tst"; \
911
+ col=$$lgn; res=XFAIL; \
718
912
  ;; \
719
913
  *) \
720
914
  failed=`expr $$failed + 1`; \
721
- echo "FAIL: $$tst"; \
915
+ col=$$red; res=FAIL; \
722
916
  ;; \
723
917
  esac; \
724
918
  else \
725
919
  skip=`expr $$skip + 1`; \
726
- echo "SKIP: $$tst"; \
920
+ col=$$blu; res=SKIP; \
727
921
  fi; \
922
+ echo "$${col}$$res$${std}: $$tst"; \
728
923
  done; \
924
+ if test "$$all" -eq 1; then \
925
+ tests="test"; \
926
+ All=""; \
927
+ else \
928
+ tests="tests"; \
929
+ All="All "; \
930
+ fi; \
729
931
  if test "$$failed" -eq 0; then \
730
932
  if test "$$xfail" -eq 0; then \
731
- banner="All $$all tests passed"; \
933
+ banner="$$All$$all $$tests passed"; \
732
934
  else \
733
- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
935
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
936
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
734
937
  fi; \
735
938
  else \
736
939
  if test "$$xpass" -eq 0; then \
737
- banner="$$failed of $$all tests failed"; \
940
+ banner="$$failed of $$all $$tests failed"; \
738
941
  else \
739
- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
942
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
943
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
740
944
  fi; \
741
945
  fi; \
742
946
  dashes="$$banner"; \
743
947
  skipped=""; \
744
948
  if test "$$skip" -ne 0; then \
745
- skipped="($$skip tests were not run)"; \
949
+ if test "$$skip" -eq 1; then \
950
+ skipped="($$skip test was not run)"; \
951
+ else \
952
+ skipped="($$skip tests were not run)"; \
953
+ fi; \
746
954
  test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
747
955
  dashes="$$skipped"; \
748
956
  fi; \
@@ -753,52 +961,60 @@ check-TESTS: $(TESTS)
753
961
  dashes="$$report"; \
754
962
  fi; \
755
963
  dashes=`echo "$$dashes" | sed s/./=/g`; \
756
- echo "$$dashes"; \
964
+ if test "$$failed" -eq 0; then \
965
+ echo "$$grn$$dashes"; \
966
+ else \
967
+ echo "$$red$$dashes"; \
968
+ fi; \
757
969
  echo "$$banner"; \
758
970
  test -z "$$skipped" || echo "$$skipped"; \
759
971
  test -z "$$report" || echo "$$report"; \
760
- echo "$$dashes"; \
972
+ echo "$$dashes$$std"; \
761
973
  test "$$failed" -eq 0; \
762
974
  else :; fi
763
975
 
764
976
  distdir: $(DISTFILES)
765
977
  $(am__remove_distdir)
766
- mkdir $(distdir)
767
- $(mkdir_p) $(distdir)/doc $(distdir)/m4 $(distdir)/packages $(distdir)/packages/rpm $(distdir)/src $(distdir)/src/google $(distdir)/src/google/sparsehash $(distdir)/vsprojects/hashtable_test $(distdir)/vsprojects/libc_allocator_with_realloc_test $(distdir)/vsprojects/simple_test $(distdir)/vsprojects/sparsetable_unittest $(distdir)/vsprojects/time_hash_map $(distdir)/vsprojects/type_traits_unittest
768
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
769
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
770
- list='$(DISTFILES)'; for file in $$list; do \
771
- case $$file in \
772
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
773
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
774
- esac; \
978
+ test -d "$(distdir)" || mkdir "$(distdir)"
979
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
980
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
981
+ list='$(DISTFILES)'; \
982
+ dist_files=`for file in $$list; do echo $$file; done | \
983
+ sed -e "s|^$$srcdirstrip/||;t" \
984
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
985
+ case $$dist_files in \
986
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
987
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
988
+ sort -u` ;; \
989
+ esac; \
990
+ for file in $$dist_files; do \
775
991
  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
776
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
777
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
778
- dir="/$$dir"; \
779
- $(mkdir_p) "$(distdir)$$dir"; \
780
- else \
781
- dir=''; \
782
- fi; \
783
992
  if test -d $$d/$$file; then \
993
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
994
+ if test -d "$(distdir)/$$file"; then \
995
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
996
+ fi; \
784
997
  if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
785
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
998
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
999
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
786
1000
  fi; \
787
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1001
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
788
1002
  else \
789
- test -f $(distdir)/$$file \
790
- || cp -p $$d/$$file $(distdir)/$$file \
1003
+ test -f "$(distdir)/$$file" \
1004
+ || cp -p $$d/$$file "$(distdir)/$$file" \
791
1005
  || exit 1; \
792
1006
  fi; \
793
1007
  done
794
1008
  $(MAKE) $(AM_MAKEFLAGS) \
795
1009
  top_distdir="$(top_distdir)" distdir="$(distdir)" \
796
1010
  dist-hook
797
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
1011
+ -test -n "$(am__skip_mode_fix)" \
1012
+ || find "$(distdir)" -type d ! -perm -755 \
1013
+ -exec chmod u+rwx,go+rx {} \; -o \
798
1014
  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
799
1015
  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
800
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
801
- || chmod -R a+r $(distdir)
1016
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1017
+ || chmod -R a+r "$(distdir)"
802
1018
  dist-gzip: distdir
803
1019
  tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
804
1020
  $(am__remove_distdir)
@@ -807,6 +1023,14 @@ dist-bzip2: distdir
807
1023
  tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
808
1024
  $(am__remove_distdir)
809
1025
 
1026
+ dist-lzma: distdir
1027
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
1028
+ $(am__remove_distdir)
1029
+
1030
+ dist-xz: distdir
1031
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
1032
+ $(am__remove_distdir)
1033
+
810
1034
  dist-tarZ: distdir
811
1035
  tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
812
1036
  $(am__remove_distdir)
@@ -831,13 +1055,17 @@ dist dist-all: distdir
831
1055
  distcheck: dist
832
1056
  case '$(DIST_ARCHIVES)' in \
833
1057
  *.tar.gz*) \
834
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
1058
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
835
1059
  *.tar.bz2*) \
836
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
1060
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1061
+ *.tar.lzma*) \
1062
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
1063
+ *.tar.xz*) \
1064
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
837
1065
  *.tar.Z*) \
838
1066
  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
839
1067
  *.shar.gz*) \
840
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
1068
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
841
1069
  *.zip*) \
842
1070
  unzip $(distdir).zip ;;\
843
1071
  esac
@@ -845,9 +1073,11 @@ distcheck: dist
845
1073
  mkdir $(distdir)/_build
846
1074
  mkdir $(distdir)/_inst
847
1075
  chmod a-w $(distdir)
1076
+ test -d $(distdir)/_build || exit 0; \
848
1077
  dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
849
1078
  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
850
- && cd $(distdir)/_build \
1079
+ && am__cwd=`pwd` \
1080
+ && $(am__cd) $(distdir)/_build \
851
1081
  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
852
1082
  $(DISTCHECK_CONFIGURE_FLAGS) \
853
1083
  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -869,13 +1099,15 @@ distcheck: dist
869
1099
  && rm -rf "$$dc_destdir" \
870
1100
  && $(MAKE) $(AM_MAKEFLAGS) dist \
871
1101
  && rm -rf $(DIST_ARCHIVES) \
872
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
1102
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
1103
+ && cd "$$am__cwd" \
1104
+ || exit 1
873
1105
  $(am__remove_distdir)
874
1106
  @(echo "$(distdir) archives ready for distribution: "; \
875
1107
  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
876
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
1108
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
877
1109
  distuninstallcheck:
878
- @cd $(distuninstallcheck_dir) \
1110
+ @$(am__cd) '$(distuninstallcheck_dir)' \
879
1111
  && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
880
1112
  || { echo "ERROR: files left after uninstall:" ; \
881
1113
  if test -n "$(DESTDIR)"; then \
@@ -899,8 +1131,8 @@ check: $(BUILT_SOURCES)
899
1131
  $(MAKE) $(AM_MAKEFLAGS) check-am
900
1132
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
901
1133
  installdirs:
902
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(googleincludedir)" "$(DESTDIR)$(sparsehashincludedir)" "$(DESTDIR)$(sparsehashincludedir)"; do \
903
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
1134
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(googleincludedir)" "$(DESTDIR)$(googleinternalincludedir)" "$(DESTDIR)$(internalincludedir)" "$(DESTDIR)$(internalincludedir)" "$(DESTDIR)$(sparsehashincludedir)"; do \
1135
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
904
1136
  done
905
1137
  install: $(BUILT_SOURCES)
906
1138
  $(MAKE) $(AM_MAKEFLAGS) install-am
@@ -924,6 +1156,7 @@ clean-generic:
924
1156
 
925
1157
  distclean-generic:
926
1158
  -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1159
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
927
1160
 
928
1161
  maintainer-clean-generic:
929
1162
  @echo "This command is intended for maintainers to use"
@@ -947,20 +1180,42 @@ dvi-am:
947
1180
 
948
1181
  html: html-am
949
1182
 
1183
+ html-am:
1184
+
950
1185
  info: info-am
951
1186
 
952
1187
  info-am:
953
1188
 
954
1189
  install-data-am: install-dist_docDATA install-googleincludeHEADERS \
955
- install-nodist_sparsehashincludeHEADERS \
1190
+ install-googleinternalincludeHEADERS \
1191
+ install-internalincludeHEADERS \
1192
+ install-nodist_internalincludeHEADERS install-pkgconfigDATA \
956
1193
  install-sparsehashincludeHEADERS
957
1194
 
1195
+ install-dvi: install-dvi-am
1196
+
1197
+ install-dvi-am:
1198
+
958
1199
  install-exec-am: install-libLTLIBRARIES
959
1200
 
1201
+ install-html: install-html-am
1202
+
1203
+ install-html-am:
1204
+
960
1205
  install-info: install-info-am
961
1206
 
1207
+ install-info-am:
1208
+
962
1209
  install-man:
963
1210
 
1211
+ install-pdf: install-pdf-am
1212
+
1213
+ install-pdf-am:
1214
+
1215
+ install-ps: install-ps-am
1216
+
1217
+ install-ps-am:
1218
+
964
1219
  installcheck-am:
965
1220
 
966
1221
  maintainer-clean: maintainer-clean-am
@@ -983,30 +1238,38 @@ ps: ps-am
983
1238
  ps-am:
984
1239
 
985
1240
  uninstall-am: uninstall-dist_docDATA uninstall-googleincludeHEADERS \
986
- uninstall-info-am uninstall-libLTLIBRARIES \
987
- uninstall-nodist_sparsehashincludeHEADERS \
988
- uninstall-sparsehashincludeHEADERS
1241
+ uninstall-googleinternalincludeHEADERS \
1242
+ uninstall-internalincludeHEADERS uninstall-libLTLIBRARIES \
1243
+ uninstall-nodist_internalincludeHEADERS \
1244
+ uninstall-pkgconfigDATA uninstall-sparsehashincludeHEADERS
1245
+
1246
+ .MAKE: all check check-am install install-am install-strip
989
1247
 
990
1248
  .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
991
1249
  clean clean-generic clean-libLTLIBRARIES clean-noinstPROGRAMS \
992
- ctags dist dist-all dist-bzip2 dist-gzip dist-hook dist-shar \
993
- dist-tarZ dist-zip distcheck distclean distclean-compile \
994
- distclean-generic distclean-hdr distclean-tags distcleancheck \
995
- distdir distuninstallcheck dvi dvi-am html html-am info \
996
- info-am install install-am install-data install-data-am \
997
- install-dist_docDATA install-exec install-exec-am \
998
- install-googleincludeHEADERS install-info install-info-am \
999
- install-libLTLIBRARIES install-man \
1000
- install-nodist_sparsehashincludeHEADERS \
1250
+ ctags dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \
1251
+ dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
1252
+ distclean-compile distclean-generic distclean-hdr \
1253
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
1254
+ dvi-am html html-am info info-am install install-am \
1255
+ install-data install-data-am install-dist_docDATA install-dvi \
1256
+ install-dvi-am install-exec install-exec-am \
1257
+ install-googleincludeHEADERS \
1258
+ install-googleinternalincludeHEADERS install-html \
1259
+ install-html-am install-info install-info-am \
1260
+ install-internalincludeHEADERS install-libLTLIBRARIES \
1261
+ install-man install-nodist_internalincludeHEADERS install-pdf \
1262
+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
1001
1263
  install-sparsehashincludeHEADERS install-strip installcheck \
1002
1264
  installcheck-am installdirs maintainer-clean \
1003
1265
  maintainer-clean-generic mostlyclean mostlyclean-compile \
1004
1266
  mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
1005
1267
  uninstall-am uninstall-dist_docDATA \
1006
- uninstall-googleincludeHEADERS uninstall-info-am \
1007
- uninstall-libLTLIBRARIES \
1008
- uninstall-nodist_sparsehashincludeHEADERS \
1009
- uninstall-sparsehashincludeHEADERS
1268
+ uninstall-googleincludeHEADERS \
1269
+ uninstall-googleinternalincludeHEADERS \
1270
+ uninstall-internalincludeHEADERS uninstall-libLTLIBRARIES \
1271
+ uninstall-nodist_internalincludeHEADERS \
1272
+ uninstall-pkgconfigDATA uninstall-sparsehashincludeHEADERS
1010
1273
 
1011
1274
 
1012
1275
  # All our .h files need to read the config information in config.h. The
@@ -1015,12 +1278,12 @@ uninstall-am: uninstall-dist_docDATA uninstall-googleincludeHEADERS \
1015
1278
  # Thus, we create a "minimal" config.h, called sparseconfig.h, that
1016
1279
  # includes only the #defines we really need, and that are unlikely to
1017
1280
  # change from system to system. NOTE: The awk command is equivalent to
1018
- # fgrep -B2 -f- $(top_builddir)/src/config.h \
1019
- # fgrep -vx -e -- > _sparsehash_config
1281
+ # fgrep -B2 -f$(top_builddir)/src/config.h.include $(top_builddir)/src/config.h
1282
+ # | fgrep -vx -e -- > _sparsehash_config
1020
1283
  # For correctness, it depends on the fact config.h.include does not have
1021
1284
  # any lines starting with #.
1022
- src/google/sparsehash/sparseconfig.h: $(top_builddir)/src/config.h \
1023
- $(top_srcdir)/src/config.h.include
1285
+ src/sparsehash/internal/sparseconfig.h: $(top_builddir)/src/config.h \
1286
+ $(top_srcdir)/src/config.h.include
1024
1287
  [ -d $(@D) ] || mkdir -p $(@D)
1025
1288
  echo "/*" > $(@D)/_sparsehash_config
1026
1289
  echo " * NOTE: This file is for internal use only." >> $(@D)/_sparsehash_config
@@ -1045,10 +1308,29 @@ rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
1045
1308
  deb: dist-gzip packages/deb.sh packages/deb/*
1046
1309
  @cd packages && ./deb.sh ${PACKAGE} ${VERSION}
1047
1310
 
1311
+ # I get the description and URL lines from the rpm spec. I use sed to
1312
+ # try to rewrite exec_prefix, libdir, and includedir in terms of
1313
+ # prefix, if possible.
1314
+ lib${PACKAGE}.pc: Makefile packages/rpm/rpm.spec
1315
+ echo 'prefix=$(prefix)' > "$@".tmp
1316
+ echo 'exec_prefix='`echo '$(exec_prefix)' | sed 's@^$(prefix)@$${prefix}@'` >> "$@".tmp
1317
+ echo 'libdir='`echo '$(libdir)' | sed 's@^$(exec_prefix)@$${exec_prefix}@'` >> "$@".tmp
1318
+ echo 'includedir='`echo '$(includedir)' | sed 's@^$(prefix)@$${prefix}@'` >> "$@".tmp
1319
+ echo '' >> "$@".tmp
1320
+ echo 'Name: $(PACKAGE)' >> "$@".tmp
1321
+ echo 'Version: $(VERSION)' >> "$@".tmp
1322
+ -grep '^Summary:' $(top_srcdir)/packages/rpm/rpm.spec | sed s/^Summary:/Description:/ | head -n1 >> "$@".tmp
1323
+ -grep '^URL: ' $(top_srcdir)/packages/rpm/rpm.spec >> "$@".tmp
1324
+ echo 'Requires:' >> "$@".tmp
1325
+ echo 'Libs:' >> "$@".tmp
1326
+ echo 'Cflags: -I$${includedir}' >> "$@".tmp
1327
+ mv -f "$@".tmp "$@"
1328
+
1048
1329
  # Windows wants write permission to .vcproj files and maybe even sln files.
1049
1330
  dist-hook:
1050
1331
  test -e "$(distdir)/vsprojects" \
1051
1332
  && chmod -R u+w $(distdir)/*.sln $(distdir)/vsprojects/
1333
+
1052
1334
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
1053
1335
  # Otherwise a system limit (for SysV at least) may be exceeded.
1054
1336
  .NOEXPORT: