]>
Commit | Line | Data |
---|---|---|
fe923397 JB |
1 | diff -Nur libpng-1.2.5.orig/scripts/makefile.gcmmx libpng-1.2.5/scripts/makefile.gcmmx |
2 | --- libpng-1.2.5.orig/scripts/makefile.gcmmx Sat Oct 12 01:00:37 2002 | |
3 | +++ libpng-1.2.5/scripts/makefile.gcmmx Sat Oct 12 01:05:56 2002 | |
4 | @@ -125,14 +125,12 @@ | |
5 | ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) | |
6 | ||
7 | $(LIBNAME).so.$(PNGVER): $(OBJSDLL) | |
8 | - $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ | |
9 | + $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \ | |
10 | -o $(LIBNAME).so.$(PNGVER) \ | |
11 | $(OBJSDLL) | |
12 | ||
13 | -libpng.so.3.$(PNGMIN): $(OBJSDLL) | |
14 | - $(CC) -shared -Wl,-soname,libpng.so.3 \ | |
15 | - -o libpng.so.3.$(PNGMIN) \ | |
16 | - $(OBJSDLL) | |
17 | +libpng.so.3.$(PNGMIN): $(LIBNAME).so.$(PNGVER) | |
18 | + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN) | |
19 | ||
20 | pngtest: pngtest.o $(LIBNAME).so | |
21 | $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) | |
22 | @@ -174,10 +172,9 @@ | |
23 | -@/bin/rm -f $(DL)/libpng.so.3 | |
24 | -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* | |
25 | cp $(LIBNAME).so.$(PNGVER) $(DL) | |
26 | - cp libpng.so.3.$(PNGMIN) $(DL) | |
27 | chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) | |
28 | - chmod 755 $(DL)/libpng.so.3.$(PNGMIN) | |
29 | (cd $(DL); \ | |
30 | + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ | |
31 | ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ | |
32 | ln -sf libpng.so.3 libpng.so; \ | |
33 | ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ | |
34 | diff -Nur libpng-1.2.5.orig/scripts/makefile.linux libpng-1.2.5/scripts/makefile.linux | |
35 | --- libpng-1.2.5.orig/scripts/makefile.linux Sat Oct 12 01:00:37 2002 | |
36 | +++ libpng-1.2.5/scripts/makefile.linux Sat Oct 12 01:05:55 2002 | |
37 | @@ -97,14 +97,12 @@ | |
38 | ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) | |
39 | ||
40 | $(LIBNAME).so.$(PNGVER): $(OBJSDLL) | |
41 | - $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ | |
42 | + $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \ | |
43 | -o $(LIBNAME).so.$(PNGVER) \ | |
44 | $(OBJSDLL) | |
45 | ||
46 | -libpng.so.3.$(PNGMIN): $(OBJSDLL) | |
47 | - $(CC) -shared -Wl,-soname,libpng.so.3 \ | |
48 | - -o libpng.so.3.$(PNGMIN) \ | |
49 | - $(OBJSDLL) | |
50 | +libpng.so.3.$(PNGMIN): $(LIBNAME).so.$(PNGVER) | |
51 | + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN) | |
52 | ||
53 | pngtest: pngtest.o $(LIBNAME).so | |
54 | $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) | |
55 | @@ -146,10 +144,9 @@ | |
56 | -@/bin/rm -f $(DL)/libpng.so.3 | |
57 | -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* | |
58 | cp $(LIBNAME).so.$(PNGVER) $(DL) | |
59 | - cp libpng.so.3.$(PNGMIN) $(DL) | |
60 | chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) | |
61 | - chmod 755 $(DL)/libpng.so.3.$(PNGMIN) | |
62 | (cd $(DL); \ | |
63 | + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ | |
64 | ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ | |
65 | ln -sf libpng.so.3 libpng.so; \ | |
66 | ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ |