Browse Source

Fix Makefile again

JSON-80
Damiano Boppart 4 years ago
parent
commit
e4b5ce8850
3 changed files with 6 additions and 1 deletions
  1. +1
    -0
      .hgignore
  2. +1
    -1
      README.md
  3. +4
    -0
      server/Makefile

+ 1
- 0
.hgignore View File

@ -45,6 +45,7 @@ libevent-*-stable/build/
server/pep-json-server
server/servertest
server/unittests
server/*.a
server/prefix-config.cc
server/local.conf


+ 1
- 1
README.md View File

@ -54,7 +54,7 @@ make install
### Build and install the JSON server
~~~~~
cd cd ~/code/json-ad/server
cd ~/code/json-ad/server
~~~~~
Edit the build configuration to your needs in `./Makefile.conf`, or create a


+ 4
- 0
server/Makefile View File

@ -84,6 +84,8 @@ $(TARGET)-static: main.o libjson-adapter.a
$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -static -o $@
$(TARGET_TEST): servertest.o libjson-adapter.a
$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o $@
$(TARGET_GTEST): unittest_json.o gtest-all.o gtest_main.o libjson-adapter.a
$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o $@
@ -94,6 +96,8 @@ prefix-config.cc:
echo '// This file is generated by make. Edit the Makefile, not this file!\n#include "prefix-config.hh" \nconst char* const html_directory = "'$(HTML_DIRECTORY)'";\n' > $@
gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -o $@ -c $<
gtest_main.o: $(GTEST_DIR)/src/gtest_main.cc
$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -o $@ -c $<


Loading…
Cancel
Save