projects / packages / crossmingw32-libpng.git / blame
| Commit | Line | Data |
|---|---|---|
| da962022 | 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 @@ | |
| f23316eb 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 | |
| 5df06dd2 PS |
9 | +LDFLAGS=-L. -lpng12 -lz -lm |
| 10 | +LDFLAGS_A=libpng.a -lz -lm | |
| f23316eb | 11 | |
| f67cb19d JB |
12 | |
| 13 | INCPATH=$(prefix)/include | |
| da962022 | 14 | @@ -124,7 +124,7 @@ |
| f23316eb | 15 | echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ |
| da962022 | 16 | echo cppflags=\"-DPNG_THREAD_UNSAFE_OK \"; \ |
| f23316eb JB |
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 | |
| da962022 | 23 | @@ -238,7 +238,6 @@ |
| f23316eb JB |
24 | test-installed: |
| 25 | $(CC) -I$(ZLIBINC) \ | |
| f67cb19d | 26 | `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ |
| f23316eb | 27 | - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ |
| f67cb19d | 28 | -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` |
| f23316eb JB |
29 | ./pngtesti pngtest.png |
| 30 | ||
| da962022 | 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 | |
| f67cb19d | 33 | @@ -50,8 +50,8 @@ |
| f23316eb JB |
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 | |
| 5df06dd2 PS |
39 | +LDFLAGS=-L. -lpng12 -lz -lm |
| 40 | +LDFLAGS_A=libpng.a -lz -lm | |
| f23316eb | 41 | |
| f67cb19d JB |
42 | INCPATH=$(prefix)/include |
| 43 | LIBPATH=$(exec_prefix)/lib | |
| da962022 | 44 | @@ -102,7 +102,7 @@ |
| f23316eb JB |
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 | |
| da962022 | 53 | @@ -214,7 +214,6 @@ |
| f23316eb JB |
54 | test-installed: |
| 55 | $(CC) -I$(ZLIBINC) \ | |
| f67cb19d | 56 | `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ |
| f23316eb | 57 | - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ |
| f67cb19d | 58 | -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` |
| f23316eb JB |
59 | ./pngtesti pngtest.png |
| 60 |