--- Makefile.common.orig	Tue Apr 24 15:45:43 2007
+++ Makefile.common	Thu Jun 21 06:58:50 2007
@@ -53,7 +53,7 @@
 
 DEVEL  = 0
 CHATTY = $(DEVEL)
-STATIC_PLUGINS = 0
+STATIC_PLUGINS = 1
 #$(warning CHATTY=$(CHATTY) DEVEL=$(DEVEL))
 ifeq (1,$(CHATTY))
 Q :=
@@ -89,10 +89,8 @@
 CC      ?= gcc
 AR      = ar
 LIBS    = $(shell pkg-config --libs glib-2.0 gmodule-2.0 gthread-2.0 gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib  -lXmu
-INCS2   = $(shell pkg-config --cflags glib-2.0 gmodule-2.0 gthread-2.0 gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
-INCS   := $(INCS2:-I%=-isystem %)
+INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
 
-CFLAGS ?= -O2 -Wall
 ifeq (1,$(DEVEL))
 override CFLAGS += -g
 endif