--- mqtt/src/Attic/Makefile	2011/11/22 21:12:52	1.1.1.1.2.6
+++ mqtt/src/Attic/Makefile	2011/11/23 08:50:03	1.1.1.1.2.8
@@ -3,7 +3,7 @@
 # by Michael Pounov <misho@elwix.org>
 #
 # $Author: misho $
-# $Id: Makefile,v 1.1.1.1.2.6 2011/11/22 21:12:52 misho Exp $
+# $Id: Makefile,v 1.1.1.1.2.8 2011/11/23 08:50:03 misho Exp $
 #
 prefix = /usr/local
 exec_prefix = ${prefix}
@@ -19,21 +19,21 @@ BIN = ../bin
 INC = ../inc
 LIB = ../lib
 
-LIBS = -laitio -laitcfg
-LDADD = -laitmqtt
+LIBS = -laitio -laitcfg -lsqlite3
+LDADD = -laitmqtt ${LIBS}
 
 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 
 
-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_SRCS} ${MQTTPUB_SRCS} ${MQTTACC_SRCS} ${MQTTLOG_SRCS}
+PROGS = ${LIBA} ${LIBSO} ${MQTTD_PROG} ${MQTT_PROG} ${RTLM_PUB} ${RTLM_ACC} ${RTLM_LOG}
 
-MQTTD_SRCS = mqttd.c compile.c
-MQTTD_OBJS = mqttd.o compile.o
+MQTTD_SRCS = mqttd.c compile.c dl.c
+MQTTD_OBJS = mqttd.o compile.o dl.o
 MQTTD_PROG = mqttd
 
-MQTT_SRCS = mqtt.c compile.c
-MQTT_OBJS = mqtt.o compile.o
+MQTT_SRCS = mqtt.c compile.c dl.c
+MQTT_OBJS = mqtt.o compile.o dl.o
 MQTT_PROG = mqtt
 
 MQTTLIB_SRCS = aitmqtt.c conn.c pub.c sub.c recv.c
@@ -41,15 +41,19 @@ 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
+MQTTPUB_OBJS = pubmqtt.o
 RTLM_PUB = mqtt_pub.so
 
-MQTTACC_SRCS = dbmqtt.c accmqtt.c
-MQTTACC_OBJS = dbmqtt.o accmqtt.o
+MQTTACC_SRCS = accmqtt.c
+MQTTACC_OBJS = accmqtt.o
 RTLM_ACC = mqtt_acc.so
 
+MQTTLOG_SRCS = logmqtt.c
+MQTTLOG_OBJS = logmqtt.o
+RTLM_LOG = mqtt_log.so
 
+
 all: depend \
 		${PROGS} \
 
@@ -70,7 +74,7 @@ ${LIBA}: ${MQTTLIB_OBJS}
 	${RANLIB} ${LIB}/$@
 
 ${LIBSO}: ${MQTTLIB_OBJS}
-	${CC} ${LDFLAGS} -shared -nostartfiles -o ${LIB}/$@ -Wl,-x,-soname,$@ ${MQTTLIB_OBJS} ${LIBS}
+	${CC} ${LDFLAGS} -shared -nostartfiles -o ${LIB}/$@ -Wl,-x,-soname,$@ ${MQTTLIB_OBJS}
 
 ${MQTTD_PROG}: ${MQTTD_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${MQTTD_OBJS} ${LDADD}
@@ -79,7 +83,10 @@ ${MQTT_PROG}: ${MQTT_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${MQTT_OBJS} ${LDADD}
 
 ${RTLM_PUB}: ${MQTTPUB_OBJS}
-	${CC} ${LDFLAGS} -shared -nostartfiles -o ${LIB}/$@ -Wl,-x,-soname,$@ ${MQTTPUB_OBJS} ${LIBS} -lsqlite3
+	${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} -lsqlite3
+	${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}