--- Makefile    2009-07-14 09:47:32.000000000 +0200
+++ ../Makefile.FreeBSD 2009-07-14 09:48:01.000000000 +0200
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -O2 -pipe -Wall -ggdb3 -fPIC
+CFLAGS = -O2 -pipe -Wall -ggdb3 -fPIC -I/usr/local/include -g
 SHARED_OBJS = cfgfile.o ipc.o shared.o io.o protocol.o data.o
 TEST_OBJS = test_utils.o $(SHARED_OBJS)
 COMMON_OBJS = version.o logging.o $(SHARED_OBJS)
@@ -12,16 +12,11 @@
 DSO = merlin
 PROG = $(DSO)d
 NEB = $(DSO).so
-MOD_LDFLAGS = -shared -ggdb3 -fPIC
-DAEMON_LDFLAGS = -ldbi -ggdb3
+MOD_LDFLAGS = -shared -nostdlib -ggdb3 -fPIC ${MODULE_OBJS} -o merlin.so 
+DAEMON_LDFLAGS = -L/usr/local/lib -ldbi -ggdb3 ${DAEMON_OBJS} -o merlind 
 SPARSE_FLAGS += -I. -Wno-transparent-union -Wnoundef
 DESTDIR = /tmp/merlin
 
-ifndef V
-       QUIET_CC    = @echo '   ' CC $@;
-       QUIET_LINK  = @echo '   ' LINK $@;
-endif
-
 all: $(NEB) $(PROG)
 
 install: all