summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONVENTIONS10
-rw-r--r--Makefile4
-rw-r--r--api.doxygen2
-rw-r--r--include/git/commit.h (renamed from src/git_commit.h)6
-rw-r--r--include/git/common.h (renamed from src/git_common.h)2
-rw-r--r--include/git/odb.h (renamed from src/git_odb.h)6
-rw-r--r--include/git/oid.h (renamed from src/git_oid.h)4
-rw-r--r--include/git/revwalk.h (renamed from src/git_revwalk.h)8
-rw-r--r--src/commit.c (renamed from src/git_commit.c)2
-rw-r--r--src/odb.c (renamed from src/git_odb.c)2
-rw-r--r--src/oid.c (renamed from src/git_oid.c)2
-rw-r--r--src/revwalk.c (renamed from src/git_revwalk.c)2
12 files changed, 25 insertions, 25 deletions
diff --git a/CONVENTIONS b/CONVENTIONS
index ea9fa2b55..575cdc563 100644
--- a/CONVENTIONS
+++ b/CONVENTIONS
@@ -85,15 +85,15 @@ the following form, where ${filename} is the name of the file,
after replacing non-identifier characters with '_'.
----
- #ifndef INCLUDE_${filename}_h__
- #define INCLUDE_${filename}_h__
+ #ifndef INCLUDE_git_${filename}_h__
+ #define INCLUDE_git_${filename}_h__
- #include "git_common.h"
+ #include "git/common.h"
/**
- * @file ${filename}.h
+ * @file git/${filename}.h
* @brief Git some description
- * @defgroup ${filename} some description routines
+ * @defgroup git_${filename} some description routines
* @ingroup Git
* @{
*/
diff --git a/Makefile b/Makefile
index 892bb2941..339a0ed36 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@ DOXYGEN = doxygen
CFLAGS = -g -O2
-BASIC_CFLAGS := -Isrc
+BASIC_CFLAGS := -Iinclude
BASIC_CFLAGS += -DGIT__PRIVATE
BASIC_CFLAGS += -fvisibility=hidden
OBJS = $(patsubst %.c,%.o,$(wildcard src/*.c))
-HDRS = $(wildcard src/*.h)
+HDRS = $(wildcard include/git/*.h)
all:: libgit2.a
diff --git a/api.doxygen b/api.doxygen
index 0acd9f8ba..b27d0a806 100644
--- a/api.doxygen
+++ b/api.doxygen
@@ -1,6 +1,6 @@
PROJECT_NAME = libgit2
-INPUT = src
+INPUT = include
QUIET = YES
RECURSIVE = YES
FILE_PATTERNS = *.h
diff --git a/src/git_commit.h b/include/git/commit.h
index 3864bcd2a..dbafe4e0c 100644
--- a/src/git_commit.h
+++ b/include/git/commit.h
@@ -36,12 +36,12 @@
#ifndef INCLUDE_git_commit_h__
#define INCLUDE_git_commit_h__
-#include "git_common.h"
-#include "git_oid.h"
+#include "git/common.h"
+#include "git/oid.h"
#include <time.h>
/**
- * @file git_commit.h
+ * @file git/commit.h
* @brief Git commit parsing, formatting routines
* @defgroup git_commit Git commit parsing, formatting routines
* @ingroup Git
diff --git a/src/git_common.h b/include/git/common.h
index c9c7b0e14..6a1066213 100644
--- a/src/git_common.h
+++ b/include/git/common.h
@@ -47,7 +47,7 @@
#endif
/**
- * @file git_common.h
+ * @file git/common.h
* @brief Git common platform definitions
* @defgroup git_common Git common platform definitions
* @ingroup Git
diff --git a/src/git_odb.h b/include/git/odb.h
index 5069c1921..eb2da5c7c 100644
--- a/src/git_odb.h
+++ b/include/git/odb.h
@@ -36,12 +36,12 @@
#ifndef INCLUDE_git_odb_h__
#define INCLUDE_git_odb_h__
-#include "git_common.h"
-#include "git_oid.h"
+#include "git/common.h"
+#include "git/oid.h"
#include <unistd.h>
/**
- * @file git_odb.h
+ * @file git/odb.h
* @brief Git object database routines
* @defgroup git_odb Git object database routines
* @ingroup Git
diff --git a/src/git_oid.h b/include/git/oid.h
index a24f1bb1a..e0ed676cd 100644
--- a/src/git_oid.h
+++ b/include/git/oid.h
@@ -36,10 +36,10 @@
#ifndef INCLUDE_git_oid_h__
#define INCLUDE_git_oid_h__
-#include "git_common.h"
+#include "git/common.h"
/**
- * @file git_oid.h
+ * @file git/oid.h
* @brief Git object id routines
* @defgroup git_oid Git object id routines
* @ingroup Git
diff --git a/src/git_revwalk.h b/include/git/revwalk.h
index d0e7959d4..cc15381ea 100644
--- a/src/git_revwalk.h
+++ b/include/git/revwalk.h
@@ -36,12 +36,12 @@
#ifndef INCLUDE_git_revwalk_h__
#define INCLUDE_git_revwalk_h__
-#include "git_common.h"
-#include "git_odb.h"
-#include "git_commit.h"
+#include "git/common.h"
+#include "git/odb.h"
+#include "git/commit.h"
/**
- * @file git_revwalk.h
+ * @file git/revwalk.h
* @brief Git revision traversal routines
* @defgroup git_revwalk Git revision traversal routines
* @ingroup Git
diff --git a/src/git_commit.c b/src/commit.c
index 5e98d798b..1a0396333 100644
--- a/src/git_commit.c
+++ b/src/commit.c
@@ -33,7 +33,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "git_commit.h"
+#include "git/commit.h"
const git_oid *git_commit_id(git_commit *c)
{
diff --git a/src/git_odb.c b/src/odb.c
index a92063390..cb98fecad 100644
--- a/src/git_odb.c
+++ b/src/odb.c
@@ -33,7 +33,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "git_odb.h"
+#include "git/odb.h"
struct git_odb {
/** Path to the "objects" directory. */
diff --git a/src/git_oid.c b/src/oid.c
index 20d191c80..f15b75039 100644
--- a/src/git_oid.c
+++ b/src/oid.c
@@ -33,7 +33,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "git_oid.h"
+#include "git/oid.h"
#include <string.h>
static signed char from_hex[] = {
diff --git a/src/git_revwalk.c b/src/revwalk.c
index 898dabc73..4801a2389 100644
--- a/src/git_revwalk.c
+++ b/src/revwalk.c
@@ -33,7 +33,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "git_revwalk.h"
+#include "git/revwalk.h"
#include <stdlib.h>
struct git_revp {