diff --git a/test/Makefile b/test/Makefile
index a4638ba..9f1ba1d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,18 +9,24 @@
 OS=$(shell uname -s)
 CC=gcc
 
-CFLAGS=-Wall --static -O2 -ggdb
+CFLAGS=-Wall -O2 -ggdb
 #-O2 -ggdb
 INCLUDES=-I /usr/include -I ../src/ 
 LIBINC=-L /usr/lib -L ../src 
 
-LIBS=-lnazgul
+BASELIBS=-lnazgul
+LIBS=$(BASELIBS)
+
+ifeq "HP-UX" "${OS}"
+  LIBS=$(BASELIBS) -lpthread -lrt
+endif
+
 ifeq "SunOS" "${OS}"
-  LIBS=-lnazgul -lrt
+  LIBS=$(BASELIBS) -lrt
 endif
 
 ifeq "Linux" "${OS}"
-  LIBS=-lnazgul -lrt -lpthread
+  LIBS=$(BASELIBS) -lrt -lpthread
 endif
 
 PRJNAME=Libnazgul