| OLD | NEW |
|---|
| 1 # Automake file |
| 2 |
| 1 # Nonstandard package files for distribution. | 3 # Nonstandard package files for distribution. |
| 2 EXTRA_DIST = | 4 EXTRA_DIST = |
| 3 | 5 |
| 4 # We may need to build our internally packaged gtest. If so, it will be | 6 # We may need to build our internally packaged gtest. If so, it will be |
| 5 # included in the 'subdirs' variable. | 7 # included in the 'subdirs' variable. |
| 6 SUBDIRS = $(subdirs) | 8 SUBDIRS = $(subdirs) |
| 7 | 9 |
| 8 # Scripts and utilities to be installed by 'make install'. | 10 # Scripts and utilities to be installed by 'make install'. |
| 9 dist_bin_SCRIPTS = scripts/gmock_doctor.py | 11 dist_bin_SCRIPTS = scripts/gmock_doctor.py |
| 10 bin_SCRIPTS = scripts/gmock-config | 12 bin_SCRIPTS = scripts/gmock-config |
| 11 | 13 |
| 12 # This is generated by the configure script, so clean it for distribution. | 14 # This is generated by the configure script, so clean it for distribution. |
| 13 DISTCLEANFILES = scripts/gmock-config | 15 DISTCLEANFILES = scripts/gmock-config |
| 14 | 16 |
| 15 # We define the global AM_CPPFLAGS as everything we compile includes from these | 17 # We define the global AM_CPPFLAGS as everything we compile includes from these |
| 16 # directories. | 18 # directories. |
| 17 AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I$(srcdir)/include | 19 AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I$(srcdir)/include |
| 18 | 20 |
| 21 # Modifies compiler and linker flags for pthreads compatibility. |
| 22 if HAVE_PTHREADS |
| 23 AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1 |
| 24 AM_LIBS = @PTHREAD_LIBS@ |
| 25 endif |
| 26 |
| 19 # Build rules for libraries. | 27 # Build rules for libraries. |
| 20 lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la | 28 lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la |
| 21 | 29 |
| 22 lib_libgmock_la_SOURCES = src/gmock-all.cc | 30 lib_libgmock_la_SOURCES = src/gmock-all.cc |
| 23 | 31 |
| 24 pkginclude_HEADERS = include/gmock/gmock.h \ | 32 pkginclude_HEADERS = include/gmock/gmock.h \ |
| 25 include/gmock/gmock-actions.h \ | 33 include/gmock/gmock-actions.h \ |
| 26 include/gmock/gmock-cardinalities.h \ | 34 include/gmock/gmock-cardinalities.h \ |
| 27 include/gmock/gmock-generated-actions.h \ | 35 include/gmock/gmock-generated-actions.h \ |
| 28 include/gmock/gmock-generated-function-mockers.h \ | 36 include/gmock/gmock-generated-function-mockers.h \ |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 | 145 |
| 138 # Microsoft Visual Studio 2005 projects. | 146 # Microsoft Visual Studio 2005 projects. |
| 139 EXTRA_DIST += \ | 147 EXTRA_DIST += \ |
| 140 msvc/gmock.sln \ | 148 msvc/gmock.sln \ |
| 141 msvc/gmock.vcproj \ | 149 msvc/gmock.vcproj \ |
| 142 msvc/gmock_config.vsprops \ | 150 msvc/gmock_config.vsprops \ |
| 143 msvc/gmock_link_test.vcproj \ | 151 msvc/gmock_link_test.vcproj \ |
| 144 msvc/gmock_main.vcproj \ | 152 msvc/gmock_main.vcproj \ |
| 145 msvc/gmock-spec-builders_test.vcproj \ | 153 msvc/gmock-spec-builders_test.vcproj \ |
| 146 msvc/gmock_test.vcproj | 154 msvc/gmock_test.vcproj |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1151006:
Update to current gtest/gmock. (Closed)
