commit 6460c0787f9029b3c38b31c04f9bbbe02675a2f7
Author: Christophe Fergeau <t...@gnome.org>
Date:   Tue Feb 8 13:47:25 2011 +0100

    use appropriate compile flags for libimobiledevice
    
    The makefile was hardcoding -limobiledevice instead of using
    the flags provided by pkg-config. This was causing issues on
    debian squeeze where this caused link failures.

 src/Makefile.am |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 90148f0..59ae346 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,9 +27,10 @@ libgpod_la_SOURCES =                 \
        pixmaps.c               \
        rijndael.c
 
+libgpod_la_CFLAGS =
 if WITH_INTERNAL_GCHECKSUM
 libgpod_la_SOURCES += gchecksum.c gchecksum.h
-libgpod_la_CFLAGS = -DWITH_INTERNAL_GCHECKSUM
+libgpod_la_CFLAGS += -DWITH_INTERNAL_GCHECKSUM
 endif
 
 libgpod_la_LDFLAGS = -version-info $(LIBGPOD_SO_VERSION) -no-undefined
@@ -60,7 +61,8 @@ INCLUDES=$(LIBGPOD_CFLAGS)
 LIBS=$(LIBGPOD_LIBS) $(Z_LIBS) -lm
 
 if HAVE_LIBIMOBILEDEVICE
-LIBS+=-limobiledevice
+LIBS+=$(LIBIMOBILEDEVICE_LIBS)
+libgpod_la_CFLAGS+=$(LIBIMOBILEDEVICE_CFLAGS)
 endif
 
 uninstall-hook:

------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to