From d5324d1d5c177287364bac51a9fc82717829d42f Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Sat, 20 Aug 2011 00:00:18 -0700
Subject: [PATCH] Some Makefile cleanup.

---
 Makefile            | 37 +++++++++----------------------------
 tests/test_stream.c |  3 +--
 upb/pb/encoder.c    |  4 ++--
 upb/pb/encoder.h    |  4 ++--
 4 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index 3fef33d618..c7befe5979 100644
--- a/Makefile
+++ b/Makefile
@@ -65,17 +65,14 @@ endif
 # Unfortuantely we can't easily generate deps for benchmarks or tests because
 # of the scheme we use that compiles the same source file multiple times with
 # different -D options, which can include different header files.
-deps: gen-deps.sh Makefile $(CORE) $(STREAM)
-	$(Q) CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(CORE) $(STREAM)
+ALLSRC=$(shell find . -name '*.c' -print | grep -v perf-tmp)
+deps: gen-deps.sh Makefile $(ALLSRC)
+	$(Q) CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(ALLSRC)
 	$(E) Regenerating dependencies for upb/...
 
-$(ALLSRC): perf-cppflags
-
 
 # Source files. ###############################################################
 
-# Every source file used in upb should appear here.
-
 # The core library.
 CORE= \
   upb/upb.c \
@@ -93,26 +90,6 @@ PB= \
   upb/pb/glue.c \
   upb/pb/textprinter.c \
 
-# Parts of core that are yet to be converted.
-OTHERSRC=upb/pb/encoder.c
-
-BENCHMARKS_SRC= \
-  benchmarks/main.c \
-  benchmarks/parsestream.upb.c \
-  benchmarks/parsetostruct.upb.c
-
-TESTS_SRC= \
-  tests/test_decoder.c \
-  tests/test_def.c \
-  tests/tests.c \
-  tests/tests_varint.c \
-
-  #tests/test_vs_proto2.cc
-
-  #tests/test_stream.c \
-
-ALLSRC=$(CORE) $(STREAM) $(BENCHMARKS_SRC) $(TESTS_SRC)
-
 
 # Rules. #######################################################################
 
@@ -188,8 +165,6 @@ endif
 # Function to expand a wildcard pattern recursively.
 rwildcard=$(strip $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2)$(filter $(subst *,%,$2),$d)))
 
-
-
 # Regenerating the auto-generated files in upb/.
 upb/descriptor.pb: upb/descriptor.proto
 	@# TODO: replace with upbc
@@ -316,6 +291,12 @@ benchmarks/google_messages.proto.pb: benchmarks/google_messages.proto
 benchmarks/google_messages.pb.cc: benchmarks/google_messages.proto
 	protoc benchmarks/google_messages.proto --cpp_out=.
 
+# This basic idea is useful (varying the benchmarks' setup by recompiling
+# several times with different #defines) but the implementation in this
+# Makefile is verbose and error-prone.  Open to better ideas here.  I don't
+# want to make these command-line parameters -- it makes it more annoying to
+# debug or profile them.
+
 benchmarks/b.parsetostruct_googlemessage1.upb_table_byval \
 benchmarks/b.parsetostruct_googlemessage2.upb_table_byval: \
     benchmarks/parsetostruct.upb.c $(LIBUPB) benchmarks/google_messages.proto.pb
diff --git a/tests/test_stream.c b/tests/test_stream.c
index 8a136fd157..4c9880d996 100644
--- a/tests/test_stream.c
+++ b/tests/test_stream.c
@@ -1,7 +1,6 @@
 
 #undef NDEBUG  /* ensure tests always assert. */
-#include "upb_stream.h"
-#include "upb_string.h"
+#include "upb/handlers.h"
 
 typedef struct {
   upb_string *str;
diff --git a/upb/pb/encoder.c b/upb/pb/encoder.c
index 139dc88a53..975f3ab9ce 100644
--- a/upb/pb/encoder.c
+++ b/upb/pb/encoder.c
@@ -5,10 +5,10 @@
  * Author: Josh Haberman <jhaberman@gmail.com>
  */
 
-#include "upb_encoder.h"
+#include "upb/pb/encoder.h"
 
 #include <stdlib.h>
-#include "descriptor.h"
+#include "upb/descriptor.h"
 
 /* Functions for calculating sizes of wire values. ****************************/
 
diff --git a/upb/pb/encoder.h b/upb/pb/encoder.h
index 64c5047129..563b78da7c 100644
--- a/upb/pb/encoder.h
+++ b/upb/pb/encoder.h
@@ -15,8 +15,8 @@
 #ifndef UPB_ENCODER_H_
 #define UPB_ENCODER_H_
 
-#include "upb.h"
-#include "upb_stream.h"
+#include "upb/upb.h"
+#include "upb/bytestream.h"
 
 #ifdef __cplusplus
 extern "C" {