merge double head

JSON-35
Roker 6 years ago
commit 9d1ddf0ea3

@ -3,7 +3,7 @@
# install all stuff into $(PREFIX)/pEp/json-adapter/
PREFIX = /usr/local
PREFIX = $(HOME)
HTML_DIRECTORY = $(PREFIX)/share/pEp/json-adapter/html
CXX = c++ -std=c++11 -Wall -O0 -g -fstack-protector-all
@ -36,11 +36,11 @@ endif
all: pep-json-server servertest
pep-json-server: main.o libjson-adapter.a
$(CXX) -o $@ $^ ../../pEpEngine/asn.1/libasn1.a $(LDFLAGS)
$(CXX) -o $@ $^ $(LDFLAGS)
pep-json-server-static: main.o libjson-adapter.a
$(CXX) -static -o $@ $^ ../../pEpEngine/asn.1/libasn1.a $(LDFLAGS)
$(CXX) -static -o $@ $^ $(LDFLAGS)
servertest: servertest.o
@ -60,7 +60,7 @@ libjson-adapter.a: \
ar rcs $@ $^
prefix-config.cc: Makefile
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' > $@
echo -e '// 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' > $@
%.o : %.cc %.hh Makefile
$(CXX) $(CXXFLAGS) -c $<

Loading…
Cancel
Save