From e2e9576cdb3dea220c7b47f4e18d85b496b23792 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 19 Mar 2011 15:42:12 +0000 Subject: [PATCH] Use pkg-config by default to build --- src/Makefile | 8 ++++---- src/project.conf | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index 16d63d8..cf5f44b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,11 +4,11 @@ DESTDIR = BINDIR = $(PREFIX)/bin CC = cc CPPFLAGSF= -CPPFLAGS= -I $(PREFIX)/include -CFLAGSF = -W +CPPFLAGS= +CFLAGSF = -W `pkg-config --cflags libSystem` CFLAGS = -Wall -g -O2 -pedantic -LDFLAGSF= -lSystem -LDFLAGS = -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib +LDFLAGSF= `pkg-config --libs libSystem` +LDFLAGS = RM = rm -f LN = ln -f MKDIR = mkdir -p diff --git a/src/project.conf b/src/project.conf index 086592d..b109322 100644 --- a/src/project.conf +++ b/src/project.conf @@ -1,9 +1,9 @@ targets=configure,makedepend -cppflags=-I $(PREFIX)/include -cflags_force=-W +cppflags= +cflags_force=-W `pkg-config --cflags libSystem` cflags=-Wall -g -O2 -pedantic -ldflags_force=-lSystem -ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib +ldflags_force=`pkg-config --libs libSystem` +ldflags= dist=Makefile,configure.h,makefile.h,settings.h [configure]