Skip to content

Commit

Permalink
Don't try to add gtest sources to dist tarball
Browse files Browse the repository at this point in the history
  • Loading branch information
@bblough
bblough committed Jan 17, 2020
1 parent 2eee4d2 commit 07ea39c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions axiom/gtest/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

noinst_LIBRARIES = libgtest.a libgtest_main.a

libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
nodist_libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
libgtest_a_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_a_CXXFLAGS = -g -Wall -Wextra
libgtest_a_LDFLAGS = -pthread

libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
nodist_libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
libgtest_main_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_main_a_CXXFLAGS = -g -Wall -Wextra
libgtest_main_LDFLAGS = -pthread
Expand Down
6 changes: 4 additions & 2 deletions gtest/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@

noinst_LIBRARIES = libgtest.a libgtest_main.a

libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
nodist_libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc

libgtest_a_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_a_CXXFLAGS = -g -Wall -Wextra
libgtest_a_LDFLAGS = -pthread

libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
nodist_libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc

libgtest_main_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_main_a_CXXFLAGS = -g -Wall -Wextra
libgtest_main_LDFLAGS = -pthread
Expand Down
4 changes: 2 additions & 2 deletions guththila/gtest/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

noinst_LIBRARIES = libgtest.a libgtest_main.a

libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
nodist_libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
libgtest_a_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_a_CXXFLAGS = -g -Wall -Wextra
libgtest_a_LDFLAGS = -pthread

libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
nodist_libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
libgtest_main_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_main_a_CXXFLAGS = -g -Wall -Wextra
libgtest_main_LDFLAGS = -pthread
Expand Down
4 changes: 2 additions & 2 deletions neethi/gtest/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

noinst_LIBRARIES = libgtest.a libgtest_main.a

libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
nodist_libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
libgtest_a_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_a_CXXFLAGS = -g -Wall -Wextra
libgtest_a_LDFLAGS = -pthread

libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
nodist_libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
libgtest_main_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_main_a_CXXFLAGS = -g -Wall -Wextra
libgtest_main_LDFLAGS = -pthread
Expand Down
4 changes: 2 additions & 2 deletions util/gtest/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

noinst_LIBRARIES = libgtest.a libgtest_main.a

libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
nodist_libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
libgtest_a_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_a_CXXFLAGS = -g -Wall -Wextra
libgtest_a_LDFLAGS = -pthread

libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
nodist_libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
libgtest_main_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
libgtest_main_a_CXXFLAGS = -g -Wall -Wextra
libgtest_main_LDFLAGS = -pthread
Expand Down

0 comments on commit 07ea39c

Please sign in to comment.