mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/Makefile.am: fix merge conflicts

Browse Source
This commit is contained in:
[CST] Focus
2012-04-19 11:25:47 +04:00
parent 9d804e0ff0 d9dce5c10f
commit c8adf5272f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile.am
View File

@@ -87,11 +87,16 @@ neutrino_LDADD = \
$(FLACLIBS) \ $(FLACLIBS) \
$(VORBISLIBS) \ $(VORBISLIBS) \
-ldvbsi++ \ -ldvbsi++ \
-lungif \
-ljpeg \ -ljpeg \
-lOpenThreads \ -lOpenThreads \
-lrt -lpthread -lrt -lpthread
if ENABLE_GIFLIB
neutrino_LDADD += -lgif
else
neutrino_LDADD += -lungif
endif
if ENABLE_UPNP if ENABLE_UPNP
neutrino_LDADD += \ neutrino_LDADD += \
$(top_builddir)/lib/libupnpclient/libtuxbox-upnpclient.a $(top_builddir)/lib/libupnpclient/libtuxbox-upnpclient.a