Merge pull request #4735 from cg110/fix_web_server_mem_leak
[vuplus_xbmc] / Makefile.in
index 6f689cf..754f153 100644 (file)
@@ -481,7 +481,7 @@ FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
              lib/ffmpeg/libpostproc/libpostproc.a \
              lib/ffmpeg/libswscale/libswscale.a
 DYNOBJSXBMC+= $(FFMPEGOBJS)
-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
+LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@
 
 $(FFMPEGOBJS): dvdpcodecs
 endif
@@ -648,9 +648,9 @@ endif
        @install -d $(DESTDIR)$(datarootdir)/applications
        @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
        @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
-       @install -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
+       @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
        @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
-       @install -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
+       @install -m 0644 media/icon256x256.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
        @test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
 
        @echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc"