| | 1 | --- libpng-1.2.21/scripts/makefile.gcmmx~ 2007-10-08 19:52:12.000000000 +0200 |
| | 2 | +++ libpng-1.2.21/scripts/makefile.gcmmx 2007-10-08 19:55:00.000000000 +0200 |
| | 3 | @@ -70,8 +70,8 @@ |
| | 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. -lpng12 -lz -lm |
| | 10 | +LDFLAGS_A=libpng.a -lz -lm |
| | 11 | |
| | 12 | |
| | 13 | INCPATH=$(prefix)/include |
| | 14 | @@ -124,7 +124,7 @@ |
| | 15 | echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ |
| | 16 | echo cppflags=\"-DPNG_THREAD_UNSAFE_OK \"; \ |
| | 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 |
| | 23 | @@ -238,7 +238,6 @@ |
| | 24 | test-installed: |
| | 25 | $(CC) -I$(ZLIBINC) \ |
| | 26 | `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ |
| | 27 | - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ |
| | 28 | -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` |
| | 29 | ./pngtesti pngtest.png |
| | 30 | |
| | 31 | --- libpng-1.2.21/scripts/makefile.linux~ 2007-10-08 19:52:12.000000000 +0200 |
| | 32 | +++ libpng-1.2.21/scripts/makefile.linux 2007-10-08 19:56:43.000000000 +0200 |
| | 33 | @@ -50,8 +50,8 @@ |
| | 34 | CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \ |
| | 35 | $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 |
| | 36 | |
| | 37 | -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm |
| | 38 | -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm |
| | 39 | +LDFLAGS=-L. -lpng12 -lz -lm |
| | 40 | +LDFLAGS_A=libpng.a -lz -lm |
| | 41 | |
| | 42 | INCPATH=$(prefix)/include |
| | 43 | LIBPATH=$(exec_prefix)/lib |
| | 44 | @@ -102,7 +102,7 @@ |
| | 45 | echo prefix=\"$(prefix)\"; \ |
| | 46 | echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ |
| | 47 | echo L_opts=\"-L$(LIBPATH)\"; \ |
| | 48 | - echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ |
| | 49 | + echo R_opts=\"\"; \ |
| | 50 | echo libs=\"-lpng12 -lz -lm\"; \ |
| | 51 | cat scripts/libpng-config-body.in ) > libpng-config |
| | 52 | chmod +x libpng-config |
| | 53 | @@ -214,7 +214,6 @@ |
| | 54 | test-installed: |
| | 55 | $(CC) -I$(ZLIBINC) \ |
| | 56 | `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ |
| | 57 | - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ |
| | 58 | -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` |
| | 59 | ./pngtesti pngtest.png |
| | 60 | |
projects / packages / libpng.git / blame_incremental