Index: Makefile
===================================================================
--- Makefile	(revision 25695)
+++ Makefile	(revision 25696)
@@ -1,13 +1,12 @@
 TRUNK=../../trunk
 
-#TODO: this should come from hidlib.mak
-LDFLAGS_HIDLIB= -rdynamic -lfungw -lm -lgenht -lcairo -lgd -lfuse -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype -L/opt/X11/lib -lXm -lXt -lX11 -lXinerama -lXrender -lxml2 -lstroke  $(TRUNK)/src_3rd/puplug/libpuplug.a $(TRUNK)/src_3rd/libminuid/libminuid.a  -lm -ldl $(TRUNK)/src_3rd/puplug/libpuplug.a $(TRUNK)/src_3rd/libminuid/libminuid.a
+HIDLIB_ROOT=$(TRUNK)
 
-CFLAGS = -Wall -g -I$(TRUNK)/src -I$(TRUNK)/src_3rd -I$(TRUNK)
+include $(TRUNK)/src/hidlib.mak
+
+CFLAGS = -Wall -g $(CFLAGS_HIDLIB)
 LDFLAGS = $(LDFLAGS_HIDLIB)
 
-
-
 main: main.o gui_act.o draw.o crosshair.o rtree.o $(TRUNK)/src/hidlib.a
 	$(CC) -o main $^ $(LDFLAGS)