From c19f3f8335ec0b2a6aa87d78e4d74c8af488edc4 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 25 Aug 2022 02:48:17 +0200 Subject: [PATCH] Sort sections in the project.conf files --- src/engines/project.conf | 34 ++++++++++++++++++---------------- src/project.conf | 2 ++ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/engines/project.conf b/src/engines/project.conf index f0e5b60..4c49bee 100644 --- a/src/engines/project.conf +++ b/src/engines/project.conf @@ -4,6 +4,7 @@ cflags_force=-fPIC cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all dist=Makefile +#targets [pdo] type=plugin sources=pdo.c @@ -11,10 +12,6 @@ cflags=`pkg-config --cflags libSystem` ldflags=`pkg-config --cflags libSystem` install=$(LIBDIR)/Database/engine -[pdo.c] -depends=../../include/Database/database.h,../../config.h -cppflags=-D PREFIX=\"$(PREFIX)\" - [pgsql] type=plugin cppflags=-I `pg_config --includedir` @@ -23,9 +20,6 @@ ldflags=`pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_c sources=pgsql.c install=$(LIBDIR)/Database/engine -[pgsql.c] -depends=../../include/Database/database.h - [pgsqlpool] type=plugin cppflags=-I `pg_config --includedir` @@ -34,9 +28,6 @@ ldflags=`pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_c sources=pgsqlpool.c install=$(LIBDIR)/Database/engine -[pgsqlpool.c] -depends=../../include/Database/database.h,pgsql.c - [sqlite2] type=plugin cflags=`pkg-config --cflags sqlite libSystem` @@ -44,9 +35,6 @@ ldflags=`pkg-config --libs sqlite libSystem` sources=sqlite2.c install=$(LIBDIR)/Database/engine -[sqlite2.c] -depends=../../include/Database/database.h - [sqlite3] type=plugin cflags=`pkg-config --cflags sqlite3 libSystem` @@ -54,14 +42,28 @@ ldflags=`pkg-config --libs sqlite3 libSystem` sources=sqlite3.c install=$(LIBDIR)/Database/engine -[sqlite3.c] -depends=../../include/Database/database.h - [template] type=plugin cflags=`pkg-config --cflags libSystem` ldflags=`pkg-config --libs libSystem` sources=template.c +#sources +[pdo.c] +depends=../../include/Database/database.h,../../config.h +cppflags=-D PREFIX=\"$(PREFIX)\" + +[pgsql.c] +depends=../../include/Database/database.h + +[pgsqlpool.c] +depends=../../include/Database/database.h,pgsql.c + +[sqlite2.c] +depends=../../include/Database/database.h + +[sqlite3.c] +depends=../../include/Database/database.h + [template.c] depends=../../include/Database/database.h diff --git a/src/project.conf b/src/project.conf index 4403852..0a880dd 100644 --- a/src/project.conf +++ b/src/project.conf @@ -7,11 +7,13 @@ ldflags_force=`pkg-config --libs libSystem` ldflags=-Wl,-z,relro -Wl,-z,now dist=Makefile,database.h,python/project.conf,python/Makefile,python/libDatabase.c,python/libDatabase.py +#targets [libDatabase] type=library sources=database.c,statement.c install=$(LIBDIR) +#sources [database.c] depends=../include/Database/database.h,../include/Database/engine.h,database.h,../config.h cppflags=-D PREFIX=\"$(PREFIX)\" -D LIBDIR=\"$(LIBDIR)\"