From 3e3f49a94d308465840fec22ae746fa2432256f3 Mon Sep 17 00:00:00 2001
From: Ulf Lilleengen <lulf@pvv.ntnu.no>
Date: Thu, 27 Nov 2008 13:22:56 +0100
Subject: - Include pnotify in build and link against it in musicfs.

---
 Makefile         | 2 +-
 pnotify/Makefile | 2 ++
 src/Makefile     | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index afdc002..520fc98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS= src
+SUBDIRS= pnotify src
 TARGET= musicfs
 
 .PHONY: all
diff --git a/pnotify/Makefile b/pnotify/Makefile
index 2610596..2760fda 100644
--- a/pnotify/Makefile
+++ b/pnotify/Makefile
@@ -4,7 +4,9 @@ TARGET_DIR=pnotify-0.2
 $(TARGET):
 	cd $(TARGET_DIR) && ./configure && gmake
 	cp $(TARGET_DIR)/$(TARGET) .
+	ln -sf $(TARGET_DIR)/pnotify.h
 
 clean:
 	rm $(TARGET)
+	rm pnotify.h
 	cd $(TARGET_DIR) && gmake distclean
diff --git a/src/Makefile b/src/Makefile
index bcba591..b10d90d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,9 +2,9 @@ CFLAGS = -Wall -std=c99 -D_BSD_SOURCE -g \
     `pkg-config fuse --cflags` `pkg-config taglib --cflags` \
     -DDEBUGGING -DSQLITE_THREADED
 
-INCLUDES= -I/usr/local/include -I../include
-LDFLAGS= -L/usr/local/lib
-LIBS= -lsqlite3 -ltag_c -lpthread `pkg-config fuse --libs`
+INCLUDES= -I/usr/local/include -I../include -I../pnotify
+LDFLAGS= -L/usr/local/lib -L../pnotify
+LIBS= -lsqlite3 -ltag_c -lpthread -lpnotify `pkg-config fuse --libs`
 CC= gcc
 LD= gcc
 SRCS= mfs_cleanup_db.c mfs_subr.c mfs_vnops.c musicfs.c
-- 
cgit v1.2.3