diff options
| author | Eion Robb <eion@robbmob.com> | 2012-11-20 05:33:45 +0400 |
|---|---|---|
| committer | Eion Robb <eion@robbmob.com> | 2012-11-20 05:33:45 +0400 |
| commit | e65dbe76903565fef27a85ed5b8c313ccb99a467 (patch) | |
| tree | af352d0d0af0a03e848e295c6f136482b1945697 | |
| parent | a05fcbbd3c11117c37b202376cd4ad2f9e15c3f9 (diff) | |
Patch from Gabriele to use pkg-config, and force-linking with X11 on the X11 version, so that non-X11 clients (Finch, Empathy) can use the X11 version of the plugin
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -6,13 +6,14 @@ WIN32_COMPILER = /usr/bin/i586-mingw32-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/lib64/glib-2.0/include -I/usr/include -DBUS_CFLAGS = -DSKYPE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/lib64/dbus-1.0/include +GLIB_CFLAGS = `pkg-config --cflags glib-2.0` -I/usr/include +DBUS_CFLAGS = -DSKYPE_DBUS `pkg-config --cflags dbus-1` WIN32_DEV_DIR = /root/pidgin/win32-dev WIN32_PIDGIN_DIR = /root/pidgin/pidgin-2.6.1 WIN32_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_PIDGIN_DIR}/libpurple/win32 -I${WIN32_PIDGIN_DIR}/libpurple -I${WIN32_DEV_DIR}/gtk_2_0/include -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_DEV_DIR}/gtk_2_0/lib/glib-2.0/include WIN32_LIBS = -L${WIN32_DEV_DIR}/gtk_2_0/lib -L${WIN32_PIDGIN_DIR}/libpurple -lglib-2.0 -lgobject-2.0 -lgthread-2.0 -lintl -lpurple XUL_LIBS = -I/usr/lib/xulrunner/include xpcomModule.cpp -I/usr/include/nspr +X11_LIBS = `pkg-config --libs x11` VV_CFLAGS = -I/usr/include/gstreamer-0.10 -DUSE_VV -I/usr/include/libxml2 WIN32_VV_CFLAGS = -I${WIN32_DEV_DIR}/libxml2/include -I${WIN32_DEV_DIR}/gstreamer-0.10/include -I${WIN32_DEV_DIR}/gstreamer-0.10/include/gstreamer-0.10 @@ -28,9 +29,9 @@ LOCALES = $(patsubst %.po, %.mo, $(wildcard po/*.po)) allarch: skype4pidgin.deb skype4pidgin-installer.exe libskype_dbus.so libskype_dbus64.so libskypearm.so -#By default, 'make' compiles X11 version on local platform +#By default, 'make' compiles X11 and DBus versions on local platform all: .DEPENDS skype_messaging_x11.c skype_messaging_dbus.c - gcc ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype.so -shared -fPIC -DPIC + gcc ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype.so -shared -fPIC -DPIC ${X11_LIBS} gcc ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype_dbus.so -shared -fPIC -DPIC ${DBUS_CFLAGS} install: locales |