Build everything in one sweep, without intermediate object filesHEADmaster

2 files changed, 16 insertions, 32 deletions

diff --git a/.gitignore b/.gitignore
index 8b4bec1..b5c40f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
 *.o
+*.dSYM
+opentracker
+opentracker.debug
+opentracker.integration
+opentracker.tsan
+proxy
+proxy.debug
 tests/runner
+tests/runner.sanitize
diff --git a/Makefile b/Makefile
index 1a8912b..f79d6a6 100644
--- a/Makefile
+++ b/Makefile
@@ -73,13 +73,6 @@ HEADERS=trackerlogic.h ot_urlencoded.h ot_batch.h ot_buf.h ot_event.h ot_fdstate
 SOURCES=opentracker.c trackerlogic.c ot_urlencoded.c ot_batch.c ot_buf.c ot_event.c ot_fdstate.c ot_fmt.c ot_hex.c ot_ip.c ot_config.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_batch.c ot_fdstate.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=%.proxy.o)
-OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.proxy.debug.o)
-
-.SUFFIXES: .proxy.debug.o .proxy.o .debug.o .o .c
-
 all: $(BINARY) $(BINARY).debug
 
 CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
@@ -88,32 +81,15 @@ CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
 CFLAGS_proxy = $(CFLAGS_production) $(CFLAGS_libowfat) -DWANT_SYNC_LIVE
 CFLAGS_proxy_debug = $(CFLAGS_debug) $(CFLAGS_libowfat) -DWANT_SYNC_LIVE
 
-$(BINARY): $(OBJECTS)
-        $(CC) -o $@ $(OBJECTS) $(LDFLAGS)
+$(BINARY): $(SOURCES) $(HEADERS)
+        $(CC) -o $@ $(CFLAGS_production) $(SOURCES) $(LDFLAGS)
         $(STRIP) $@
-$(BINARY).debug: $(OBJECTS_debug)
-        $(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
-proxy: $(OBJECTS_proxy)
-        $(CC) -o $@ $(OBJECTS_proxy) $(CFLAGS_production) $(LDFLAGS) $(LDFLAGS_libowfat)
-proxy.debug: $(OBJECTS_proxy_debug)
-        $(CC) -o $@ $(OBJECTS_proxy_debug) $(LDFLAGS) $(LDFLAGS_libowfat)
-
-$(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 :
-        $(CC) -c -o $@ $(CFLAGS_production) $<
+$(BINARY).debug: $(SOURCES) $(HEADERS)
+        $(CC) -o $@ $(CFLAGS_debug) $(SOURCES) $(LDFLAGS)
+proxy: $(SOURCES_proxy) $(HEADERS)
+        $(CC) -o $@ $(CFLAGS_proxy) $(SOURCES_proxy) $(LDFLAGS) $(LDFLAGS_libowfat)
+proxy.debug: $(SOURCES_proxy) $(HEADERS)
+        $(CC) -o $@ $(CFLAGS_proxy_debug) $(SOURCES_proxy) $(LDFLAGS) $(LDFLAGS_libowfat)
 
 # Unit tests. The modules under test are compiled straight into the test
 # binary, so a test may reach a static function by including the source if it