--- linphone-0.12.2.hh1/gpe/Makefile.am.old	2004-08-29 21:16:33.000000000 +0100
+++ linphone-0.12.2.hh1/gpe/Makefile.am	2004-08-29 21:16:52.000000000 +0100
@@ -28,23 +28,6 @@
 	propertybox.c propertybox.h \
 	linphone-gpe.c linphone-gpe.h
 
-linphone_gpe_LDADD = $(LIBOSIP_LIBS) $(GTK_LIBS) $(XML_LIBS) \
+linphone_gpe_LDADD = $(LIBOSIP_LIBS) $(GTK_LIBS) $(XML_LIBS) $(ALSA_LIBS) \
 	$(top_srcdir)/coreapi/liblinphone.la
 
-if CROSS_COMPILING
-
-CROSS_ALSA_CFLAGS = -I/usr/local/arm/familiar/usr/include
-CROSS_ALSA_LIBS = -L/usr/local/arm/familiar/usr/lib -lasound
-
-linphone_gpe_LDFLAGS = /usr/local/arm/familiar/usr/X11R6/lib/libX11.so \
-		/usr/local/arm/familiar/usr/X11R6/lib/libXi.so \
-		/usr/local/arm/familiar/usr/X11R6/lib/libXext.so \
-		/usr/local/arm/familiar/usr/X11R6/lib/libXrender.so \
-		/usr/local/arm/familiar/usr/X11R6/lib/libXft.so \
-		/usr/local/arm/familiar/usr/lib/libfontconfig.so \
-		/usr/local/arm/familiar/usr/lib/libfreetype.so \
-		/usr/local/arm/familiar/usr/lib/libexpat.so \
-		$(CROSS_ALSA_LIBS)
-else
-linphone_gpe_LDFLAGS = $(ALSA_LIBS)
-endif