storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Rename minidlna to minidlnad, and install it in /usr/sbin like a proper system daemon.

Browse Source
This commit is contained in:
Justin Maggard 2012-10-04 21:03:41 +00:00
parent 584258c1f8
commit de15926f76
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -2,8 +2,9 @@ AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 @STATIC_CFLAGS@
SUBDIRS=po SUBDIRS=po
bin_PROGRAMS = minidlna testupnpdescgen sbin_PROGRAMS = minidlnad
minidlna_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \ check_PROGRAMS = testupnpdescgen
minidlnad_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
upnpreplyparse.c minixml.c \ upnpreplyparse.c minixml.c \
getifaddr.c daemonize.c upnpglobalvars.c \ getifaddr.c daemonize.c upnpglobalvars.c \
options.c minissdp.c uuid.c upnpevents.c \ options.c minissdp.c uuid.c upnpevents.c \
@ -12,7 +13,6 @@ minidlna_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
tagutils/textutils.c tagutils/misc.c tagutils/tagutils.c \ tagutils/textutils.c tagutils/misc.c tagutils/tagutils.c \
playlist.c image_utils.c albumart.c log.c playlist.c image_utils.c albumart.c log.c
#if NEED_VORBIS #if NEED_VORBIS
vorbisflag = -lvorbis vorbisflag = -lvorbis
#endif #endif
@ -21,20 +21,19 @@ vorbisflag = -lvorbis
flacoggflag = -logg flacoggflag = -logg
#endif #endif
minidlna_LDADD = \ minidlnad_LDADD = \
@LIBJPEG_LIBS@ \ @LIBJPEG_LIBS@ \
@LIBID3TAG_LIBS@ \ @LIBID3TAG_LIBS@ \
@LIBSQLITE3_LIBS@ \ @LIBSQLITE3_LIBS@ \
@LIBAVFORMAT_LIBS@ \ @LIBAVFORMAT_LIBS@ \
@LIBAVUTIL_LIBS@ \ @LIBAVUTIL_LIBS@ \
@LIBEXIF_LIBS@ \ @LIBEXIF_LIBS@ \
@LIBDL_LIBS@ \
@LIBRT_LIBS@ \ @LIBRT_LIBS@ \
@LIBINTL@ \ @LIBINTL@ \
@LIBICONV@ \ @LIBICONV@ \
-lpthread -lFLAC $(flacoggflag) $(vorbisflag) -lpthread -lFLAC $(flacoggflag) $(vorbisflag)
minidlna_LDFLAGS = @STATIC_LDFLAGS@ minidlnad_LDFLAGS = @STATIC_LDFLAGS@
testupnpdescgen_SOURCES = testupnpdescgen.c upnpdescgen.c testupnpdescgen_SOURCES = testupnpdescgen.c upnpdescgen.c
testupnpdescgen_LDADD = \ testupnpdescgen_LDADD = \
@ -44,7 +43,6 @@ testupnpdescgen_LDADD = \
@LIBAVFORMAT_LIBS@ \ @LIBAVFORMAT_LIBS@ \
@LIBAVUTIL_LIBS@ \ @LIBAVUTIL_LIBS@ \
@LIBEXIF_LIBS@ \ @LIBEXIF_LIBS@ \
@LIBDL_LIBS@ \
-lpthread -lFLAC $(flacoggflag) $(vorbisflag) -lpthread -lFLAC $(flacoggflag) $(vorbisflag)

2
configure.ac
View File

@ -104,8 +104,6 @@ AC_COMPILE_IFELSE(
################################################################################################################ ################################################################################################################
### Library checks ### Library checks
AC_CHECK_LIB([dl], [dlopen], [LIBDL_LIBS="-ldl"],)
AC_SUBST(LIBDL_LIBS)
CPPFLAGS_SAVE="$CPPFLAGS" CPPFLAGS_SAVE="$CPPFLAGS"
for dir in "" /usr/local $INCLUDE_DIR; do for dir in "" /usr/local $INCLUDE_DIR; do