r14093@catbus: nickm | 2007-08-08 01:49:54 -0400

Include fewer redundant headers; use the compiler search paths better.


svn:r11060

src/tools/Makefile.am

@@ -1,3 +1,5 @@
+CPPFLAGS += -I../common
+
 bin_PROGRAMS = tor-resolve tor-gencert
 
 tor_resolve_SOURCES = tor-resolve.c

src/tools/tor-gencert.c

@@ -27,10 +27,10 @@
 
 #define CRYPTO_PRIVATE
 
-#include "../common/compat.h"
-#include "../common/util.h"
-#include "../common/log.h"
-#include "../common/crypto.h"
+#include "compat.h"
+#include "util.h"
+#include "log.h"
+#include "crypto.h"
 
 #define IDENTITY_KEY_BITS 3072
 #define SIGNING_KEY_BITS 1024

src/tools/tor-resolve.c

@@ -4,9 +4,9 @@
 
 #include "orconfig.h"
 
-#include "../common/compat.h"
-#include "../common/util.h"
-#include "../common/log.h"
+#include "compat.h"
+#include "util.h"
+#include "log.h"
 
 #include <stdio.h>
 #include <stdlib.h>