Merge branch 'master' of bitbucket.org:ckolivas/ckpool

10 years ago · 82be9e2cea
6 changed files with 12104 additions and 11547 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -21,6 +21,7 @@ notifier_LDADD = libckpool.la @JANSSON_LIBS@
 if WANT_CKDB
 bin_PROGRAMS += ckdb
-ckdb_SOURCES = ckdb.c klist.c ktree.c klist.h ktree.h
+ckdb_SOURCES = ckdb.c ckdb_cmd.c ckdb_data.c ckdb_dbio.c ckdb.h \
 	       klist.c ktree.c klist.h ktree.h
 ckdb_LDADD = libckpool.la @JANSSON_LIBS@ @PQ_LIBS@
 endif
--- a/src/ckdb.c
+++ b/src/ckdb.c
--- a/src/ckdb.h
+++ b/src/ckdb.h
--- a/src/ckdb_cmd.c
+++ b/src/ckdb_cmd.c
--- a/src/ckdb_data.c
+++ b/src/ckdb_data.c
--- a/src/ckdb_dbio.c
+++ b/src/ckdb_dbio.c