[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg
Subject:    Re: Compiling synaptics on xserver git
From:       Johannes Engel <jcnengel () googlemail ! com>
Date:       2008-03-28 11:18:02
Message-ID: 47ECD3EA.9080406 () googlemail ! com
[Download RAW message or body]

Julien Cristau wrote:
> Why not just use 'pkg-config --cflags xorg-server' instead of all this
> convoluted stuff to get the correct include dirs?  synaptics shouldn't
> have to care about pixman...
You are totally right. Here we go... ;)

Greetings, Johannes

["0001-Use-pkg-config-for-xorg-includes.patch" (text/x-patch)]

From c67ed46647b1345d45a59c3946058587420ef63d Mon Sep 17 00:00:00 2001
From: Johannes Engel <engel@wmaz5.math.uni-wuppertal.de>
Date: Fri, 28 Mar 2008 12:15:19 +0100
Subject: [PATCH 1/1] Use pkg-config for xorg includes as proposed by Julien Cristau

---
 Makefile |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 81e9370..f58bcb7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,14 +32,7 @@ ifeq ($(BUILD_MODULAR),y)
   INPUT_MODULE_DIR = $(DESTDIR)$(shell pkg-config xorg-server --variable=moduledir)/input
   SYNAPTICS_DRV = synaptics_drv.so
   LDCOMBINEFLAGS = -shared -lc
-  PICFLAG = $(call check_gcc,-fPIC,)
-  X_INCLUDES_ROOT = $(INSTALLED_X)
-  SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir)
-  PIXMANINC = $(shell pkg-config pixman-1 --variable=includedir)/pixman-1
-  ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
-		-I$(INSTALLED_X)/include/X11/extensions \
-		-I$(SDKDIR) \
-		-I$(PIXMANINC)
+  ALLINCLUDES = $(shell pkg-config --cflags xorg-server)
 else
   INSTALLED_X = /usr/X11R6
   INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
-- 
1.5.4.1



_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg

[prev in list] [next in list] [prev in thread] [next in thread]