-CFLAGS = -Wall -Os -mcpu=arm1136jf-s -mthumb
-CFLAGS_LIB = -fPIC
-CPPFLAGS = `pkg-config --cflags gtk+-2.0`
-CPPFLAGS_LIB = -DHILDON -DHILDON_CP_APPLET
-LDFLAGS = `pkg-config --libs gtk+-2.0`
-LDFLAGS_LIB = -shared
-PREFIX = /usr/local
+CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
+CFLAGS_PLUGIN = -fPIC
+CPPFLAGS = -I../ `pkg-config --cflags gtk+-2.0` $(EXTRA_CPPFLAGS)
+CPPFLAGS_HILDON = -DHILDON `pkg-config --cflags hildon-1`
+CPPFLAGS_PLUGIN = $(CPPFLAGS_HILDON) -DHILDON_CP_APPLET \
+ `pkg-config --cflags libosso` `pkg-config --cflags hildon-control-panel`
+LDFLAGS = -Wl,--as-needed `pkg-config --libs gtk+-2.0` $(EXTRA_LDFLAGS)
+LDFLAGS_HILDON = `pkg-config --libs hildon-1`
+LDFLAGS_PLUGIN = -shared $(LDFLAGS_HILDON) \
+ `pkg-config --libs libosso` `pkg-config --libs hildon-control-panel`
+PREFIX = /usr
+
+other_obj = ../configfile.o ../config.o save-config.o