From 4c70a7d2f8d794032bc638c0a61f3f8395ea3060 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 11 Dec 2010 17:13:15 +0000 Subject: [PATCH] Using libDesktop through pkg-config --- src/Makefile | 8 ++++---- src/project.conf | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index c6f6b78..c57c0af 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,12 +3,12 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin CC = cc -CPPFLAGSF= -I $(PREFIX)/include +CPPFLAGSF= CPPFLAGS= -CFLAGSF = -W `pkg-config --cflags gtk+-2.0` +CFLAGSF = -W `pkg-config --cflags libSystem libDesktop` CFLAGS = -Wall -g -O2 -pedantic -LDFLAGSF= `pkg-config --libs gtk+-2.0` -lSystem -lDesktop -LDFLAGS = -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib +LDFLAGSF= `pkg-config --libs libSystem libDesktop` +LDFLAGS = RM = rm -f LN = ln -f MKDIR = mkdir -p diff --git a/src/project.conf b/src/project.conf index e637d01..b66cdab 100644 --- a/src/project.conf +++ b/src/project.conf @@ -1,10 +1,9 @@ targets=editor -cppflags_force=-I $(PREFIX)/include #cppflags=-D EMBEDDED -cflags_force=-W `pkg-config --cflags gtk+-2.0` +cflags_force=-W `pkg-config --cflags libSystem libDesktop` cflags=-Wall -g -O2 -pedantic -ldflags_force=`pkg-config --libs gtk+-2.0` -lSystem -lDesktop -ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib +ldflags_force=`pkg-config --libs libSystem libDesktop` +ldflags= dist=Makefile,callbacks.h,editor.h [editor]