diff options
author | Joshua Haberman <joshua@reverberate.org> | 2011-02-13 12:59:54 -0800 |
---|---|---|
committer | Joshua Haberman <joshua@reverberate.org> | 2011-02-13 12:59:54 -0800 |
commit | 6bdbb45e88e7b88b294dfb6e4cb493cbc3c8cf74 (patch) | |
tree | 0e00246fb124ebdf6a2210c816704c1d840e2138 | |
parent | ee84a7da167d2211066c4a663d41febdf9544438 (diff) |
Merged core/ and stream/ -> src/. The split wasn't worth it.
-rw-r--r-- | Makefile | 42 | ||||
-rw-r--r-- | src/upb.c (renamed from core/upb.c) | 0 | ||||
-rw-r--r-- | src/upb.h (renamed from core/upb.h) | 0 | ||||
-rw-r--r-- | src/upb_atomic.h (renamed from core/upb_atomic.h) | 0 | ||||
-rw-r--r-- | src/upb_decoder.c (renamed from stream/upb_decoder.c) | 0 | ||||
-rw-r--r-- | src/upb_decoder.h (renamed from stream/upb_decoder.h) | 0 | ||||
-rw-r--r-- | src/upb_def.c (renamed from core/upb_def.c) | 0 | ||||
-rw-r--r-- | src/upb_def.h (renamed from core/upb_def.h) | 0 | ||||
-rw-r--r-- | src/upb_encoder.c (renamed from stream/upb_encoder.c) | 0 | ||||
-rw-r--r-- | src/upb_encoder.h (renamed from stream/upb_encoder.h) | 0 | ||||
-rw-r--r-- | src/upb_glue.c (renamed from core/upb_glue.c) | 0 | ||||
-rw-r--r-- | src/upb_glue.h (renamed from core/upb_glue.h) | 0 | ||||
-rw-r--r-- | src/upb_msg.c (renamed from core/upb_msg.c) | 0 | ||||
-rw-r--r-- | src/upb_msg.h (renamed from core/upb_msg.h) | 0 | ||||
-rw-r--r-- | src/upb_stdio.c (renamed from stream/upb_stdio.c) | 0 | ||||
-rw-r--r-- | src/upb_stdio.h (renamed from stream/upb_stdio.h) | 0 | ||||
-rw-r--r-- | src/upb_stream.h (renamed from core/upb_stream.h) | 0 | ||||
-rw-r--r-- | src/upb_stream_vtbl.h (renamed from core/upb_stream_vtbl.h) | 0 | ||||
-rw-r--r-- | src/upb_string.c (renamed from core/upb_string.c) | 0 | ||||
-rw-r--r-- | src/upb_string.h (renamed from core/upb_string.h) | 0 | ||||
-rw-r--r-- | src/upb_strstream.c (renamed from stream/upb_strstream.c) | 0 | ||||
-rw-r--r-- | src/upb_strstream.h (renamed from stream/upb_strstream.h) | 0 | ||||
-rw-r--r-- | src/upb_table.c (renamed from core/upb_table.c) | 0 | ||||
-rw-r--r-- | src/upb_table.h (renamed from core/upb_table.h) | 0 | ||||
-rw-r--r-- | src/upb_textprinter.c (renamed from stream/upb_textprinter.c) | 0 | ||||
-rw-r--r-- | src/upb_textprinter.h (renamed from stream/upb_textprinter.h) | 0 |
26 files changed, 21 insertions, 21 deletions
@@ -27,9 +27,9 @@ rwildcard=$(strip $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2)$(filter $ CC=gcc CXX=g++ CFLAGS=-std=c99 -INCLUDE=-Idescriptor -Icore -Itests -Istream -I. +INCLUDE=-Idescriptor -Isrc -Itests -I. CPPFLAGS=-Wall -Wextra -Wno-missing-field-initializers -g $(INCLUDE) $(strip $(shell test -f perf-cppflags && cat perf-cppflags)) -LDLIBS=-lpthread core/libupb.a +LDLIBS=-lpthread src/libupb.a ifeq ($(shell uname), Darwin) CPPFLAGS += -I/usr/include/lua5.1 LDFLAGS += -L/usr/local/lib -llua @@ -38,14 +38,14 @@ else LDFLAGS += $(strip $(shell pkg-config --silence-errors --libs lua || pkg-config --libs lua5.1)) endif -LIBUPB=core/libupb.a -LIBUPB_PIC=core/libupb_pic.a -LIBUPB_SHARED=core/libupb.so +LIBUPB=src/libupb.a +LIBUPB_PIC=src/libupb_pic.a +LIBUPB_SHARED=src/libupb.so ALL=deps $(OBJ) $(LIBUPB) $(LIBUPB_PIC) all: $(ALL) clean: rm -rf $(LIBUPB) $(LIBUPB_PIC) - rm -rf $(call rwildcard,,*.o) $(call rwildcard,,*.lo) $(call rwildcard,,*.gc*) + rm -rf $(call rwildcard,,*.o) $(call rwildcard,,*.lo) $(call rwildcard,,*.gcno) $(call rwildcard,,*.dSYM) rm -rf benchmark/google_messages.proto.pb benchmark/google_messages.pb.* benchmarks/b.* benchmarks/*.pb* rm -rf $(TESTS) tests/t.* rm -rf descriptor/descriptor.pb @@ -59,20 +59,20 @@ deps: gen-deps.sh Makefile $(call rwildcard,,*.c) $(call rwildcard,,*.h) # The core library -- the absolute minimum you must compile in to successfully # bootstrap. CORE= \ - core/upb.c \ - core/upb_table.c \ - core/upb_string.c \ - core/upb_def.c \ + src/upb.c \ + src/upb_table.c \ + src/upb_string.c \ + src/upb_def.c \ descriptor/descriptor.c # Common encoders/decoders and upb_msg -- you're almost certain to want these. STREAM= \ - stream/upb_decoder.c \ - stream/upb_stdio.c \ - stream/upb_textprinter.c \ - stream/upb_strstream.c \ - core/upb_msg.c \ - core/upb_glue.c \ + src/upb_decoder.c \ + src/upb_stdio.c \ + src/upb_textprinter.c \ + src/upb_strstream.c \ + src/upb_msg.c \ + src/upb_glue.c \ SRC=$(CORE) $(STREAM) @@ -81,13 +81,13 @@ $(SRC): perf-cppflags OTHERSRC=src/upb_encoder.c src/upb_text.c # Override the optimization level for upb_def.o, because it is not in the # critical path but gets very large when -O3 is used. -core/upb_def.o: core/upb_def.c +src/upb_def.o: src/upb_def.c $(CC) $(CFLAGS) $(CPPFLAGS) -Os -c -o $@ $< -core/upb_def.lo: core/upb_def.c +src/upb_def.lo: src/upb_def.c $(CC) $(CFLAGS) $(CPPFLAGS) -Os -c -o $@ $< -fPIC lang_ext/lua/upb.so: lang_ext/lua/upb.lo - $(CC) $(CFLAGS) $(CPPFLAGS) -shared -o $@ $< core/libupb_pic.a + $(CC) $(CFLAGS) $(CPPFLAGS) -shared -o $@ $< src/libupb_pic.a STATICOBJ=$(patsubst %.c,%.o,$(SRC)) @@ -171,10 +171,10 @@ tests/test_table: tests/test_table.cc # Includes <hash_set> which is a deprecated header. $(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wno-deprecated -o $@ $< $(LIBUPB) -tests/tests: core/libupb.a +tests/tests: src/libupb.a # Tools -tools/upbc: core/libupb.a +tools/upbc: src/libupb.a # Benchmarks #UPB_BENCHMARKS=benchmarks/b.parsetostruct_googlemessage1.upb_table \ diff --git a/core/upb_atomic.h b/src/upb_atomic.h index 1cd848b..1cd848b 100644 --- a/core/upb_atomic.h +++ b/src/upb_atomic.h diff --git a/stream/upb_decoder.c b/src/upb_decoder.c index 4a43c4b..4a43c4b 100644 --- a/stream/upb_decoder.c +++ b/src/upb_decoder.c diff --git a/stream/upb_decoder.h b/src/upb_decoder.h index 1c62753..1c62753 100644 --- a/stream/upb_decoder.h +++ b/src/upb_decoder.h diff --git a/core/upb_def.c b/src/upb_def.c index 651afc1..651afc1 100644 --- a/core/upb_def.c +++ b/src/upb_def.c diff --git a/core/upb_def.h b/src/upb_def.h index 28cc258..28cc258 100644 --- a/core/upb_def.h +++ b/src/upb_def.h diff --git a/stream/upb_encoder.c b/src/upb_encoder.c index 304a423..304a423 100644 --- a/stream/upb_encoder.c +++ b/src/upb_encoder.c diff --git a/stream/upb_encoder.h b/src/upb_encoder.h index e879b0b..e879b0b 100644 --- a/stream/upb_encoder.h +++ b/src/upb_encoder.h diff --git a/core/upb_glue.c b/src/upb_glue.c index 541827e..541827e 100644 --- a/core/upb_glue.c +++ b/src/upb_glue.c diff --git a/core/upb_glue.h b/src/upb_glue.h index ca32436..ca32436 100644 --- a/core/upb_glue.h +++ b/src/upb_glue.h diff --git a/core/upb_msg.c b/src/upb_msg.c index 9dfbea4..9dfbea4 100644 --- a/core/upb_msg.c +++ b/src/upb_msg.c diff --git a/core/upb_msg.h b/src/upb_msg.h index 8a3c63f..8a3c63f 100644 --- a/core/upb_msg.h +++ b/src/upb_msg.h diff --git a/stream/upb_stdio.c b/src/upb_stdio.c index 8857677..8857677 100644 --- a/stream/upb_stdio.c +++ b/src/upb_stdio.c diff --git a/stream/upb_stdio.h b/src/upb_stdio.h index fd71fdd..fd71fdd 100644 --- a/stream/upb_stdio.h +++ b/src/upb_stdio.h diff --git a/core/upb_stream.h b/src/upb_stream.h index 3f7c843..3f7c843 100644 --- a/core/upb_stream.h +++ b/src/upb_stream.h diff --git a/core/upb_stream_vtbl.h b/src/upb_stream_vtbl.h index e1f9cb8..e1f9cb8 100644 --- a/core/upb_stream_vtbl.h +++ b/src/upb_stream_vtbl.h diff --git a/core/upb_string.c b/src/upb_string.c index 30ed88f..30ed88f 100644 --- a/core/upb_string.c +++ b/src/upb_string.c diff --git a/core/upb_string.h b/src/upb_string.h index 0694a23..0694a23 100644 --- a/core/upb_string.h +++ b/src/upb_string.h diff --git a/stream/upb_strstream.c b/src/upb_strstream.c index a7967d4..a7967d4 100644 --- a/stream/upb_strstream.c +++ b/src/upb_strstream.c diff --git a/stream/upb_strstream.h b/src/upb_strstream.h index 1a8792b..1a8792b 100644 --- a/stream/upb_strstream.h +++ b/src/upb_strstream.h diff --git a/core/upb_table.c b/src/upb_table.c index a6e0a56..a6e0a56 100644 --- a/core/upb_table.c +++ b/src/upb_table.c diff --git a/core/upb_table.h b/src/upb_table.h index 20dae92..20dae92 100644 --- a/core/upb_table.h +++ b/src/upb_table.h diff --git a/stream/upb_textprinter.c b/src/upb_textprinter.c index 894a1ea..894a1ea 100644 --- a/stream/upb_textprinter.c +++ b/src/upb_textprinter.c diff --git a/stream/upb_textprinter.h b/src/upb_textprinter.h index a880626..a880626 100644 --- a/stream/upb_textprinter.h +++ b/src/upb_textprinter.h |