kopia lustrzana https://github.com/ukhas/habitat-cpp-connector
Compile using official libjsoncpp0.6 debian pkg
rodzic
c66111a278
commit
276e0702d2
10
Makefile
10
Makefile
|
@ -2,9 +2,13 @@
|
||||||
# -*- makefile -*-
|
# -*- makefile -*-
|
||||||
# Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see LICENSE.
|
# Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see LICENSE.
|
||||||
|
|
||||||
CFLAGS = -pthread -O2 -Wall -Werror -pedantic -Wno-variadic-macros -Isrc
|
jsoncpp_cflags := $(shell pkg-config --cflags jsoncpp)
|
||||||
upl_libs = -pthread -ljsoncpp -lcurl -lssl
|
jsoncpp_libs := $(shell pkg-config --libs jsoncpp)
|
||||||
ext_libs = -ljsoncpp
|
|
||||||
|
CFLAGS = -pthread -O2 -Wall -Werror -pedantic -Wno-long-long \
|
||||||
|
-Wno-variadic-macros -Isrc $(jsoncpp_cflags)
|
||||||
|
upl_libs = -pthread $(jsoncpp_libs) -lcurl -lssl
|
||||||
|
ext_libs = $(jsoncpp_libs)
|
||||||
|
|
||||||
test_py_files = tests/test_uploader.py tests/test_extractor.py
|
test_py_files = tests/test_uploader.py tests/test_extractor.py
|
||||||
headers = src/CouchDB.h src/EZ.h src/Uploader.h src/UploaderThread.h \
|
headers = src/CouchDB.h src/EZ.h src/Uploader.h src/UploaderThread.h \
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#ifndef HABITAT_COUCHDB_H
|
#ifndef HABITAT_COUCHDB_H
|
||||||
#define HABITAT_COUCHDB_H
|
#define HABITAT_COUCHDB_H
|
||||||
|
|
||||||
#include <jsoncpp/json.h>
|
#include <json/json.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#define HABITAT_EXTRACTOR_H
|
#define HABITAT_EXTRACTOR_H
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <jsoncpp/json.h>
|
#include <json/json.h>
|
||||||
#include "UploaderThread.h"
|
#include "UploaderThread.h"
|
||||||
#include "EZ.h"
|
#include "EZ.h"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see COPYING. */
|
/* Copyright 2011 (C) Daniel Richman. License: GNU GPL 3; see COPYING. */
|
||||||
|
|
||||||
#include "UKHASExtractor.h"
|
#include "UKHASExtractor.h"
|
||||||
#include <jsoncpp/json.h>
|
#include <json/json.h>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <jsoncpp/json.h>
|
#include <json/json.h>
|
||||||
#include "EZ.h"
|
#include "EZ.h"
|
||||||
#include "CouchDB.h"
|
#include "CouchDB.h"
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "EZ.h"
|
#include "EZ.h"
|
||||||
#include "Uploader.h"
|
#include "Uploader.h"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <jsoncpp/json.h>
|
#include <json/json.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <jsoncpp/json.h>
|
#include <json/json.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "Extractor.h"
|
#include "Extractor.h"
|
||||||
|
|
|
@ -38,7 +38,7 @@ public:
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <jsoncpp/json.h>
|
#include <json/json.h>
|
||||||
|
|
||||||
namespace habitat {
|
namespace habitat {
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue