From d992536285e101ac5a57f8a81cd7bc4ff6a62225 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Fri, 16 Dec 2011 19:34:18 +0000
Subject: Rockbox Utility: use libipodpatcher.

Instead of building the sources directly build and link libipodpatcher.a as
done for other tools.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31326 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/rbutilqt.pri | 7 -------
 rbutil/rbutilqt/rbutilqt.pro | 9 ++++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri
index a0f4d550aa..cff4614358 100644
--- a/rbutil/rbutilqt/rbutilqt.pri
+++ b/rbutil/rbutilqt/rbutilqt.pri
@@ -28,7 +28,6 @@ SOURCES += \
  base/talkfile.cpp \
  base/talkgenerator.cpp \
  base/autodetection.cpp \
- ../ipodpatcher/ipodpatcher.c \
  ../sansapatcher/sansapatcher.c \
  themesinstallwindow.cpp \
  base/uninstall.cpp \
@@ -88,9 +87,6 @@ HEADERS += \
  base/autodetection.h \
  base/progressloggerinterface.h \
  progressloggergui.h \
- ../ipodpatcher/ipodpatcher.h \
- ../ipodpatcher/ipodio.h \
- ../ipodpatcher/parttypes.h \
  ../sansapatcher/sansapatcher.h \
  ../sansapatcher/sansaio.h \
  irivertools/h100sums.h \
@@ -182,8 +178,6 @@ RESOURCES += $$_PRO_FILE_PWD_/rbutilqt.qrc
 }
 # windows specific files
 win32 {
-    SOURCES +=  ../ipodpatcher/ipodio-win32.c
-    SOURCES +=  ../ipodpatcher/ipodio-win32-scsi.c
     SOURCES +=  ../sansapatcher/sansaio-win32.c
     RC_FILE = rbutilqt.rc
     RESOURCES += $$_PRO_FILE_PWD_/rbutilqt-win.qrc
@@ -191,7 +185,6 @@ win32 {
 
 # unix specific files
 unix {
-    SOURCES +=  ../ipodpatcher/ipodio-posix.c
     SOURCES +=  ../sansapatcher/sansaio-posix.c
 }
 
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 3e5b7d0b27..c4ce992707 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -83,6 +83,12 @@ libucl.commands = @$(MAKE) -s \
         TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
         libucl$$RBLIBPOSTFIX \
         CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
+libipodpatcher.commands = @$(MAKE) -s \
+        BUILD_DIR=$$MYBUILDDIR/ipodpatcher/ \
+        TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/ipodpatcher \
+        APPVERSION=\"rbutil\" \
+        libipodpatcher$$RBLIBPOSTFIX \
+        CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
 libmkamsboot.commands = @$(MAKE) -s \
         BUILD_DIR=$$MYBUILDDIR/mkamsboot/ \
         TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot \
@@ -109,7 +115,8 @@ libchinachip.commands = @$(MAKE) -s \
         CC=\"$$QMAKE_CC $$MACHINEFLAGS\" AR=\"$$MYAR\"
 # Note: order is important for RBLIBS! The libs are appended to the linker
 # flags in this order, put libucl at the end.
-RBLIBS = librbspeex libmkamsboot libmktccboot libmkmpioboot libchinachip libucl
+RBLIBS = librbspeex libipodpatcher libmkamsboot libmktccboot \
+         libmkmpioboot libchinachip libucl
 QMAKE_EXTRA_TARGETS += $$RBLIBS
 PRE_TARGETDEPS += $$RBLIBS
 
-- 
cgit v1.2.3