--- mqtt/src/Attic/Makefile	2011/12/14 12:45:30	1.1.1.1.2.16
+++ mqtt/src/Attic/Makefile	2012/01/25 10:34:14	1.1.1.1.2.19
@@ -3,7 +3,7 @@
 # by Michael Pounov <misho@elwix.org>
 #
 # $Author: misho $
-# $Id: Makefile,v 1.1.1.1.2.16 2011/12/14 12:45:30 misho Exp $
+# $Id: Makefile,v 1.1.1.1.2.19 2012/01/25 10:34:14 misho Exp $
 #
 prefix = /usr/local
 exec_prefix = ${prefix}
@@ -25,17 +25,23 @@ LDADD = -laitmqtt -lpthread -laitsched -laitio -laitcf
 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} ${MQTTLOG_SRCS}
-PROGS = ${LIBA} ${LIBSO} ${MQTTD_PROG} ${MQTT_PROG} ${RTLM_PUB} ${RTLM_ACC} ${RTLM_LOG}
+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 utils.c daemon.c
-MQTTD_OBJS = mqttd.o compile.o dl.o utils.o daemon.o
+MQTTD_SRCS = mqttd.c compile.c dl.c utils.c daemon.c mqttd_calls.c
+MQTTD_OBJS = mqttd.o compile.o dl.o utils.o daemon.o mqttd_calls.o
 MQTTD_PROG = mqttd
 
-MQTT_SRCS = mqtt.c compile.c dl.c client.c
-MQTT_OBJS = mqtt.o compile.o dl.o client.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
@@ -79,8 +85,11 @@ ${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}