Contents of /trunk/gpac/patches/gpac-0.4.4-pic.patch
Parent Directory | Revision Log
Revision 326 -
(show annotations)
(download)
Fri Aug 24 21:12:03 2007 UTC (17 years, 1 month ago) by niro
File size: 20540 byte(s)
Fri Aug 24 21:12:03 2007 UTC (17 years, 1 month ago) by niro
File size: 20540 byte(s)
-rev bump, fixed patches
1 | Index: gpac-0.4.4/configure |
2 | =================================================================== |
3 | --- gpac-0.4.4.orig/configure |
4 | +++ gpac-0.4.4/configure |
5 | @@ -69,6 +69,8 @@ has_ipv6="no" |
6 | has_dvb4linux="no" |
7 | has_openjpeg="no" |
8 | gprof_build="no" |
9 | +PIC_CFLAGS="" |
10 | +want_pic="no" |
11 | |
12 | win32="no" |
13 | mingw32="no" |
14 | @@ -121,6 +123,7 @@ echo " --mozdir=MOZ_PATH specify |
15 | echo "" |
16 | echo " --enable-debug produce debug version" |
17 | echo " --enable-gprof enable profiling" |
18 | +echo " --enable-pic enable Position Independant Code for shared objects" |
19 | echo " --track-memory enables tracking of all memory allocated by gpac" |
20 | echo " --disable-fragments disable movie fragments in ISO media support" |
21 | echo " --disable-opt disable GCC optimizations" |
22 | @@ -195,7 +198,8 @@ case "$cpu" in |
23 | if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then |
24 | cpu="x86_64" |
25 | #that's a bit crude... |
26 | - CFLAGS="$CFLAGS -fPIC -DPIC" |
27 | + PIC_CFLAGS="-fPIC -DPIC" |
28 | + want_pic="yes" |
29 | fi |
30 | fi |
31 | ;; |
32 | @@ -826,6 +830,8 @@ for opt do |
33 | ;; |
34 | --enable-gprof) gprof_build="yes"; |
35 | ;; |
36 | + --enable-pic) PIC_CFLAGS="-fPIC -DPIC"; want_pic="yes"; |
37 | + ;; |
38 | --disable-opt) no_gcc_opt="yes" |
39 | ;; |
40 | --disable-ipv6) has_ipv6="no" |
41 | @@ -1209,6 +1215,8 @@ echo "RANLIB=$ranlib" >> config.mak |
42 | echo "STRIP=$strip" >> config.mak |
43 | echo "OPTFLAGS=$CFLAGS" >> config.mak |
44 | echo "CPPFLAGS=$CPPFLAGS" >> config.mak |
45 | +echo "PIC_CFLAGS=$PIC_CFLAGS" >> config.mak |
46 | +echo "WANT_PIC=$want_pic" >> config.mak |
47 | echo "LDFLAGS=$LDFLAGS" >> config.mak |
48 | echo "SHFLAGS=$SHFLAGS" >> config.mak |
49 | |
50 | @@ -1422,4 +1430,7 @@ if [ ! -d "./bin/gcc/temp" ]; then |
51 | mkdir ./bin/gcc/temp |
52 | fi |
53 | |
54 | +echo '%.opic : %.c' >> config.mak |
55 | +echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak |
56 | + |
57 | echo "Done - type 'make help' for make info, 'make' to build" |
58 | Index: gpac-0.4.4/src/Makefile |
59 | =================================================================== |
60 | --- gpac-0.4.4.orig/src/Makefile |
61 | +++ gpac-0.4.4/src/Makefile |
62 | @@ -157,6 +157,12 @@ endif |
63 | EXTRALIBS+=$(GPAC_SH_FLAGS) |
64 | endif |
65 | |
66 | +ifeq ($(WANT_PIC),yes) |
67 | +OBJSPIC=$(OBJS:.o=.opic) |
68 | +else |
69 | +OBJSPIC=$(OBJS) |
70 | +endif |
71 | + |
72 | SRCS := $(OBJS:.o=.c) |
73 | |
74 | all: lib |
75 | @@ -204,10 +210,10 @@ else |
76 | $(CC) $(CFLAGS) -c -o $@ $< |
77 | endif |
78 | |
79 | -$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) isomedia scenegraph mcrypt mediatools sceneman term render |
80 | +$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(OBJSPIC) isomedia scenegraph mcrypt mediatools sceneman term render |
81 | ar cr ../bin/gcc/libgpac_static.a $(OBJS) |
82 | ranlib ../bin/gcc/libgpac_static.a |
83 | - $(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS) |
84 | + $(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) |
85 | |
86 | dep: depend |
87 | |
88 | Index: gpac-0.4.4/modules/aac_in/Makefile |
89 | =================================================================== |
90 | --- gpac-0.4.4.orig/modules/aac_in/Makefile |
91 | +++ gpac-0.4.4/modules/aac_in/Makefile |
92 | @@ -37,11 +37,18 @@ ifeq ($(CONFIG_WIN32),yes) |
93 | LDFLAGS+=-export-symbols aac_in.def |
94 | endif |
95 | |
96 | +ifeq ($(WANT_PIC),yes) |
97 | +OBJSPIC=$(OBJS:.o=.opic) |
98 | +else |
99 | +OBJSPIC=$(OBJS) |
100 | +endif |
101 | + |
102 | + |
103 | all: $(LIB) |
104 | |
105 | |
106 | -$(LIB): $(OBJS) |
107 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) |
108 | +$(LIB): $(OBJSPIC) |
109 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) |
110 | |
111 | |
112 | %.o: %.c |
113 | Index: gpac-0.4.4/modules/alsa/Makefile |
114 | =================================================================== |
115 | --- gpac-0.4.4.orig/modules/alsa/Makefile |
116 | +++ gpac-0.4.4/modules/alsa/Makefile |
117 | @@ -22,10 +22,16 @@ SRCS := $(OBJS:.o=.c) |
118 | |
119 | LIB=gm_alsa.$(DYN_LIB_SUFFIX) |
120 | |
121 | +ifeq ($(WANT_PIC),yes) |
122 | +OBJSPIC=$(OBJS:.o=.opic) |
123 | +else |
124 | +OBJSPIC=$(OBJS) |
125 | +endif |
126 | + |
127 | all: $(LIB) |
128 | |
129 | -$(LIB): $(OBJS) |
130 | - $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound |
131 | +$(LIB): $(OBJSPIC) |
132 | + $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound |
133 | |
134 | |
135 | %.o: %.c |
136 | Index: gpac-0.4.4/modules/bifs_dec/Makefile |
137 | =================================================================== |
138 | --- gpac-0.4.4.orig/modules/bifs_dec/Makefile |
139 | +++ gpac-0.4.4/modules/bifs_dec/Makefile |
140 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
141 | LDFLAGS+=-export-symbols bifs_dec.def |
142 | endif |
143 | |
144 | +ifeq ($(WANT_PIC),yes) |
145 | +OBJSPIC=$(OBJS:.o=.opic) |
146 | +else |
147 | +OBJSPIC=$(OBJS) |
148 | +endif |
149 | + |
150 | all: $(LIB) |
151 | |
152 | |
153 | -$(LIB): $(OBJS) |
154 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
155 | +$(LIB): $(OBJSPIC) |
156 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
157 | |
158 | |
159 | %.o: %.c |
160 | Index: gpac-0.4.4/modules/ctx_load/Makefile |
161 | =================================================================== |
162 | --- gpac-0.4.4.orig/modules/ctx_load/Makefile |
163 | +++ gpac-0.4.4/modules/ctx_load/Makefile |
164 | @@ -24,11 +24,18 @@ ifeq ($(CONFIG_WIN32),yes) |
165 | LDFLAGS+=-export-symbols ctx_load.def |
166 | endif |
167 | |
168 | +ifeq ($(WANT_PIC),yes) |
169 | +OBJSPIC=$(OBJS:.o=.opic) |
170 | +else |
171 | +OBJSPIC=$(OBJS) |
172 | +endif |
173 | + |
174 | + |
175 | all: $(LIB) |
176 | |
177 | |
178 | -$(LIB): $(OBJS) |
179 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
180 | +$(LIB): $(OBJSPIC) |
181 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
182 | |
183 | |
184 | %.o: %.c |
185 | Index: gpac-0.4.4/modules/dummy_in/Makefile |
186 | =================================================================== |
187 | --- gpac-0.4.4.orig/modules/dummy_in/Makefile |
188 | +++ gpac-0.4.4/modules/dummy_in/Makefile |
189 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
190 | LDFLAGS+=-export-symbols dummy_in.def |
191 | endif |
192 | |
193 | +ifeq ($(WANT_PIC),yes) |
194 | +OBJSPIC=$(OBJS:.o=.opic) |
195 | +else |
196 | +OBJSPIC=$(OBJS) |
197 | +endif |
198 | + |
199 | all: $(LIB) |
200 | |
201 | |
202 | -$(LIB): $(OBJS) |
203 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
204 | +$(LIB): $(OBJSPIC) |
205 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
206 | |
207 | |
208 | %.o: %.c |
209 | Index: gpac-0.4.4/modules/ffmpeg_in/Makefile |
210 | =================================================================== |
211 | --- gpac-0.4.4.orig/modules/ffmpeg_in/Makefile |
212 | +++ gpac-0.4.4/modules/ffmpeg_in/Makefile |
213 | @@ -38,11 +38,17 @@ ifeq ($(CONFIG_WIN32),yes) |
214 | LDFLAGS+=-export-symbols ffmpeg_in.def |
215 | endif |
216 | |
217 | +ifeq ($(WANT_PIC),yes) |
218 | +OBJSPIC=$(OBJS:.o=.opic) |
219 | +else |
220 | +OBJSPIC=$(OBJS) |
221 | +endif |
222 | + |
223 | all: $(LIB) |
224 | |
225 | |
226 | -$(LIB): $(OBJS) |
227 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LOCAL_LIB) $(LINKLIBS) $(EXTRALIBS) |
228 | +$(LIB): $(OBJSPIC) |
229 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc $(LOCAL_LIB) $(LINKLIBS) $(EXTRALIBS) |
230 | |
231 | |
232 | %.o: %.c |
233 | Index: gpac-0.4.4/modules/ft_font/Makefile |
234 | =================================================================== |
235 | --- gpac-0.4.4.orig/modules/ft_font/Makefile |
236 | +++ gpac-0.4.4/modules/ft_font/Makefile |
237 | @@ -28,11 +28,17 @@ endif |
238 | LINKVAR=-L../../bin/gcc -lgpac $(FT_LIBS) |
239 | |
240 | |
241 | +ifeq ($(WANT_PIC),yes) |
242 | +OBJSPIC=$(OBJS:.o=.opic) |
243 | +else |
244 | +OBJSPIC=$(OBJS) |
245 | +endif |
246 | + |
247 | all: $(LIB) |
248 | |
249 | |
250 | -$(LIB): $(OBJS) |
251 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKVAR) $(EXTRALIBS) |
252 | +$(LIB): $(OBJSPIC) |
253 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKVAR) $(EXTRALIBS) |
254 | |
255 | |
256 | %.o: %.c |
257 | Index: gpac-0.4.4/modules/img_in/Makefile |
258 | =================================================================== |
259 | --- gpac-0.4.4.orig/modules/img_in/Makefile |
260 | +++ gpac-0.4.4/modules/img_in/Makefile |
261 | @@ -87,11 +87,17 @@ LINKLIBS+=-lwinmm |
262 | LDFLAGS+=-export-symbols img_in.def |
263 | endif |
264 | |
265 | +ifeq ($(WANT_PIC),yes) |
266 | +OBJSPIC=$(OBJS:.o=.opic) |
267 | +else |
268 | +OBJSPIC=$(OBJS) |
269 | +endif |
270 | + |
271 | all: $(LIB) |
272 | |
273 | |
274 | -$(LIB): $(OBJS) |
275 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) |
276 | +$(LIB): $(OBJSPIC) |
277 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) |
278 | |
279 | |
280 | %.o: %.c |
281 | Index: gpac-0.4.4/modules/ismacryp/Makefile |
282 | =================================================================== |
283 | --- gpac-0.4.4.orig/modules/ismacryp/Makefile |
284 | +++ gpac-0.4.4/modules/ismacryp/Makefile |
285 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
286 | LDFLAGS+=-export-symbols ismacryp.def |
287 | endif |
288 | |
289 | +ifeq ($(WANT_PIC),yes) |
290 | +OBJSPIC=$(OBJS:.o=.opic) |
291 | +else |
292 | +OBJSPIC=$(OBJS) |
293 | +endif |
294 | + |
295 | all: $(LIB) |
296 | |
297 | |
298 | -$(LIB): $(OBJS) |
299 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
300 | +$(LIB): $(OBJSPIC) |
301 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
302 | |
303 | |
304 | %.o: %.c |
305 | Index: gpac-0.4.4/modules/isom_in/Makefile |
306 | =================================================================== |
307 | --- gpac-0.4.4.orig/modules/isom_in/Makefile |
308 | +++ gpac-0.4.4/modules/isom_in/Makefile |
309 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
310 | LDFLAGS+=-export-symbols isom_in.def |
311 | endif |
312 | |
313 | +ifeq ($(WANT_PIC),yes) |
314 | +OBJSPIC=$(OBJS:.o=.opic) |
315 | +else |
316 | +OBJSPIC=$(OBJS) |
317 | +endif |
318 | + |
319 | all: $(LIB) |
320 | |
321 | |
322 | -$(LIB): $(OBJS) |
323 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) |
324 | +$(LIB): $(OBJSPIC) |
325 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) |
326 | |
327 | |
328 | %.o: %.c |
329 | Index: gpac-0.4.4/modules/laser_dec/Makefile |
330 | =================================================================== |
331 | --- gpac-0.4.4.orig/modules/laser_dec/Makefile |
332 | +++ gpac-0.4.4/modules/laser_dec/Makefile |
333 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
334 | LDFLAGS+=-export-symbols laser_dec.def |
335 | endif |
336 | |
337 | +ifeq ($(WANT_PIC),yes) |
338 | +OBJSPIC=$(OBJS:.o=.opic) |
339 | +else |
340 | +OBJSPIC=$(OBJS) |
341 | +endif |
342 | + |
343 | all: $(LIB) |
344 | |
345 | |
346 | -$(LIB): $(OBJS) |
347 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
348 | +$(LIB): $(OBJSPIC) |
349 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
350 | |
351 | |
352 | %.o: %.c |
353 | Index: gpac-0.4.4/modules/mp3_in/Makefile |
354 | =================================================================== |
355 | --- gpac-0.4.4.orig/modules/mp3_in/Makefile |
356 | +++ gpac-0.4.4/modules/mp3_in/Makefile |
357 | @@ -39,11 +39,17 @@ ifeq ($(CONFIG_WIN32),yes) |
358 | LDFLAGS+=-export-symbols mp3_in.def |
359 | endif |
360 | |
361 | +ifeq ($(WANT_PIC),yes) |
362 | +OBJSPIC=$(OBJS:.o=.opic) |
363 | +else |
364 | +OBJSPIC=$(OBJS) |
365 | +endif |
366 | + |
367 | all: $(LIB) |
368 | |
369 | |
370 | -$(LIB): $(OBJS) |
371 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) |
372 | +$(LIB): $(OBJSPIC) |
373 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) |
374 | |
375 | |
376 | %.o: %.c |
377 | Index: gpac-0.4.4/modules/mpegts_in/Makefile |
378 | =================================================================== |
379 | --- gpac-0.4.4.orig/modules/mpegts_in/Makefile |
380 | +++ gpac-0.4.4/modules/mpegts_in/Makefile |
381 | @@ -29,11 +29,17 @@ ifeq ($(CONFIG_WIN32),yes) |
382 | LDFLAGS+=-export-symbols mpegts_in.def |
383 | endif |
384 | |
385 | +ifeq ($(WANT_PIC),yes) |
386 | +OBJSPIC=$(OBJS:.o=.opic) |
387 | +else |
388 | +OBJSPIC=$(OBJS) |
389 | +endif |
390 | + |
391 | all: $(LIB) |
392 | |
393 | |
394 | -$(LIB): $(OBJS) |
395 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
396 | +$(LIB): $(OBJSPIC) |
397 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
398 | |
399 | |
400 | %.o: %.c |
401 | Index: gpac-0.4.4/modules/odf_dec/Makefile |
402 | =================================================================== |
403 | --- gpac-0.4.4.orig/modules/odf_dec/Makefile |
404 | +++ gpac-0.4.4/modules/odf_dec/Makefile |
405 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
406 | LDFLAGS+=-export-symbols odf_dec.def |
407 | endif |
408 | |
409 | +ifeq ($(WANT_PIC),yes) |
410 | +OBJSPIC=$(OBJS:.o=.opic) |
411 | +else |
412 | +OBJSPIC=$(OBJS) |
413 | +endif |
414 | + |
415 | all: $(LIB) |
416 | |
417 | |
418 | -$(LIB): $(OBJS) |
419 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
420 | +$(LIB): $(OBJSPIC) |
421 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
422 | |
423 | |
424 | %.o: %.c |
425 | Index: gpac-0.4.4/modules/ogg/Makefile |
426 | =================================================================== |
427 | --- gpac-0.4.4.orig/modules/ogg/Makefile |
428 | +++ gpac-0.4.4/modules/ogg/Makefile |
429 | @@ -62,11 +62,17 @@ LDFLAGS+=-export-symbols ogg.def |
430 | endif |
431 | |
432 | |
433 | +ifeq ($(WANT_PIC),yes) |
434 | +OBJSPIC=$(OBJS:.o=.opic) |
435 | +else |
436 | +OBJSPIC=$(OBJS) |
437 | +endif |
438 | + |
439 | all: $(LIB) |
440 | |
441 | |
442 | -$(LIB): $(OBJS) |
443 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) |
444 | +$(LIB): $(OBJSPIC) |
445 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) |
446 | |
447 | |
448 | %.o: %.c |
449 | Index: gpac-0.4.4/modules/oss_audio/Makefile |
450 | =================================================================== |
451 | --- gpac-0.4.4.orig/modules/oss_audio/Makefile |
452 | +++ gpac-0.4.4/modules/oss_audio/Makefile |
453 | @@ -31,10 +31,16 @@ SRCS := $(OBJS:.o=.c) |
454 | |
455 | LIB=gm_oss_audio.$(DYN_LIB_SUFFIX) |
456 | |
457 | +ifeq ($(WANT_PIC),yes) |
458 | +OBJSPIC=$(OBJS:.o=.opic) |
459 | +else |
460 | +OBJSPIC=$(OBJS) |
461 | +endif |
462 | + |
463 | all: $(LIB) |
464 | |
465 | -$(LIB): $(OBJS) |
466 | - $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS) |
467 | +$(LIB): $(OBJSPIC) |
468 | + $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS) |
469 | |
470 | |
471 | %.o: %.c |
472 | Index: gpac-0.4.4/modules/raw_out/Makefile |
473 | =================================================================== |
474 | --- gpac-0.4.4.orig/modules/raw_out/Makefile |
475 | +++ gpac-0.4.4/modules/raw_out/Makefile |
476 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
477 | LDFLAGS+=-export-symbols raw_out.def |
478 | endif |
479 | |
480 | +ifeq ($(WANT_PIC),yes) |
481 | +OBJSPIC=$(OBJS:.o=.opic) |
482 | +else |
483 | +OBJSPIC=$(OBJS) |
484 | +endif |
485 | + |
486 | all: $(LIB) |
487 | |
488 | |
489 | -$(LIB): $(OBJS) |
490 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
491 | +$(LIB): $(OBJSPIC) |
492 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
493 | |
494 | |
495 | %.o: %.c |
496 | Index: gpac-0.4.4/modules/render2d/Makefile |
497 | =================================================================== |
498 | --- gpac-0.4.4.orig/modules/render2d/Makefile |
499 | +++ gpac-0.4.4/modules/render2d/Makefile |
500 | @@ -38,11 +38,17 @@ ifeq ($(CONFIG_WIN32),yes) |
501 | LDFLAGS+=-export-symbols render2d.def |
502 | endif |
503 | |
504 | +ifeq ($(WANT_PIC),yes) |
505 | +OBJSPIC=$(OBJS:.o=.opic) |
506 | +else |
507 | +OBJSPIC=$(OBJS) |
508 | +endif |
509 | + |
510 | all: $(LIB) |
511 | |
512 | |
513 | -$(LIB): $(OBJS) |
514 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(EXTRALIBS) |
515 | +$(LIB): $(OBJSPIC) |
516 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKFLAGS) $(EXTRALIBS) |
517 | |
518 | |
519 | %.o: %.c |
520 | Index: gpac-0.4.4/modules/render3d/Makefile |
521 | =================================================================== |
522 | --- gpac-0.4.4.orig/modules/render3d/Makefile |
523 | +++ gpac-0.4.4/modules/render3d/Makefile |
524 | @@ -44,11 +44,17 @@ LDFLAGS+=-export-symbols render3d.def |
525 | else |
526 | endif |
527 | |
528 | +ifeq ($(WANT_PIC),yes) |
529 | +OBJSPIC=$(OBJS:.o=.opic) |
530 | +else |
531 | +OBJSPIC=$(OBJS) |
532 | +endif |
533 | + |
534 | all: $(LIB) |
535 | |
536 | |
537 | -$(LIB): $(OBJS) |
538 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(EXTRALIBS) $(OGL_LIBS) |
539 | +$(LIB): $(OBJSPIC) |
540 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKFLAGS) $(EXTRALIBS) $(OGL_LIBS) |
541 | |
542 | |
543 | %.o: %.c |
544 | Index: gpac-0.4.4/modules/rtp_in/Makefile |
545 | =================================================================== |
546 | --- gpac-0.4.4.orig/modules/rtp_in/Makefile |
547 | +++ gpac-0.4.4/modules/rtp_in/Makefile |
548 | @@ -25,11 +25,17 @@ ifeq ($(CONFIG_WIN32),yes) |
549 | LDFLAGS+=-export-symbols rtp_in.def |
550 | endif |
551 | |
552 | +ifeq ($(WANT_PIC),yes) |
553 | +OBJSPIC=$(OBJS:.o=.opic) |
554 | +else |
555 | +OBJSPIC=$(OBJS) |
556 | +endif |
557 | + |
558 | all: $(LIB) |
559 | |
560 | |
561 | -$(LIB): $(OBJS) |
562 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) |
563 | +$(LIB): $(OBJSPIC) |
564 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) |
565 | |
566 | |
567 | %.o: %.c |
568 | Index: gpac-0.4.4/modules/saf_in/Makefile |
569 | =================================================================== |
570 | --- gpac-0.4.4.orig/modules/saf_in/Makefile |
571 | +++ gpac-0.4.4/modules/saf_in/Makefile |
572 | @@ -25,11 +25,17 @@ ifeq ($(CONFIG_WIN32),yes) |
573 | LDFLAGS+=-export-symbols saf_in.def |
574 | endif |
575 | |
576 | +ifeq ($(WANT_PIC),yes) |
577 | +OBJSPIC=$(OBJS:.o=.opic) |
578 | +else |
579 | +OBJSPIC=$(OBJS) |
580 | +endif |
581 | + |
582 | all: $(LIB) |
583 | |
584 | |
585 | -$(LIB): $(OBJS) |
586 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
587 | +$(LIB): $(OBJSPIC) |
588 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
589 | |
590 | |
591 | %.o: %.c |
592 | Index: gpac-0.4.4/modules/sdl_out/Makefile |
593 | =================================================================== |
594 | --- gpac-0.4.4.orig/modules/sdl_out/Makefile |
595 | +++ gpac-0.4.4/modules/sdl_out/Makefile |
596 | @@ -31,11 +31,17 @@ ifeq ($(CONFIG_WIN32),yes) |
597 | LDFLAGS+=-export-symbols sdl_out.def |
598 | endif |
599 | |
600 | +ifeq ($(WANT_PIC),yes) |
601 | +OBJSPIC=$(OBJS:.o=.opic) |
602 | +else |
603 | +OBJSPIC=$(OBJS) |
604 | +endif |
605 | + |
606 | all: $(LIB) |
607 | |
608 | |
609 | -$(LIB): $(OBJS) |
610 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(SDL_LIBS) -L../../bin/gcc -lgpac |
611 | +$(LIB): $(OBJSPIC) |
612 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(SDL_LIBS) -L../../bin/gcc -lgpac |
613 | |
614 | %.o: %.c |
615 | $(CC) $(CFLAGS) -c -o $@ $< |
616 | Index: gpac-0.4.4/modules/soft_raster/Makefile |
617 | =================================================================== |
618 | --- gpac-0.4.4.orig/modules/soft_raster/Makefile |
619 | +++ gpac-0.4.4/modules/soft_raster/Makefile |
620 | @@ -30,11 +30,18 @@ ifeq ($(CONFIG_WIN32),yes) |
621 | LDFLAGS+=-export-symbols rast_soft.def |
622 | endif |
623 | |
624 | +ifeq ($(WANT_PIC),yes) |
625 | +OBJSPIC=$(OBJS:.o=.opic) |
626 | +else |
627 | +OBJSPIC=$(OBJS) |
628 | +endif |
629 | + |
630 | + |
631 | all: $(LIB) |
632 | |
633 | |
634 | -$(LIB): $(OBJS) |
635 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
636 | +$(LIB): $(OBJSPIC) |
637 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
638 | |
639 | |
640 | %.o: %.c |
641 | Index: gpac-0.4.4/modules/svg_in/Makefile |
642 | =================================================================== |
643 | --- gpac-0.4.4.orig/modules/svg_in/Makefile |
644 | +++ gpac-0.4.4/modules/svg_in/Makefile |
645 | @@ -29,11 +29,17 @@ ifeq ($(CONFIG_WIN32),yes) |
646 | LDFLAGS+=-export-symbols svg_in.def |
647 | endif |
648 | |
649 | +ifeq ($(WANT_PIC),yes) |
650 | +OBJSPIC=$(OBJS:.o=.opic) |
651 | +else |
652 | +OBJSPIC=$(OBJS) |
653 | +endif |
654 | + |
655 | all: $(LIB) |
656 | |
657 | |
658 | -$(LIB): $(OBJS) |
659 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -lz |
660 | +$(LIB): $(OBJSPIC) |
661 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lz |
662 | |
663 | |
664 | %.o: %.c |
665 | Index: gpac-0.4.4/modules/timedtext/Makefile |
666 | =================================================================== |
667 | --- gpac-0.4.4.orig/modules/timedtext/Makefile |
668 | +++ gpac-0.4.4/modules/timedtext/Makefile |
669 | @@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes) |
670 | LDFLAGS+=-export-symbols timedtext.def |
671 | endif |
672 | |
673 | +ifeq ($(WANT_PIC),yes) |
674 | +OBJSPIC=$(OBJS:.o=.opic) |
675 | +else |
676 | +OBJSPIC=$(OBJS) |
677 | +endif |
678 | + |
679 | all: $(LIB) |
680 | |
681 | |
682 | -$(LIB): $(OBJS) |
683 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
684 | +$(LIB): $(OBJSPIC) |
685 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
686 | |
687 | |
688 | %.o: %.c |
689 | Index: gpac-0.4.4/modules/x11_out/Makefile |
690 | =================================================================== |
691 | --- gpac-0.4.4.orig/modules/x11_out/Makefile |
692 | +++ gpac-0.4.4/modules/x11_out/Makefile |
693 | @@ -47,11 +47,17 @@ ifeq ($(CONFIG_WIN32),yes) |
694 | LDFLAGS+=-export-symbols |
695 | endif |
696 | |
697 | +ifeq ($(WANT_PIC),yes) |
698 | +OBJSPIC=$(OBJS:.o=.opic) |
699 | +else |
700 | +OBJSPIC=$(OBJS) |
701 | +endif |
702 | + |
703 | all: $(LIB) |
704 | |
705 | |
706 | -$(LIB): $(OBJS) |
707 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -lX11 -L../../bin/gcc -lgpac |
708 | +$(LIB): $(OBJSPIC) |
709 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -lX11 -L../../bin/gcc -lgpac |
710 | |
711 | %.o: %.c |
712 | $(CC) $(CFLAGS) -c -o $@ $< |
713 | Index: gpac-0.4.4/modules/xvid_dec/Makefile |
714 | =================================================================== |
715 | --- gpac-0.4.4.orig/modules/xvid_dec/Makefile |
716 | +++ gpac-0.4.4/modules/xvid_dec/Makefile |
717 | @@ -31,11 +31,17 @@ ifeq ($(CONFIG_WIN32),yes) |
718 | LDFLAGS+=-export-symbols xvid_dec.def |
719 | endif |
720 | |
721 | +ifeq ($(WANT_PIC),yes) |
722 | +OBJSPIC=$(OBJS:.o=.opic) |
723 | +else |
724 | +OBJSPIC=$(OBJS) |
725 | +endif |
726 | + |
727 | all: $(LIB) |
728 | |
729 | |
730 | -$(LIB): $(OBJS) |
731 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) |
732 | +$(LIB): $(OBJSPIC) |
733 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS) |
734 | |
735 | |
736 | %.o: %.c |
737 | Index: gpac/modules/amr_float_dec/Makefile |
738 | =================================================================== |
739 | --- gpac.orig/modules/amr_float_dec/Makefile |
740 | +++ gpac/modules/amr_float_dec/Makefile |
741 | @@ -41,11 +41,17 @@ ifeq ($(CONFIG_WIN32),yes) |
742 | LDFLAGS+=-export-symbols amr_float_dec.def |
743 | endif |
744 | |
745 | +ifeq ($(WANT_PIC),yes) |
746 | +OBJSPIC=$(OBJS:.o=.opic) |
747 | +else |
748 | +OBJSPIC=$(OBJS) |
749 | +endif |
750 | + |
751 | all: $(LIB) |
752 | |
753 | |
754 | -$(LIB): $(OBJS) |
755 | - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac |
756 | +$(LIB): $(OBJSPIC) |
757 | + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
758 | |
759 | |
760 | %.o: %.c |