4 files changed, 81 insertions, 77 deletions
diff --git a/.gitignore b/.gitignore
index 46ab2d0ba2..e215506f8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -667,6 +667,9 @@ lib/cmyth/Makefile
 /xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in
 /xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in
 
+#/xbmc/utils
+/xbmc/utils/Makefile
+
 #/xbmc/visualizations/
 /xbmc/visualizations/DirectXSpectrum/Debug (DirectX)
 /xbmc/visualizations/DirectXSpectrum/Release (DirectX)
diff --git a/configure.in b/configure.in
index 0be28379a2..d89353cc17 100644
--- a/configure.in
+++ b/configure.in
@@ -2426,6 +2426,7 @@ OUTPUT_FILES="Makefile \
     xbmc/peripherals/devices/Makefile \
     xbmc/android/activity/Makefile \
     xbmc/android/loader/Makefile \
+    xbmc/utils/Makefile \
     xbmc/main/Makefile"
 
 if test "$use_skin_touched" = "yes"; then
diff --git a/xbmc/utils/Makefile b/xbmc/utils/Makefile
deleted file mode 100644
index c4026cf794..0000000000
--- a/xbmc/utils/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-SRCS=AlarmClock.cpp \
-     AliasShortcutUtils.cpp \
-     Archive.cpp \
-     AsyncFileCopy.cpp \
-     AutoPtrHandle.cpp \
-     Base64.cpp \
-     BitstreamConverter.cpp \
-     BitstreamStats.cpp \
-     BooleanLogic.cpp \
-     CharsetConverter.cpp \
-     CPUInfo.cpp \
-     Crc32.cpp \
-     CryptThreading.cpp \
-     DatabaseUtils.cpp \
-     DownloadQueue.cpp \
-     DownloadQueueManager.cpp \
-     EndianSwap.cpp \
-     EdenVideoArtUpdater.cpp \
-     Fanart.cpp \
-     fastmemcpy.c \
-     fastmemcpy-arm.S \
-     FileOperationJob.cpp \
-     FileUtils.cpp \
-     fstrcmp.c \
-     fft.cpp \
-     GLUtils.cpp \
-     GroupUtils.cpp \
-     HTMLTable.cpp \
-     HTMLUtil.cpp \
-     HttpHeader.cpp \
-     HttpParser.cpp \
-     HttpResponse.cpp \
-     InfoLoader.cpp \
-     JobManager.cpp \
-     JSONVariantParser.cpp \
-     JSONVariantWriter.cpp \
-     LabelFormatter.cpp \
-     LangCodeExpander.cpp \
-     log.cpp \
-     md5.cpp \
-     Mime.cpp \
-     Observer.cpp \
-     PerformanceSample.cpp \
-     PerformanceStats.cpp \
-     POUtils.cpp \
-     RecentlyAddedJob.cpp \
-     RegExp.cpp \
-     RingBuffer.cpp \
-     RssManager.cpp \
-     RssReader.cpp \
-     ScraperParser.cpp \
-     ScraperUrl.cpp \
-     Screenshot.cpp \
-     SeekHandler.cpp \
-     SortUtils.cpp \
-     Splash.cpp \
-     Stopwatch.cpp \
-     StreamDetails.cpp \
-     StreamUtils.cpp \
-     StringUtils.cpp \
-     SystemInfo.cpp \
-     TextSearch.cpp \
-     TimeSmoother.cpp \
-     TimeUtils.cpp \
-     TuxBoxUtil.cpp \
-     URIUtils.cpp \
-     UrlOptions.cpp \
-     Variant.cpp \
-     Vector.cpp \
-     Weather.cpp \
-     XBMCTinyXML.cpp \
-     XMLUtils.cpp \
-
-LIB=utils.a
-
-include ../../Makefile.include
--include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(patsubst %.S,,$(SRCS))))
diff --git a/xbmc/utils/Makefile.in b/xbmc/utils/Makefile.in
new file mode 100644
index 0000000000..d675218a6f
--- /dev/null
+++ b/xbmc/utils/Makefile.in
@@ -0,0 +1,77 @@
+SRCS += AlarmClock.cpp
+SRCS += AliasShortcutUtils.cpp
+SRCS += Archive.cpp
+SRCS += AsyncFileCopy.cpp
+SRCS += AutoPtrHandle.cpp
+SRCS += Base64.cpp
+SRCS += BitstreamConverter.cpp
+SRCS += BitstreamStats.cpp
+SRCS += BooleanLogic.cpp
+SRCS += CharsetConverter.cpp
+SRCS += CPUInfo.cpp
+SRCS += Crc32.cpp
+SRCS += CryptThreading.cpp
+SRCS += DatabaseUtils.cpp
+SRCS += DownloadQueue.cpp
+SRCS += DownloadQueueManager.cpp
+SRCS += EndianSwap.cpp
+SRCS += EdenVideoArtUpdater.cpp
+SRCS += Fanart.cpp
+SRCS += fastmemcpy.c
+SRCS += fastmemcpy-arm.S
+SRCS += FileOperationJob.cpp
+SRCS += FileUtils.cpp
+SRCS += fstrcmp.c
+SRCS += fft.cpp
+SRCS += GLUtils.cpp
+SRCS += GroupUtils.cpp
+SRCS += HTMLTable.cpp
+SRCS += HTMLUtil.cpp
+SRCS += HttpHeader.cpp
+SRCS += HttpParser.cpp
+SRCS += HttpResponse.cpp
+SRCS += InfoLoader.cpp
+SRCS += JobManager.cpp
+SRCS += JSONVariantParser.cpp
+SRCS += JSONVariantWriter.cpp
+SRCS += LabelFormatter.cpp
+SRCS += LangCodeExpander.cpp
+SRCS += log.cpp
+SRCS += md5.cpp
+SRCS += Mime.cpp
+SRCS += Observer.cpp
+SRCS += PerformanceSample.cpp
+SRCS += PerformanceStats.cpp
+SRCS += POUtils.cpp
+SRCS += RecentlyAddedJob.cpp
+SRCS += RegExp.cpp
+SRCS += RingBuffer.cpp
+SRCS += RssManager.cpp
+SRCS += RssReader.cpp
+SRCS += ScraperParser.cpp
+SRCS += ScraperUrl.cpp
+SRCS += Screenshot.cpp
+SRCS += SeekHandler.cpp
+SRCS += SortUtils.cpp
+SRCS += Splash.cpp
+SRCS += Stopwatch.cpp
+SRCS += StreamDetails.cpp
+SRCS += StreamUtils.cpp
+SRCS += StringUtils.cpp
+SRCS += SystemInfo.cpp
+SRCS += TextSearch.cpp
+SRCS += TimeSmoother.cpp
+SRCS += TimeUtils.cpp
+SRCS += TuxBoxUtil.cpp
+SRCS += URIUtils.cpp
+SRCS += UrlOptions.cpp
+SRCS += Variant.cpp
+SRCS += Vector.cpp
+SRCS += Weather.cpp
+SRCS += XBMCTinyXML.cpp
+SRCS += XMLUtils.cpp
+
+LIB   = utils.a
+
+include @abs_top_srcdir@/Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(patsubst %.S,,$(SRCS))))