6 files changed, 95 insertions, 96 deletions

diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro
index cbb3359..faceed2 100644
--- a/heimdall-frontend/heimdall-frontend.pro
+++ b/heimdall-frontend/heimdall-frontend.pro
@@ -1,62 +1,62 @@
-# ----------------------------------------------------

-# This file is generated by the Qt Visual Studio Add-in.

-# ------------------------------------------------------

-

-TEMPLATE = app

-TARGET = heimdall-frontend

-

-macx {

-	PRIVATE_FRAMEWORKS.files = /Library/Frameworks/QtCore.framework \

-		/Library/Frameworks/QtGui.framework /Library/Frameworks/QtXml.framework

-	PRIVATE_FRAMEWORKS.path = Contents/Frameworks

-

-	QMAKE_BUNDLE_DATA += PRIVATE_FRAMEWORKS

-

-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4

-	QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk

-

-	config += x86 x86_64 ppc

-

-	isEqual(OUTPUTDIR, "") {

-		DESTDIR = /Applications

-	} else {

-		DESTDIR = $$OUTPUTDIR

-	}

-

-} else {

-	win32 {	# It's recommended that Windows users compile via VS2010, but just in case...

-		DESTDIR = ../Win32

-

-		!isEqual(OUTPUTDIR, "") {

-			target.path = $$OUTPUTDIR

-			INSTALLS += target

-		}

-	} else {

-		DESTDIR = ../Linux

-

-		isEqual(OUTPUTDIR, "") {

-			target.path = /usr/local/bin

-		} else {

-			target.path = $$OUTPUTDIR

-		}

-

-		INSTALLS += target

-	}

-}

-

-unix:LIBS += -lz ../libpit/libpit-1.3.a

-win32:LIBS += ../Win32/Release/lib/libpit.lib

-

-QT += core gui xml

-CONFIG += release

-DEFINES += QT_LARGEFILE_SUPPORT

-INCLUDEPATH += ./GeneratedFiles \

-    ./GeneratedFiles/Release \

-    ../libpit/Source \

-    .

-DEPENDPATH += .

-MOC_DIR += ./GeneratedFiles/release

-OBJECTS_DIR += release

-UI_DIR += ./GeneratedFiles

-RCC_DIR += ./GeneratedFiles

-include(heimdall-frontend.pri)

+# ----------------------------------------------------
+# This file is generated by the Qt Visual Studio Add-in.
+# ------------------------------------------------------
+
+TEMPLATE = app
+TARGET = heimdall-frontend
+
+macx {
+	PRIVATE_FRAMEWORKS.files = /Library/Frameworks/QtCore.framework \
+		/Library/Frameworks/QtGui.framework /Library/Frameworks/QtXml.framework
+	PRIVATE_FRAMEWORKS.path = Contents/Frameworks
+
+	QMAKE_BUNDLE_DATA += PRIVATE_FRAMEWORKS
+
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+	QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+
+	config += x86 x86_64 ppc
+
+	isEqual(OUTPUTDIR, "") {
+		DESTDIR = /Applications
+	} else {
+		DESTDIR = $$OUTPUTDIR
+	}
+
+} else {
+	win32 {	# It's recommended that Windows users compile via VS2010, but just in case...
+		DESTDIR = ../Win32
+
+		!isEqual(OUTPUTDIR, "") {
+			target.path = $$OUTPUTDIR
+			INSTALLS += target
+		}
+	} else {
+		DESTDIR = ../Linux
+
+		isEqual(OUTPUTDIR, "") {
+			target.path = /usr/local/bin
+		} else {
+			target.path = $$OUTPUTDIR
+		}
+
+		INSTALLS += target
+	}
+}
+
+unix:LIBS += -lz ../libpit/libpit-1.3.a
+win32:LIBS += ../Win32/Release/lib/libpit.lib
+
+QT += core gui xml
+CONFIG += release
+DEFINES += QT_LARGEFILE_SUPPORT
+INCLUDEPATH += ./GeneratedFiles \
+    ./GeneratedFiles/Release \
+    ../libpit/Source \
+    .
+DEPENDPATH += .
+MOC_DIR += ./GeneratedFiles/release
+OBJECTS_DIR += release
+UI_DIR += ./GeneratedFiles
+RCC_DIR += ./GeneratedFiles
+include(heimdall-frontend.pri)
diff --git a/heimdall/Makefile.am b/heimdall/Makefile.am
index 78544fe..bc58da5 100644
--- a/heimdall/Makefile.am
+++ b/heimdall/Makefile.am
@@ -1,33 +1,33 @@
-AUTOMAKE_OPTIONS = subdir-objects

