Annotation of /trunk/libpng/patches/libpng-1.2.9-link_to_proper_libs-1.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1415 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1415 byte(s)
-import
1 | niro | 144 | diff -Naur libpng-1.2.9/scripts/makefile.linux libpng-1.2.9_patched/scripts/makefile.linux |
2 | --- libpng-1.2.9/scripts/makefile.linux 2006-04-14 13:22:31.000000000 +0200 | ||
3 | +++ libpng-1.2.9_patched/scripts/makefile.linux 2006-04-14 21:46:30.000000000 +0200 | ||
4 | @@ -50,8 +50,9 @@ | ||
5 | CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ | ||
6 | $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 | ||
7 | |||
8 | -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm | ||
9 | -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm | ||
10 | +LIBS=-lz -lm | ||
11 | +LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 | ||
12 | +LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS) | ||
13 | |||
14 | INCPATH=$(prefix)/include | ||
15 | LIBPATH=$(exec_prefix)/lib | ||
16 | @@ -99,7 +100,7 @@ | ||
17 | echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ | ||
18 | echo L_opts=\"-L$(LIBPATH)\"; \ | ||
19 | echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ | ||
20 | - echo libs=\"-lpng12 -lz -lm\"; \ | ||
21 | + echo libs=\"-lpng12\"; \ | ||
22 | cat scripts/libpng-config-body.in ) > libpng-config | ||
23 | chmod +x libpng-config | ||
24 | |||
25 | @@ -110,12 +111,12 @@ | ||
26 | $(LN_SF) $(LIBSOVER) $(LIBSOMAJ) | ||
27 | |||
28 | $(LIBSOVER): $(OBJSDLL) | ||
29 | - $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) | ||
30 | + $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) $(LIBS) | ||
31 | |||
32 | $(OLDSOVER): $(OBJSDLL) | ||
33 | $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \ | ||
34 | -o $(OLDSOVER) \ | ||
35 | - $(OBJSDLL) | ||
36 | + $(OBJSDLL) $(LIBS) | ||
37 | |||
38 | pngtest: pngtest.o $(LIBSO) | ||
39 | $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) |