[gentoo-commits] gentoo-x86 commit in media-sound/gmtp/files: gmtp-1.3.1-pkg-config.patch

[Mike Frysinger (vapier)]

vapier      12/06/01 18:11:19

  Added:                gmtp-1.3.1-pkg-config.patch
  Log:
  Respect $PKG_CONFIG, and fix linking with gthread.
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch?rev=1.1&content-type=text/plain

Index: gmtp-1.3.1-pkg-config.patch
===================================================================
https://sourceforge.net/p/gmtp/discussion/requests/thread/ce4152cc/

respect $(PKG_CONFIG), and add missing gthread-2.0

--- a/Makefile
+++ b/Makefile
@@ -42,14 +42,18 @@ LIBS +=
 
 .SUFFIXES: .c .o .po .mo
 
-GTK_CFLAGS = `pkg-config --cflags gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile`
-GTK_LDFLAGS = `pkg-config --libs gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile`
+PKG_CONFIG ?= pkg-config
 
 ifeq ($(MAKECMDGOALS),gtk3)
-GTK_CFLAGS = `pkg-config --cflags gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile`
-GTK_LDFLAGS = `pkg-config --libs gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile`
+PKGS = gtk+-3.0 gio-2.0
 CFLAGS += -DGMTP_USE_GTK3
+else
+PKGS = gtk+-2.0 gconf-2.0
 endif
+PKGS += gthread-2.0 libmtp id3tag flac vorbisfile
+
+GTK_CFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)`
+GTK_LDFLAGS = `$(PKG_CONFIG) --libs $(PKGS)`
 
 objects = src/main.o src/mtp.o src/interface.o src/callbacks.o src/prefs.o src/dnd.o src/metatag_info.o
 headers = src/main.h src/mtp.h src/interface.h src/callbacks.h src/prefs.h src/dnd.h src/metatag_info.h src/config.h