projects / packages / crossmingw32-libpng.git / blame
| Commit | Line | Data |
|---|---|---|
| 710571e1 JB |
1 | --- libpng-1.2.12/scripts/makefile.gcmmx.orig 2006-06-29 10:10:33.974440000 +0200 |
| 2 | +++ libpng-1.2.12/scripts/makefile.gcmmx 2006-06-29 10:12:14.144440000 +0200 | |
| 3 | @@ -142,12 +142,10 @@ | |
| 4 | $(LIBSOVER): $(OBJSDLL) | |
| 5 | $(CC) -shared -Wl,-soname,$(LIBSOMAJ) \ | |
| 6 | -o $(LIBSOVER) \ | |
| 7 | - $(OBJSDLL) | |
| 8 | + $(OBJSDLL) -lz -lm | |
| 9 | ||
| 10 | -$(OLDSOVER): $(OBJSDLL) | |
| 11 | - $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \ | |
| 12 | - -o $(OLDSOVER) \ | |
| 13 | - $(OBJSDLL) | |
| 14 | +$(OLDSOVER): $(LIBSOVER) | |
| 15 | + $(LN_SF) $(LIBSOVER) $(OLDSOVER) | |
| 16 | ||
| 17 | pngtest: pngtest.o $(LIBSO) | |
| 18 | $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) | |
| 19 | @@ -190,9 +188,8 @@ | |
| 20 | -@$(RM_F) $(DL)/$(OLDSOMAJ) | |
| 21 | -@$(RM_F) $(DL)/$(OLDSOVER)* | |
| 22 | cp $(LIBSOVER) $(DL) | |
| 23 | - cp $(OLDSOVER) $(DL) | |
| 24 | + $(LN_SF) $(LIBSOVER) $(DL)/$(OLDSOVER) | |
| 25 | chmod 755 $(DL)/$(LIBSOVER) | |
| 26 | - chmod 755 $(DL)/$(OLDSOVER) | |
| 27 | (cd $(DL); \ | |
| 28 | $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \ | |
| 29 | $(LN_SF) $(OLDSOMAJ) $(OLDSO); \ | |
| 30 | --- libpng-1.2.12/scripts/makefile.linux.orig 2006-06-29 10:10:33.974440000 +0200 | |
| 31 | +++ libpng-1.2.12/scripts/makefile.linux 2006-06-29 10:13:16.824440000 +0200 | |
| 32 | @@ -110,12 +110,10 @@ | |
| 33 | $(LN_SF) $(LIBSOVER) $(LIBSOMAJ) | |
| 34 | ||
| 35 | $(LIBSOVER): $(OBJSDLL) | |
| 36 | - $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) | |
| 37 | + $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) -lz -lm | |
| 38 | ||
| 39 | -$(OLDSOVER): $(OBJSDLL) | |
| 40 | - $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \ | |
| 41 | - -o $(OLDSOVER) \ | |
| 42 | - $(OBJSDLL) | |
| 43 | +$(OLDSOVER): $(LIBSOVER) | |
| 44 | + $(LN_SF) $(LIBSOVER) $(OLDSOVER) | |
| 45 | ||
| 46 | pngtest: pngtest.o $(LIBSO) | |
| 47 | $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) | |
| 48 | @@ -158,9 +156,8 @@ | |
| 49 | -@$(RM_F) $(DL)/$(OLDSOMAJ) | |
| 50 | -@$(RM_F) $(DL)/$(OLDSOVER)* | |
| 51 | cp $(LIBSOVER) $(DL) | |
| 52 | - cp $(OLDSOVER) $(DL) | |
| 53 | + $(LN_SF) $(LIBSOVER) $(DL)/$(OLDSOVER) | |
| 54 | chmod 755 $(DL)/$(LIBSOVER) | |
| 55 | - chmod 755 $(DL)/$(OLDSOVER) | |
| 56 | (cd $(DL); \ | |
| 57 | $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \ | |
| 58 | $(LN_SF) $(OLDSOMAJ) $(OLDSO); \ |