diff options
| author | <shinichiro.hamaji@gmail.com> | 2009-07-08 15:30:26 +0000 |
|---|---|---|
| committer | <shinichiro.hamaji@gmail.com> | 2009-07-08 15:30:26 +0000 |
| commit | f0f26f1ee0925c90f5c7358f6bbf169ccafc87a7 (patch) | |
| tree | 5e50e016ac57e981c4baf4ae15ef40a2ee6985d8 | |
| parent | 5f9c97a33c2864a0da28dba8f054881aa3afd1ae (diff) | |
| download | glog-f0f26f1ee0925c90f5c7358f6bbf169ccafc87a7.tar.gz glog-f0f26f1ee0925c90f5c7358f6bbf169ccafc87a7.tar.bz2 glog-f0f26f1ee0925c90f5c7358f6bbf169ccafc87a7.zip | |
Utilize AM_CXXFLAGS.
git-svn-id: https://google-glog.googlecode.com/svn/trunk@53 eb4d4688-79bd-11dd-afb4-1d65580434c0
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index d9fde84..fbf6b93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,7 @@ lib_LTLIBRARIES = # The libraries libglog depends on. COMMON_LIBS = $(PTHREAD_LIBS) $(GFLAGS_LIBS) $(UNWIND_LIBS) # Compile switches for our unittest. -TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) $(GFLAGS_CFLAGS) +TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) $(GFLAGS_CFLAGS) $(AM_CXXFLAGS) # Libraries for our unittest. TEST_LIBS = $(GTEST_LIBS) $(GMOCK_LIBS) $(GFLAGS_LIBS) @@ -191,7 +191,7 @@ libglog_la_SOURCES = $(gloginclude_HEADERS) \ src/base/commandlineflags.h src/googletest.h nodist_libglog_la_SOURCES = $(nodist_gloginclude_HEADERS) -libglog_la_CXXFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_CFLAGS) -DNDEBUG +libglog_la_CXXFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_CFLAGS) $(AM_CXXFLAGS) -DNDEBUG libglog_la_LDFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_LDFLAGS) libglog_la_LIBADD = $(COMMON_LIBS) diff --git a/Makefile.in b/Makefile.in index eb12de9..3988e28 100644 --- a/Makefile.in +++ b/Makefile.in @@ -457,7 +457,7 @@ lib_LTLIBRARIES = libglog.la # The libraries libglog depends on. COMMON_LIBS = $(PTHREAD_LIBS) $(GFLAGS_LIBS) $(UNWIND_LIBS) # Compile switches for our unittest. -TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) $(GFLAGS_CFLAGS) +TEST_CFLAGS = $(GTEST_CFLAGS) $(GMOCK_CFLAGS) $(GFLAGS_CFLAGS) $(AM_CXXFLAGS) # Libraries for our unittest. TEST_LIBS = $(GTEST_LIBS) $(GMOCK_LIBS) $(GFLAGS_LIBS) TESTS_ENVIRONMENT = @@ -564,7 +564,7 @@ libglog_la_SOURCES = $(gloginclude_HEADERS) \ src/base/commandlineflags.h src/googletest.h nodist_libglog_la_SOURCES = $(nodist_gloginclude_HEADERS) -libglog_la_CXXFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_CFLAGS) -DNDEBUG +libglog_la_CXXFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_CFLAGS) $(AM_CXXFLAGS) -DNDEBUG libglog_la_LDFLAGS = $(PTRHEAD_CFLAGS) $(GFLAGS_LDFLAGS) libglog_la_LIBADD = $(COMMON_LIBS) WINDOWS_PROJECTS = google-glog.sln vsprojects/libglog/libglog.vcproj \ |