--- mqtt/src/Attic/Makefile	2011/11/23 00:42:16	1.1.1.1.2.7
+++ mqtt/src/Attic/Makefile	2011/12/20 16:04:34	1.1.1.1.2.18
@@ -3,7 +3,7 @@
 # by Michael Pounov <misho@elwix.org>
 #
 # $Author: misho $
-# $Id: Makefile,v 1.1.1.1.2.7 2011/11/23 00:42:16 misho Exp $
+# $Id: Makefile,v 1.1.1.1.2.18 2011/12/20 16:04:34 misho Exp $
 #
 prefix = /usr/local
 exec_prefix = ${prefix}
@@ -20,36 +20,46 @@ INC = ../inc
 LIB = ../lib
 
 LIBS = -laitio -laitcfg -lsqlite3
-LDADD = -laitmqtt ${LIBS}
+LDADD = -laitmqtt -lpthread -laitsched -laitio -laitcfg -lutil -lcrypto
 
 CFLAGS = -I. -I${INC} -I${includedir} -Wall -O2 -fPIC -I/usr/local/include -g -O2
-LDFLAGS = -L. -L${LIB} -L${libdir} -L/usr/local/lib 
+LDFLAGS = -L. -L${LIB} -L${libdir} -L/usr/local/lib
 
-SRCS = ${MQTTLIB_SRCS} ${MQTTD_SRCS} ${MQTT_SRCS} ${MQTTPUB_SRCS} ${MQTTACC_SRCS}
-PROGS = ${LIBA} ${LIBSO} ${MQTTD_PROG} ${MQTT_PROG} ${RTLM_PUB} ${RTLM_ACC}
+SRCS = ${MQTTLIB_SRCS} ${MQTTD_SRCS} ${MQTT_SUBS_SRCS} ${MQTT_PUB_SRCS} \
+       ${MQTTPUB_SRCS} ${MQTTACC_SRCS} ${MQTTLOG_SRCS}
+PROGS = ${LIBA} ${LIBSO} ${MQTTD_PROG} ${MQTT_SUBS_PROG} ${MQTT_PUB_PROG} \
+	${RTLM_PUB} ${RTLM_ACC} ${RTLM_LOG}
 
-MQTTD_SRCS = mqttd.c compile.c dl.c
-MQTTD_OBJS = mqttd.o compile.o dl.o
+MQTTD_SRCS = mqttd.c compile.c dl.c utils.c daemon.c
+MQTTD_OBJS = mqttd.o compile.o dl.o utils.o daemon.o
 MQTTD_PROG = mqttd
 
-MQTT_SRCS = mqtt.c compile.c dl.c
-MQTT_OBJS = mqtt.o compile.o dl.o
-MQTT_PROG = mqtt
+MQTT_SUBS_SRCS = mqtt_subs.c compile.c client.c
+MQTT_SUBS_OBJS = mqtt_subs.o compile.o client.o
+MQTT_SUBS_PROG = mqtt_subs
 
+MQTT_PUB_SRCS = mqtt_pub.c compile.c client.c
+MQTT_PUB_OBJS = mqtt_pub.o compile.o client.o
+MQTT_PUB_PROG = mqtt_pub
+
 MQTTLIB_SRCS = aitmqtt.c conn.c pub.c sub.c recv.c
 MQTTLIB_OBJS = aitmqtt.o conn.o pub.o sub.o recv.o
 LIBA = libaitmqtt.a
 LIBSO = libaitmqtt.so
 
-MQTTPUB_SRCS = dbmqtt.c pubmqtt.c
-MQTTPUB_OBJS = dbmqtt.o pubmqtt.o
+MQTTPUB_SRCS = pubmqtt.c pub_schema.c
+MQTTPUB_OBJS = pubmqtt.o pub_schema.o
 RTLM_PUB = mqtt_pub.so
 
-MQTTACC_SRCS = dbmqtt.c accmqtt.c
-MQTTACC_OBJS = dbmqtt.o accmqtt.o
+MQTTACC_SRCS = accmqtt.c acc_schema.c
+MQTTACC_OBJS = accmqtt.o acc_schema.o
 RTLM_ACC = mqtt_acc.so
 
+MQTTLOG_SRCS = logmqtt.c
+MQTTLOG_OBJS = logmqtt.o
+RTLM_LOG = mqtt_log.so
 
+
 all: depend \
 		${PROGS} \
 
@@ -58,11 +68,11 @@ depend:
 	${MKDEP} ${CFLAGS} ${SRCS}
 
 clean:
-	rm -f *.o .depend compile.c *~
+	rm -f *.o .depend compile.c acc_schema.c pub_schema.c *~
 
 install:
 
-.o: compile.c
+.o: compile.c acc_schema.c pub_schema.c
 	${CC} -c ${CFLAGS} $<
 
 ${LIBA}: ${MQTTLIB_OBJS}
@@ -75,11 +85,17 @@ ${LIBSO}: ${MQTTLIB_OBJS}
 ${MQTTD_PROG}: ${MQTTD_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${MQTTD_OBJS} ${LDADD}
 
-${MQTT_PROG}: ${MQTT_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${MQTT_OBJS} ${LDADD}
+${MQTT_SUBS_PROG}: ${MQTT_SUBS_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${MQTT_SUBS_OBJS} ${LDADD}
 
+${MQTT_PUB_PROG}: ${MQTT_PUB_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${MQTT_PUB_OBJS} ${LDADD}
+
 ${RTLM_PUB}: ${MQTTPUB_OBJS}
 	${CC} ${LDFLAGS} -shared -nostartfiles -o ${LIB}/$@ -Wl,-x,-soname,$@ ${MQTTPUB_OBJS} ${LIBS}
 
 ${RTLM_ACC}: ${MQTTACC_OBJS}
 	${CC} ${LDFLAGS} -shared -nostartfiles -o ${LIB}/$@ -Wl,-x,-soname,$@ ${MQTTACC_OBJS} ${LIBS}
+
+${RTLM_LOG}: ${MQTTLOG_OBJS}
+	${CC} ${LDFLAGS} -shared -nostartfiles -o ${LIB}/$@ -Wl,-x,-soname,$@ ${MQTTLOG_OBJS}