Commit 5ffbcad3 authored by Swann Perarnau's avatar Swann Perarnau

[refactor] Move third party code to its own dir

Jsonxx is an import of a third party code, with its own license. While
the licenses are compatible, moving that code to its own directory make
it easier to identify it as foreign.

This commit also remove the extra copy of the code that was in the
repository, and update the relevant Makefile rules.
parent 019687da
......@@ -21,7 +21,7 @@ CXX_SOURCES=argo_nodeos_config.cpp config_reader.cpp node_settup_changer.cpp
string_parser.cpp\
int_list_parser.cpp\
nodeos_exceptions.cpp\
jsonxx.cc
thirdparty/jsonxx/jsonxx.cc
CXX_HEADERS=config_reader.hpp node_setup_changer.hpp node_setup_reader.hpp \
argo_container.hpp container_manager.hpp utils.hpp acl.cpp \
......@@ -35,18 +35,18 @@ CXX_HEADERS=config_reader.hpp node_setup_changer.hpp node_setup_reader.hpp \
int_list_parser.hpp\
nodeos_exceptions.hpp\
resource_ownership.hpp\
jsonxx.h
thirdparty/jsonxx/jsonxx.h
OBJECTS=argo_nodeos_config.o config_reader.o node_settup_changer.o node_setup_reader.o \
argo_container.o utils.o container_manager.o acl.o ilogger.o stderrlogger.o\
syslogger.o filelogger.o aggregatelogger.o log_option_parser.o \
resource_locker.o trace.o \
iresource_controller.cpp\
iresource_controller_status.cpp\
iresource_controller.o\
iresource_controller_status.o\
string_parser.o\
int_list_parser.o\
nodeos_exceptions.o\
jsonxx.o
thirdparty/jsonxx/jsonxx.o
%.o: %.c %.h
$(CC) $(CFLAGS) -c $<
......@@ -62,7 +62,7 @@ $(BIN): $(OBJECTS)
chmod u+s $(BIN)
clean:
rm -f *.o $(BIN)
rm -f $(OBJECTS) $(BIN)
# DO NOT DELETE
argo_nodeos_config.o: headers.hpp acl.hpp utils.hpp /usr/include/sys/types.h
......@@ -450,9 +450,9 @@ int_list_parser.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h
int_list_parser.o: common.hpp /usr/include/sys/stat.h defaults.hpp
int_list_parser.o: /usr/include/syslog.h /usr/include/sys/syslog.h
int_list_parser.o: /usr/include/bits/syslog-path.h nodeos_exceptions.hpp
jsonxx.o: jsonxx.h /usr/include/stdio.h /usr/include/features.h
jsonxx.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h
jsonxx.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
jsonxx.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
jsonxx.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
jsonxx.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
thirdparty/jsonxx/jsonxx.o: thirdparty/jsonxx/jsonxx.h /usr/include/stdio.h /usr/include/features.h
thirdparty/jsonxx/jsonxx.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h
thirdparty/jsonxx/jsonxx.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
thirdparty/jsonxx/jsonxx.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
thirdparty/jsonxx/jsonxx.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
thirdparty/jsonxx/jsonxx.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
jsonxx_test
*.o
*~
CXXFLAGS=-Werror -Wall -g
jsonxx_test: jsonxx_test.cc jsonxx.o
jsonxx.o: jsonxx.h jsonxx.cc
test: jsonxx_test
./jsonxx_test
.PHONY: clean
clean:
rm -f jsonxx_test *.o *~
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment