1 files changed, 30 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 27d635d..9a09e7b 100644
--- a/Makefile
+++ b/Makefile
@@ -68,36 +68,50 @@ CFLAGS+=-I$(LIBOWFAT_HEADERS) -DGIT_VERSION=$(GIT_VERSION) -Wall -pipe -pthread
 LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread
 
 BINARY =opentracker
-HEADERS=trackerlogic.h scan_urlencoded_query.h ot_buf.h ot_hex.h ot_ip.h ot_scan.h ot_mutex.h ot_random.h ot_stats.h ot_vector.h ot_clean.h ot_udp.h ot_iovec.h ot_fullscrape.h ot_accesslist.h ot_http.h ot_livesync.h ot_rijndael.h
-SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c ot_buf.c ot_hex.c ot_ip.c ot_scan.c ot_mutex.c ot_random.c ot_stats.c ot_vector.c ot_clean.c ot_udp.c ot_iovec.c ot_fullscrape.c ot_accesslist.c ot_http.c ot_livesync.c ot_rijndael.c
-SOURCES_proxy=proxy.c ot_vector.c ot_mutex.c ot_random.c ot_scan.c ot_ip.c
+HEADERS=trackerlogic.h scan_urlencoded_query.h ot_buf.h ot_hex.h ot_ip.h ot_scan.h ot_socket.h ot_mutex.h ot_random.h ot_stats.h ot_vector.h ot_clean.h ot_udp.h ot_iovec.h ot_fullscrape.h ot_accesslist.h ot_http.h ot_livesync.h ot_rijndael.h
+SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c ot_buf.c ot_hex.c ot_ip.c ot_scan.c ot_socket.c ot_mutex.c ot_random.c ot_stats.c ot_vector.c ot_clean.c ot_udp.c ot_iovec.c ot_fullscrape.c ot_accesslist.c ot_http.c ot_livesync.c ot_rijndael.c
+SOURCES_proxy=proxy.c ot_vector.c ot_mutex.c ot_random.c ot_scan.c ot_ip.c ot_socket.c
 
 OBJECTS = $(SOURCES:%.c=%.o)
 OBJECTS_debug = $(SOURCES:%.c=%.debug.o)
-OBJECTS_proxy = $(SOURCES_proxy:%.c=%.o)
-OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.debug.o)
+OBJECTS_proxy = $(SOURCES_proxy:%.c=%.proxy.o)
+OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.proxy.debug.o)
 
-.SUFFIXES: .debug.o .o .c
+.SUFFIXES: .proxy.debug.o .proxy.o .debug.o .o .c
 
 all: $(BINARY) $(BINARY).debug
 
 CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
 CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
 
-$(BINARY): $(OBJECTS) $(HEADERS)
+CFLAGS_proxy = $(CFLAGS_production) -DWANT_SYNC_LIVE
+CFLAGS_proxy_debug = $(CFLAGS_debug) -DWANT_SYNC_LIVE
+
+$(BINARY): $(OBJECTS)
         $(CC) -o $@ $(OBJECTS) $(LDFLAGS)
         $(STRIP) $@
-$(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
+$(BINARY).debug: $(OBJECTS_debug)
         $(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
-proxy: $(OBJECTS_proxy) $(HEADERS)
+proxy: $(OBJECTS_proxy)
         $(CC) -o $@ $(OBJECTS_proxy) $(CFLAGS_production) $(LDFLAGS)
-proxy.debug: $(OBJECTS_proxy_debug) $(HEADERS)
+proxy.debug: $(OBJECTS_proxy_debug)
         $(CC) -o $@ $(OBJECTS_proxy_debug) $(LDFLAGS)
 
-.c.debug.o : $(HEADERS)
+$(OBJECTS): $(HEADERS)
+$(OBJECTS_debug): $(HEADERS)
+$(OBJECTS_proxy): $(HEADERS)
+$(OBJECTS_proxy_debug): $(HEADERS)
+
+.c.proxy.debug.o :
+        $(CC) -c -o $@ $(CFLAGS_proxy_debug) $(<:.proxy.debug.o=.c)
+
+.c.proxy.o :
+        $(CC) -c -o $@ $(CFLAGS_proxy) $(<:.proxy.o=.c)
+
+.c.debug.o :
         $(CC) -c -o $@ $(CFLAGS_debug) $(<:.debug.o=.c)
 
-.c.o : $(HEADERS)
+.c.o :
         $(CC) -c -o $@ $(CFLAGS_production) $<
 
 # Unit tests. The modules under test are compiled straight into the test
@@ -105,12 +119,12 @@ proxy.debug: $(OBJECTS_proxy_debug) $(HEADERS)
 # has to. tests/stubs.c supplies the few symbols those modules reference but
 # the tests never reach.
 TESTBIN=tests/runner
-TEST_SOURCES=tests/runner.c tests/test.c tests/stubs.c tests/t_scan_urlencoded_query.c tests/t_iovec.c tests/t_vector.c tests/t_random.c tests/t_hex.c tests/t_accesslist.c tests/t_scan.c tests/t_buf.c tests/t_ip.c
-TEST_UNITS=scan_urlencoded_query.c ot_buf.c ot_ip.c ot_iovec.c ot_vector.c ot_random.c ot_hex.c ot_scan.c ot_accesslist.c
+TEST_SOURCES=tests/runner.c tests/test.c tests/stubs.c tests/t_scan_urlencoded_query.c tests/t_iovec.c tests/t_vector.c tests/t_random.c tests/t_hex.c tests/t_accesslist.c tests/t_scan.c tests/t_buf.c tests/t_ip.c tests/t_socket.c
+TEST_UNITS=scan_urlencoded_query.c ot_buf.c ot_ip.c ot_socket.c ot_iovec.c ot_vector.c ot_random.c ot_hex.c ot_scan.c ot_accesslist.c
 TEST_HEADERS=tests/test.h $(HEADERS)
 # Tests reach code that sits behind feature flags, so the units under test are
 # built with those features enabled. A test binary is not a production binary.
-FEATURES_test=$(FEATURES) -DWANT_ACCESSLIST_BLACK
+FEATURES_test=$(FEATURES) -DWANT_ACCESSLIST_BLACK -DWANT_SYNC_LIVE
 CFLAGS_test = $(CFLAGS) -I. -g -O1 $(FEATURES_test)
 
 $(TESTBIN): $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS)
@@ -122,7 +136,7 @@ check: $(TESTBIN)
 .PHONY: all check clean install
 
 clean:
-        rm -rf opentracker opentracker.debug $(TESTBIN) *.o *~
+        rm -rf opentracker opentracker.debug proxy proxy.debug $(TESTBIN) *.o *~
 
 install:
         install -m 755 opentracker $(DESTDIR)$(BINDIR)