Move sources to lib/zstd/

This commit is contained in:
Nick Terrell 2017-04-04 16:30:11 -07:00
parent 1af700ea43
commit fd95be0ade
18 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
IFLAGS := -isystem include/ -I ../include/ -I ../lib/ -isystem googletest/googletest/include IFLAGS := -isystem include/ -I ../include/ -I ../lib/zstd/ -isystem googletest/googletest/include
SOURCES := $(wildcard ../lib/*.c) SOURCES := $(wildcard ../lib/zstd/*.c)
OBJECTS := $(patsubst %.c,%.o,$(SOURCES)) OBJECTS := $(patsubst %.c,%.o,$(SOURCES))
ARFLAGS := rcs ARFLAGS := rcs
@ -9,10 +9,10 @@ CXXFLAGS += -std=c++11
CFLAGS += -g -O0 CFLAGS += -g -O0
CPPFLAGS += $(IFLAGS) CPPFLAGS += $(IFLAGS)
../lib/libzstd.a: $(OBJECTS) ../lib/zstd/libzstd.a: $(OBJECTS)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $^
UserlandTest: UserlandTest.cpp ../lib/libzstd.a UserlandTest: UserlandTest.cpp ../lib/zstd/libzstd.a
$(CXX) $(CXXFLAGS) $(CFLAGS) $(CPPFLAGS) $^ googletest/build/googlemock/gtest/libgtest.a googletest/build/googlemock/gtest/libgtest_main.a -o $@ $(CXX) $(CXXFLAGS) $(CFLAGS) $(CPPFLAGS) $^ googletest/build/googlemock/gtest/libgtest.a googletest/build/googlemock/gtest/libgtest_main.a -o $@
# Install googletest # Install googletest
@ -24,4 +24,4 @@ googletest:
@cd googletest/build && cmake .. && $(MAKE) @cd googletest/build && cmake .. && $(MAKE)
clean: clean:
$(RM) -f *.{o,a} ../lib/*.{o,a} $(RM) -f *.{o,a} ../lib/zstd/*.{o,a}