[packages] minidlna: fix iconv switch fallout
[openwrt/svn-archive/archive.git] / multimedia / minidlna / patches / 002-makefile-tweaks.patch
1 --- a/Makefile
2 +++ b/Makefile
3 @@ -13,9 +13,21 @@
4 #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
5 #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
6 CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
7 - -I/usr/include/ffmpeg \
8 - -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
9 - -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
10 + -I$(STAGING_DIR)/usr/include \
11 + -I$(STAGING_DIR)/usr/include/FLAC \
12 + -I$(STAGING_DIR)/usr/include/libavcodec \
13 + -I$(STAGING_DIR)/usr/include/libavformat \
14 + -I$(STAGING_DIR)/usr/include/libavutil \
15 + -I$(STAGING_DIR)/usr/include/libexif \
16 + -I$(STAGING_DIR)/usr/include/uuid \
17 + -I$(STAGING_DIR)/usr/include/vorbis \
18 + -I$(ICONV_PREFIX)/include \
19 + -I$(INTL_PREFIX)/include
20 +LDFLAGS = -L$(STAGING_DIR)/usr/lib \
21 + -L$(ICONV_PREFIX)/lib \
22 + -L$(INTL_PREFIX)/lib \
23 + -Wl,-rpath=$(STAGING_DIR)/usr/lib \
24 + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
25 #STATIC_LINKING: LDFLAGS = -static
26 CC = gcc
27 RM = rm -f
28 @@ -36,7 +48,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
29
30 ALLOBJS = $(BASEOBJS) $(LNXOBJS)
31
32 -LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -lvorbis
33 +LIBS = -liconv -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -lvorbis -luuid
34 #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
35
36 TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
37 @@ -58,7 +70,7 @@ install: minidlna
38 $(INSTALL) -d $(ETCINSTALLDIR)
39 $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
40
41 -minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
42 +minidlna: $(BASEOBJS) $(LNXOBJS)
43 @echo Linking $@
44 @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
45