]>
Commit | Line | Data |
---|---|---|
2228602b JB |
1 | --- libpng-1.2.9/scripts/makefile.gcmmx.orig 2006-04-17 01:12:53.813611500 +0200 |
2 | +++ libpng-1.2.9/scripts/makefile.gcmmx 2006-04-17 01:13:47.872990000 +0200 | |
3 | @@ -72,8 +72,8 @@ | |
d6af8901 JB |
4 | # -m486 -malign-double -ffast-math \ |
5 | # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer | |
6 | ||
7 | -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm | |
8 | -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm | |
9 | +LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm | |
10 | +LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm | |
11 | ||
2228602b JB |
12 | |
13 | INCPATH=$(prefix)/include | |
14 | @@ -122,7 +122,7 @@ | |
d6af8901 JB |
15 | echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ |
16 | echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \ | |
17 | echo L_opts=\"-L$(LIBPATH)\"; \ | |
18 | - echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ | |
19 | + echo R_opts=\"\"; \ | |
20 | echo libs=\"-lpng12 -lz -lm\"; \ | |
21 | cat scripts/libpng-config-body.in ) > libpng-config | |
22 | chmod +x libpng-config | |
2228602b | 23 | @@ -239,7 +239,7 @@ |
d6af8901 JB |
24 | test-installed: |
25 | $(CC) -I$(ZLIBINC) \ | |
2228602b | 26 | `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ |
d6af8901 JB |
27 | - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ |
28 | + -L$(ZLIBLIB) \ | |
2228602b | 29 | -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` |
d6af8901 JB |
30 | ./pngtesti pngtest.png |
31 | ||
2228602b JB |
32 | --- libpng-1.2.9/scripts/makefile.linux.orig 2006-04-17 01:12:53.813611500 +0200 |
33 | +++ libpng-1.2.9/scripts/makefile.linux 2006-04-17 01:14:15.322705500 +0200 | |
34 | @@ -50,8 +50,8 @@ | |
d6af8901 JB |
35 | CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \ |
36 | $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 | |
37 | ||
38 | -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm | |
39 | -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm | |
40 | +LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm | |
41 | +LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm | |
42 | ||
2228602b JB |
43 | INCPATH=$(prefix)/include |
44 | LIBPATH=$(exec_prefix)/lib | |
45 | @@ -98,7 +98,7 @@ | |
d6af8901 JB |
46 | echo prefix=\"$(prefix)\"; \ |
47 | echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ | |
48 | echo L_opts=\"-L$(LIBPATH)\"; \ | |
49 | - echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ | |
50 | + echo R_opts=\"\"; \ | |
51 | echo libs=\"-lpng12 -lz -lm\"; \ | |
52 | cat scripts/libpng-config-body.in ) > libpng-config | |
53 | chmod +x libpng-config | |
2228602b | 54 | @@ -207,7 +207,7 @@ |
d6af8901 JB |
55 | test-installed: |
56 | $(CC) -I$(ZLIBINC) \ | |
2228602b | 57 | `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ |
d6af8901 JB |
58 | - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ |
59 | + -L$(ZLIBLIB) \ | |
2228602b | 60 | -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` |
d6af8901 JB |
61 | ./pngtesti pngtest.png |
62 |