Index: prismstumbler-0.7.3/src/gpsd/Makefile.in
===================================================================
--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.in
+++ prismstumbler-0.7.3/src/gpsd/Makefile.in
@@ -128,8 +128,8 @@ xgpsspeed: $(XGPSOBJS)
 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
 
 libgpsd.a:  $(LIB_OBJECTS)
-	ar -r libgpsd.a $(LIB_OBJECTS)
-	ranlib libgpsd.a
+	$(AR) -r libgpsd.a $(LIB_OBJECTS)
+	$(RANLIB) libgpsd.a
 
 clean:
 	rm -f *.o *.a gpsd gps *~ config.status
Index: prismstumbler-0.7.3/src/gpsd/Makefile
===================================================================
--- prismstumbler-0.7.3.orig/src/gpsd/Makefile
+++ prismstumbler-0.7.3/src/gpsd/Makefile
@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
 # Makefile.in
 # $Modified: Thu Jan 22 11:55:32 1998 by brook $
 
@@ -7,10 +6,10 @@
 
 # What we use to compile C files.
 # CC = cc
-CC = gcc
+CC = ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=xscale
 
 # The flags we use to compile C files.
-CFLAGS = -g -O2
+CFLAGS = -I/home/papercrane/oe/angstrom.build/tmp/work/armv5te-angstrom-linux-gnueabi/prismstumbler-0.7.3-r5/prismstumbler-0.7.3/include -D_GNU_SOURCE -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
 
 
 ## The C preprocessor.
@@ -19,7 +18,7 @@ CFLAGS = -g -O2
 CPP = @CPP_TRADITIONAL@
 
 # Flags passed to the C preprocessor.  ()
-CPPFLAGS = 
+CPPFLAGS = -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include
 
 # Definitions to be passed to the C preprocessor.  (-DHAVE_CONFIG_H)
 DEFS = -DHAVE_CONFIG_H
@@ -28,10 +27,10 @@ DEFS = -DHAVE_CONFIG_H
 ## The Linker.
 
 # Flags passed to the linker.  (-g -O)
-LDFLAGS = 
+LDFLAGS = -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1
 
 # Use this for building statically linked executables with GCC.
-# LDFLAGS = -static 
+# LDFLAGS = -static -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1
 
 
 ## Local libraries
@@ -52,7 +51,7 @@ NETLIBS = $(LIBNSL) $(LIBSOCKET)
 ## X Libraries
 
 # Special flags for linking with X.  (-L/usr/X11R5/lib)
-X_LDFLAGS =  -L/usr/X11R6/lib
+X_LDFLAGS = -L/usr/lib  -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib
 
 # Motif library.  (-lXm)
 LIBXM = 
@@ -62,10 +61,10 @@ LIBXM = 
 # LIBXM = -Wl,-Bstatic  -Wl,-Bdynamic
 
 # X extension library; needed for Athena and Motif >= 2.0.  (-lXext)
-LIBXEXT = -lXext
+LIBXEXT = 
 
 # Xpm library; needed for DDD and sometimes for Motif >= 2.0.  (-lXpm)
-LIBXPM = -lXpm
+LIBXPM = 
 
 # Xp library; sometimes needed for Motif >= 2.1.  (-lXp)
 LIBXP = 
@@ -74,13 +73,13 @@ LIBXP = 
 LIBGEN = 
 
 # X toolkit library.  (-lXt)
-LIBXT = -lXt
+LIBXT = 
 
 # Xaw library.  (-lXaw)
-LIBXAW = -lXaw
+LIBXAW = 
 
 # X library.  (-lSM -lICE -lX11 -lnsl -lsocket)
-LIBX11 =  -lSM -lICE -lX11 
+LIBX11 =  -lSM -lICE  
 
 # All libraries shown above
 ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXP) $(LIBXPM) $(LIBXEXT) \
@@ -94,7 +93,7 @@ COMPILE_AND_LINK.c = \
     $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS)
 
 ## Where to look for X include files.  (-I/usr/X11R5/include)
-X_INCLUDE =  -I/usr/X11R6/include
+X_INCLUDE = -I/usr/include  -I/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include/X11
 
 ## Where to look for include files.
 INCLUDE = -I. $(X_INCLUDE)
@@ -129,8 +128,8 @@ xgpsspeed: $(XGPSOBJS)
 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
 
 libgpsd.a:  $(LIB_OBJECTS)
-	ar -r libgpsd.a $(LIB_OBJECTS)
-	ranlib libgpsd.a
+	$(AR) -r libgpsd.a $(LIB_OBJECTS)
+	$(RANLIB) libgpsd.a
 
 clean:
 	rm -f *.o *.a gpsd gps *~ config.status
Index: prismstumbler-0.7.3/src/gpsd/Makefile.arm
===================================================================
--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.arm
+++ prismstumbler-0.7.3/src/gpsd/Makefile.arm
@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \
     $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS)
 
 ## Where to look for X include files.  (-I/usr/X11R5/include)
-X_INCLUDE =  -I/skiff/local/arm-linux/include/X11
+X_INCLUDE = @X_CFLAGS@
 
 ## Where to look for include files.
 INCLUDE = -I. $(X_INCLUDE)
@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS)
 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
 
 libgpsd.a:  $(LIB_OBJECTS)
-	ar -r libgpsd.a $(LIB_OBJECTS)
-	ranlib libgpsd.a
+	$(AR) -r libgpsd.a $(LIB_OBJECTS)
+	$(RANLIB) libgpsd.a
 
 clean:
 	rm -f *.o *.a gpsd gps *~ config.status
Index: prismstumbler-0.7.3/src/gpsd/Makefile.i386
===================================================================
--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.i386
+++ prismstumbler-0.7.3/src/gpsd/Makefile.i386
@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \
     $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS)
 
 ## Where to look for X include files.  (-I/usr/X11R5/include)
-X_INCLUDE =  -I/usr/X11R6/include
+X_INCLUDE = @X_CFLAGS@
 
 ## Where to look for include files.
 INCLUDE = -I. $(X_INCLUDE)
@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS)
 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
 
 libgpsd.a:  $(LIB_OBJECTS)
-	ar -r libgpsd.a $(LIB_OBJECTS)
-	ranlib libgpsd.a
+	$(AR) -r libgpsd.a $(LIB_OBJECTS)
+	$(RANLIB) libgpsd.a
 
 clean:
 	rm -f *.o *.a gpsd gps *~ config.status