1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
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
|
