Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/EionRobb/skype4pidgin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--Makefile15
2 files changed, 7 insertions, 9 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0ba8ac1..1cdf158 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Changelog
* Group stuff: changing groups of buddies in Pidgin changes them in Skype
* Shouldn't come up with the "Skype not running" error message as often
* A few other minor bug fixes
+* Oops, a big bugfix - if you already downloaded todays version, get it again
5 June 2008
-----------
diff --git a/Makefile b/Makefile
index 55b2f62..f03e5cf 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
LINUX32_COMPILER = i686-pc-linux-gnu-gcc
LINUX64_COMPILER = x86_64-pc-linux-gnu-gcc
WIN32_COMPILER = /usr/bin/i586-mingw32-gcc
-LINUX_ARM_COMPILER = arm-pc-linux-gnu-gcc
+LINUX_ARM_COMPILER = arm-none-linux-gnueabi-gcc
LIBPURPLE_CFLAGS = -I/usr/include/libpurple -DPURPLE_PLUGINS -DENABLE_NLS
GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include
@@ -20,10 +20,10 @@ LOCALES = $(patsubst %.po, %.mo, $(wildcard po/*.po))
#Standard stuff here
.PHONY: all clean
-all: skype4pidgin.deb skype4pidgin-installer.exe libskype_dbus.so libskype_dbus64.so
+all: skype4pidgin.deb skype4pidgin-installer.exe libskype_dbus.so libskype_dbus64.so libskypearm.so
clean:
- rm -f libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so libskype.dll skype4pidgin.deb skype4pidgin-installer.exe
+ rm -f libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so libskypearm.so libskype.dll skype4pidgin.deb skype4pidgin-installer.exe
libskype.so: libskype.c
${LINUX32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -march=athlon-xp -O2 -pipe libskype.c -o libskype.so -shared -fPIC -DPIC
@@ -32,7 +32,7 @@ libskype64.so:
${LINUX64_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m32 -m64 -O2 -pipe libskype.c -o libskype64.so -shared -fPIC -DPIC
libskypearm.so:
- ${LINUX_ARM_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -march=athlon-xp -O2 -pipe libskype.c -o libskype.so -shared -fPIC -DPIC
+ ${LINUX_ARM_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -O2 -pipe libskype.c -o libskypearm.so -shared -fPIC -DPIC
libskype_dbus.so:
${LINUX32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -march=athlon-xp -O2 -pipe libskype.c -o libskype_dbus.so -shared -fPIC -DPIC ${DBUS_CFLAGS}
@@ -40,9 +40,6 @@ libskype_dbus.so:
libskype_dbus64.so:
${LINUX64_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m32 -m64 -O2 -pipe libskype.c -o libskype_dbus64.so -shared -fPIC -DPIC ${DBUS_CFLAGS}
-libskype_dbusarm.so:
- ${LINUX_ARM_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -march=athlon-xp -O2 -pipe libskype.c -o libskype_dbus.so -shared -fPIC -DPIC ${DBUS_CFLAGS}
-
libskype.dll:
${WIN32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -I. -g -O2 -pipe libskype.c -o libskype.dll -shared -mno-cygwin ${WIN32_CFLAGS} ${WIN32_LIBS}
upx libskype.dll
@@ -57,9 +54,9 @@ skype4pidgin-installer.exe: libskype.dll
echo "Making .exe package"
makensis skype4pidgin.nsi > /dev/null
-skype4pidgin.deb: libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so
+skype4pidgin.deb: libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so libskypearm.so
rm ${DEB_PACKAGE_DIR}/usr/lib/purple-2/libskype*.so
- cp libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so ${DEB_PACKAGE_DIR}/usr/lib/purple-2/
+ cp libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so libskypearm.so ${DEB_PACKAGE_DIR}/usr/lib/purple-2/
date=`date +%F` && sed "s/Version: [-a-z0-9A-Z]*/Version: $$date/" -i ${DEB_PACKAGE_DIR}/DEBIAN/control
echo "Making .deb package"
dpkg-deb --build ${DEB_PACKAGE_DIR} skype4pidgin.deb > /dev/null