-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}

-AM_CPPFLAGS = $(DEPS_CFLAGS) -I../libpit/Source

-STATIC_LIBS = ../libpit/libpit-1.3.a

-

-bin_PROGRAMS = heimdall

-heimdall_SOURCES = source/BeginDumpPacket.h source/BridgeManager.cpp \

-	source/BridgeManager.h source/ControlPacket.h source/DeviceInfoPacket.h  \

-	source/DeviceInfoResponse.h source/DumpPartFileTransferPacket.h \

-	source/DumpPartPitFilePacket.h source/DumpResponse.h source/EndFileTransferPacket.h \

-	source/EndModemFileTransferPacket.h source/EndPhoneFileTransferPacket.h \

-	source/EndSessionPacket.h source/FileTransferPacket.h source/FlashPartFileTransferPacket.h \

-	source/FlashPartPitFilePacket.h source/Heimdall.h source/InboundPacket.h \

-	source/Interface.cpp source/Interface.h source/main.cpp source/OutboundPacket.h \

-	source/Packet.h source/PitFilePacket.h source/PitFileResponse.h source/ReceiveFilePartPacket.h \

-	source/ResponsePacket.h source/SendFilePartPacket.h source/SendFilePartResponse.h

-

-heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)

-

-if LINUXTARGET

-udevrulesdir = /lib/udev/rules.d

-udevrules_DATA = 60-heimdall-galaxy-s.rules

-

-install-data-hook:

-if UDEVADM

-	sudo udevadm control --reload_rules

-else

-	sudo service udev restart

-endif

-

-endif

-

-dist_noinst_SCRIPTS = autogen.sh

+AUTOMAKE_OPTIONS = subdir-objects
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+AM_CPPFLAGS = $(DEPS_CFLAGS) -I../libpit/Source
+STATIC_LIBS = ../libpit/libpit-1.3.a
+
+bin_PROGRAMS = heimdall
+heimdall_SOURCES = source/BeginDumpPacket.h source/BridgeManager.cpp \
+	source/BridgeManager.h source/ControlPacket.h source/DeviceInfoPacket.h  \
+	source/DeviceInfoResponse.h source/DumpPartFileTransferPacket.h \
+	source/DumpPartPitFilePacket.h source/DumpResponse.h source/EndFileTransferPacket.h \
+	source/EndModemFileTransferPacket.h source/EndPhoneFileTransferPacket.h \
+	source/EndSessionPacket.h source/FileTransferPacket.h source/FlashPartFileTransferPacket.h \
+	source/FlashPartPitFilePacket.h source/Heimdall.h source/InboundPacket.h \
+	source/Interface.cpp source/Interface.h source/main.cpp source/OutboundPacket.h \
+	source/Packet.h source/PitFilePacket.h source/PitFileResponse.h source/ReceiveFilePartPacket.h \
+	source/ResponsePacket.h source/SendFilePartPacket.h source/SendFilePartResponse.h
+
+heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
+
+if LINUXTARGET
+udevrulesdir = /lib/udev/rules.d
+udevrules_DATA = 60-heimdall-galaxy-s.rules
+
+install-data-hook:
+if UDEVADM
+	sudo udevadm control --reload_rules
+else
+	sudo service udev restart
+endif
+
+endif
+
+dist_noinst_SCRIPTS = autogen.sh
diff --git a/heimdall/autogen.sh b/heimdall/autogen.sh
index 54516bc..3f026c4 100644..100755
--- a/heimdall/autogen.sh
+++ b/heimdall/autogen.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-
 autoreconf --force --install
diff --git a/heimdall/configure b/heimdall/configure
index 874db3d..874db3d 100644..100755
--- a/heimdall/configure
+++ b/heimdall/configure
diff --git a/heimdall/install-sh b/heimdall/install-sh
index 6781b98..6781b98 100644..100755
--- a/heimdall/install-sh
+++ b/heimdall/install-sh
diff --git a/heimdall/ltmain.sh b/heimdall/ltmain.sh
index 7ed280b..7ed280b 100644..100755
--- a/heimdall/ltmain.sh
+++ b/heimdall/ltmain.sh