From e5bdcf5192fff8daa823570703bfabdf8fd5acf6 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 29 Oct 2012 21:21:31 +0100
Subject: [PATCH] Renamed src/database to src/engines for consistency

---
 Makefile                               | 16 ++++++++--------
 src/Makefile                           |  4 ++--
 src/database.c                         |  2 +-
 src/{database => engines}/Makefile     |  0
 src/{database => engines}/database.h   |  0
 src/{database => engines}/pdo.c        |  0
 src/{database => engines}/pgsql.c      |  0
 src/{database => engines}/project.conf |  0
 src/{database => engines}/sqlite2.c    |  0
 src/{database => engines}/sqlite3.c    |  0
 src/{database => engines}/template.c   |  0
 src/project.conf                       |  4 ++--
 12 files changed, 13 insertions(+), 13 deletions(-)
 rename src/{database => engines}/Makefile (100%)
 rename src/{database => engines}/database.h (100%)
 rename src/{database => engines}/pdo.c (100%)
 rename src/{database => engines}/pgsql.c (100%)
 rename src/{database => engines}/project.conf (100%)
 rename src/{database => engines}/sqlite2.c (100%)
 rename src/{database => engines}/sqlite3.c (100%)
 rename src/{database => engines}/template.c (100%)

diff --git a/Makefile b/Makefile
index 24dfa84..2f8a322 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,14 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/database.c \
 		$(PACKAGE)-$(VERSION)/src/Makefile \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
-		$(PACKAGE)-$(VERSION)/src/database/pdo.c \
-		$(PACKAGE)-$(VERSION)/src/database/pgsql.c \
-		$(PACKAGE)-$(VERSION)/src/database/sqlite2.c \
-		$(PACKAGE)-$(VERSION)/src/database/sqlite3.c \
-		$(PACKAGE)-$(VERSION)/src/database/template.c \
-		$(PACKAGE)-$(VERSION)/src/database/Makefile \
-		$(PACKAGE)-$(VERSION)/src/database/database.h \
-		$(PACKAGE)-$(VERSION)/src/database/project.conf \
+		$(PACKAGE)-$(VERSION)/src/engines/pdo.c \
+		$(PACKAGE)-$(VERSION)/src/engines/pgsql.c \
+		$(PACKAGE)-$(VERSION)/src/engines/sqlite2.c \
+		$(PACKAGE)-$(VERSION)/src/engines/sqlite3.c \
+		$(PACKAGE)-$(VERSION)/src/engines/template.c \
+		$(PACKAGE)-$(VERSION)/src/engines/Makefile \
+		$(PACKAGE)-$(VERSION)/src/engines/database.h \
+		$(PACKAGE)-$(VERSION)/src/engines/project.conf \
 		$(PACKAGE)-$(VERSION)/Makefile \
 		$(PACKAGE)-$(VERSION)/config.h \
 		$(PACKAGE)-$(VERSION)/project.conf
diff --git a/src/Makefile b/src/Makefile
index d5c86f2..8bb8984 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS	= database
+SUBDIRS	= engines
 TARGETS	= libDatabase.a libDatabase.so.0.0 libDatabase.so.0 libDatabase.so
 PREFIX	= /usr/local
 DESTDIR	=
@@ -35,7 +35,7 @@ libDatabase.so.0.0 libDatabase.so.0 libDatabase.so: $(libDatabase_OBJS)
 	$(LN) -s -- libDatabase.so.0.0 libDatabase.so.0
 	$(LN) -s -- libDatabase.so.0.0 libDatabase.so
 
-database.o: database.c database/database.h
+database.o: database.c engines/database.h
 	$(CC) $(libDatabase_CFLAGS) -c database.c
 
 clean:
diff --git a/src/database.c b/src/database.c
index 8586920..fac8a7d 100644
--- a/src/database.c
+++ b/src/database.c
@@ -17,7 +17,7 @@
 
 #include <string.h>
 #include <System.h>
-#include "database/database.h"
+#include "engines/database.h"
 #include "../config.h"
 
 
diff --git a/src/database/Makefile b/src/engines/Makefile
similarity index 100%
rename from src/database/Makefile
rename to src/engines/Makefile
diff --git a/src/database/database.h b/src/engines/database.h
similarity index 100%
rename from src/database/database.h
rename to src/engines/database.h
diff --git a/src/database/pdo.c b/src/engines/pdo.c
similarity index 100%
rename from src/database/pdo.c
rename to src/engines/pdo.c
diff --git a/src/database/pgsql.c b/src/engines/pgsql.c
similarity index 100%
rename from src/database/pgsql.c
rename to src/engines/pgsql.c
diff --git a/src/database/project.conf b/src/engines/project.conf
similarity index 100%
rename from src/database/project.conf
rename to src/engines/project.conf
diff --git a/src/database/sqlite2.c b/src/engines/sqlite2.c
similarity index 100%
rename from src/database/sqlite2.c
rename to src/engines/sqlite2.c
diff --git a/src/database/sqlite3.c b/src/engines/sqlite3.c
similarity index 100%
rename from src/database/sqlite3.c
rename to src/engines/sqlite3.c
diff --git a/src/database/template.c b/src/engines/template.c
similarity index 100%
rename from src/database/template.c
rename to src/engines/template.c
diff --git a/src/project.conf b/src/project.conf
index 6927798..9b1f4ad 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,4 +1,4 @@
-subdirs=database
+subdirs=engines
 targets=libDatabase
 cflags_force=-W -fPIC
 cflags=-Wall -g -O2 -pedantic
@@ -9,4 +9,4 @@ type=library
 sources=database.c
 
 [database.c]
-depends=database/database.h
+depends=engines/database.h