diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | src/git/commit.h (renamed from include/git/commit.h) | 0 | ||||
| -rw-r--r-- | src/git/common.h (renamed from include/git/common.h) | 0 | ||||
| -rw-r--r-- | src/git/config.h.in (renamed from include/git/config.h.in) | 0 | ||||
| -rw-r--r-- | src/git/odb.h (renamed from include/git/odb.h) | 0 | ||||
| -rw-r--r-- | src/git/oid.h (renamed from include/git/oid.h) | 0 | ||||
| -rw-r--r-- | src/git/os/unix.h (renamed from include/git/os/unix.h) | 0 | ||||
| -rw-r--r-- | src/git/revwalk.h (renamed from include/git/revwalk.h) | 0 | ||||
| -rw-r--r-- | src/git/zlib.h (renamed from include/git/zlib.h) | 2 |
10 files changed, 12 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index a6a1a6fa1..5213c6928 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /apidocs -/include/git/config.h +/src/git/config.h *.o *.a *.exe @@ -5,16 +5,18 @@ DOXYGEN = doxygen CFLAGS = -g -O2 -Wall OS = unix -BASIC_CFLAGS := -Iinclude +BASIC_CFLAGS := -Isrc BASIC_CFLAGS += -DGIT__PRIVATE BASIC_CFLAGS += -fvisibility=hidden OBJS = $(patsubst %.c,%.o,$(wildcard src/*.c)) -HDRS = $(wildcard include/git/*.h) +HDRS = $(wildcard src/*.h) +PUBLIC_HEADERS = $(wildcard src/git/*.h) +HDRS += $(PUBLIC_HEADERS) OBJS += src/os/$(OS).o -HDRS += include/git/config.h -HDRS += include/git/os/$(OS).h +HDRS += src/git/config.h +HDRS += src/git/os/$(OS).h GIT_LIB = libgit2.a @@ -29,7 +31,7 @@ clean: rm -f $(GIT_LIB) rm -f src/*.o rm -f tests/*.o tests/*.exe tests/*.toc - rm -f include/git/config.h + rm -f src/git/config.h rm -rf apidocs apidocs: @@ -41,7 +43,7 @@ test: $(TEST_RUN) .c.o: $(CC) $(BASIC_CFLAGS) $(CFLAGS) -c $< -o $@ -include/git/config.h: include/git/config.h.in +src/git/config.h: src/git/config.h.in sed 's/@@OS@@/$(OS)/g' $< >$@+ mv $@+ $@ @@ -62,12 +64,12 @@ $(patsubst %.exe,%.toc,$(TEST_EXE)): tests/%.toc: tests/%.c mv $@+ $@ $(TEST_OBJ): tests/%.o: tests/%.c - $(CC) -Iinclude $(CFLAGS) -c $< -o $@ + $(CC) -Isrc $(CFLAGS) -c $< -o $@ $(patsubst %.exe,%_main.o,$(TEST_EXE)): tests/%_main.o: $(HDRS) $(patsubst %.exe,%_main.o,$(TEST_EXE)): tests/%_main.o: $(T_MAIN_C) $(patsubst %.exe,%_main.o,$(TEST_EXE)): tests/%_main.o: tests/%.toc - $(CC) -Iinclude -I. '-DTEST_TOC="$<"' \ + $(CC) -Isrc -I. '-DTEST_TOC="$<"' \ -c $(T_MAIN_C) \ -o $@ diff --git a/include/git/commit.h b/src/git/commit.h index 8cb3e7d4c..8cb3e7d4c 100644 --- a/include/git/commit.h +++ b/src/git/commit.h diff --git a/include/git/common.h b/src/git/common.h index 47ee6e207..47ee6e207 100644 --- a/include/git/common.h +++ b/src/git/common.h diff --git a/include/git/config.h.in b/src/git/config.h.in index 44b6a517f..44b6a517f 100644 --- a/include/git/config.h.in +++ b/src/git/config.h.in diff --git a/include/git/odb.h b/src/git/odb.h index 6a840ebc2..6a840ebc2 100644 --- a/include/git/odb.h +++ b/src/git/odb.h diff --git a/include/git/oid.h b/src/git/oid.h index dd95fb53d..dd95fb53d 100644 --- a/include/git/oid.h +++ b/src/git/oid.h diff --git a/include/git/os/unix.h b/src/git/os/unix.h index 475fe13a5..475fe13a5 100644 --- a/include/git/os/unix.h +++ b/src/git/os/unix.h diff --git a/include/git/revwalk.h b/src/git/revwalk.h index 5c0b005b6..5c0b005b6 100644 --- a/include/git/revwalk.h +++ b/src/git/revwalk.h diff --git a/include/git/zlib.h b/src/git/zlib.h index 621dbe638..7e44c57fb 100644 --- a/include/git/zlib.h +++ b/src/git/zlib.h @@ -46,7 +46,7 @@ GIT_BEGIN_DECL * deflateBound() implementation itself. * * @param stream the stream pointer. - * @param s total length of the source data (in bytes). + * @param s total length of the source data (in bytes). * @return maximum length of the compressed data. */ GIT_INLINE(size_t) deflateBound(z_streamp stream, size_t s) |