Merge branch 'tmp'

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@763 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 982b28298a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-09-12 (Sun, 12 Sep 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-09-12 16:13:53 +00:00
parent bf908b613a
commit 5c0cc41579
7 changed files with 131 additions and 11 deletions

View File

@@ -22,12 +22,15 @@ INCLUDES = \
-I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/lib/libcoolstream \
-I$(top_srcdir)/lib/libupnpclient \
@CURL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
-I$(top_srcdir)/lib
if BOXTYPE_COOL
INCLUDES += -I$(top_srcdir)/lib/libcoolstream
endif
noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a
libneutrino_gui_a_SOURCES = \