ddb87455da
- remove patch-ab, as it is applied upstream This should fix PR 33258 Changelog: 05/03/2006 daapd 0.2.4b. Two small changes to adapt daapd to the current versions of MaxOS X (10.4.x) and iTunes (6.0.4)
63 lines
2 KiB
Text
63 lines
2 KiB
Text
$NetBSD: patch-aa,v 1.12 2006/04/23 18:25:27 tonio Exp $
|
|
|
|
--- makefile.orig 2006-03-05 14:39:37.000000000 +0100
|
|
+++ makefile
|
|
@@ -2,28 +2,28 @@
|
|
|
|
HOWL_ENABLE = 1
|
|
ZLIB_ENABLE = 1
|
|
-MPEG4_ENABLE = 0
|
|
+MPEG4_ENABLE = $(WITH_FAAD)
|
|
|
|
|
|
# no need to touch anything below this line
|
|
# -----------------------------------------
|
|
|
|
-CC = g++
|
|
+CC = $(CXX)
|
|
MAKE = $(MAKE_COMMAND)
|
|
TARGET = daapd
|
|
DEPS = daaplib_ libhttpd_
|
|
OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o util.o
|
|
LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz
|
|
-LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L/usr/local/lib
|
|
-INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I/usr/local/include
|
|
-DEPLOY = /usr/local
|
|
-CFLAGS = -Wall -Wno-multichar
|
|
+LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L$(PREFIX)/lib $(LDFLAGS)
|
|
+INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I$(PREFIX)/include
|
|
+DEPLOY = $(PREFIX)
|
|
+CFLAGS += -Wall -Wno-multichar
|
|
|
|
# HOWL
|
|
ifeq ($(HOWL_ENABLE),1)
|
|
- HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) )
|
|
+ HOWLDIRS := $(sort $(wildcard $(PREFIX)/include/howl*) )
|
|
ifeq ($(words $(HOWLDIRS) ), 0)
|
|
-$(error howl not found in /usr/local/include. Install howl or disable it in the makefile)
|
|
+$(error howl not found in $(PREFIX)/include. Install howl or disable it in the makefile)
|
|
endif
|
|
HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
|
|
INCPATH := $(INCPATH) -I$(HOWLRECENT)
|
|
@@ -46,11 +46,7 @@ ifneq ($(shell $(CC) -E -dM - < /dev/nul
|
|
LIBS := $(LIBS) -lsocket -lnsl
|
|
endif
|
|
|
|
-ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __FreeBSD__),)
|
|
- LIBS := $(LIBS) -pthread
|
|
-else
|
|
- LIBS := $(LIBS) -lpthread
|
|
-endif
|
|
+LIBS+= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
|
|
|
|
ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __sgi__),)
|
|
LIBS := $(LIBS) /usr/lib/snprintf.o
|
|
@@ -80,8 +76,6 @@ clean:
|
|
rm $(OBJS) $(TARGET)
|
|
|
|
install: $(DEPS) $(TARGET)
|
|
- cd libhttpd && $(MAKE) install
|
|
- cd daaplib/src && $(MAKE) install
|
|
cp $(TARGET) $(DEPLOY)/bin
|
|
chmod a+rx $(DEPLOY)/bin/$(TARGET)
|
|
cp $(TARGET).8 $(DEPLOY)/man/man8
|