--- gpac/configure.orig	2011-05-29 20:37:20.841571383 +0200
+++ gpac/configure	2011-05-29 20:50:56.841598707 +0200
@@ -102,7 +102,7 @@
 bigendian="no"
 SHFLAGS=-shared
 need_inet_aton="no"
-LDFLAGS="$LDFLAGS -Wl --warn-common"
+LDFLAGS="$LDFLAGS -Wl,--warn-common"
 CFLAGS=""
 CPPFLAGS=""
 GPAC_SH_FLAGS=-lpthread
--- gpac/applications/osmo4_wx/Makefile.orig	2011-05-29 20:52:03.848267616 +0200
+++ gpac/applications/osmo4_wx/Makefile	2011-05-29 21:08:38.408300918 +0200
@@ -41,7 +41,7 @@
 all: $(PROG)
 
 Osmo4$(EXE): $(OBJS)
-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) -lz
+	$(CXX) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) `pkg-config --libs gtk+-2.0` -lz
 
 %.o: %.cpp
 	$(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $< 
--- gpac/src/Makefile~	2011-07-24 16:46:39.000000000 +0200
+++ gpac/src/Makefile	2011-07-24 16:53:33.607729885 +0200
@@ -106,14 +106,6 @@
 endif
 
 
-ifneq ($(prefix), /usr/local)
-EXTRALIBS+=-L$(prefix)/lib
-else
-ifneq ($(prefix), /usr)
-EXTRALIBS+=-L$(prefix)/lib
-endif
-endif
-
 ## libgpac compositor compilation options
 COMPOSITOR_CFLAGS=
 ## SVG disabled
--- gpac/applications/mp4client/Makefile~	2011-07-24 16:54:03.000000000 +0200
+++ gpac/applications/mp4client/Makefile	2011-07-24 16:57:28.613989434 +0200
@@ -37,18 +37,6 @@
 PROG=MP4Client
 endif
 
-ifneq ($(CONFIG_JPEG), no)
-LINKLIBS+= -L$(prefix)/lib
-else
-ifneq ($(CONFIG_PNG), no)
-LINKLIBS+= -L$(prefix)/lib
-else
-ifneq ($(TRISCOPE_MODE), no)
-LINKLIBS+= -L$(prefix)/lib
-endif
-endif
-endif
-
 ifeq ($(CONFIG_JPEG), no)
 else
 LINKLIBS+= -ljpeg
--- gpac/modules/jack/Makefile~	2008-11-24 10:14:19.000000000 +0100
+++ gpac/modules/jack/Makefile	2011-07-24 17:01:53.625253667 +0200
@@ -32,7 +32,7 @@
 all: $(LIB)
 
 $(LIB): $(OBJSPIC)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib  -ljack
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack
 
 
 %.o: %.c