1 --- libpng-1.0.63/scripts/makefile.linux.orig 2012-04-25 19:27:07.640508188 +0200
2 +++ libpng-1.0.63/scripts/makefile.linux 2012-04-25 19:27:36.627174251 +0200
12 PNGVER = $(PNGMAJ).$(PNGMIN)
15 CFLAGS=-I$(ZLIBINC) -W -Wall $(OPT_FLAGS) -funroll-loops -DPNG_NO_MMX_CODE \
16 $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
18 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm
19 +LDFLAGS=-L. -lpng -lz -lm
20 LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
22 INCPATH=$(prefix)/include
24 $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
26 $(LIBSOVER): $(OBJSDLL)
27 - $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)
28 + $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) -lz -lm
30 +libpng10.so.0.$(PNGMIN): $(LIBSOMAJ)
31 + ln -sf $(LIBNAME).so.$(PNGVER) libpng10.so.0.$(PNGMIN)
32 + ln -sf libpng10.so.0.$(PNGMIN) libpng10.so.0
34 $(OLDSOVER): $(OBJSDLL)
35 $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
40 pngtest: pngtest.o $(LIBSO)
41 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
44 install-headers: png.h pngconf.h
45 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
46 - -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
47 - cp png.h pngconf.h $(DI)/$(LIBNAME)
48 - chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
49 + -@if [ ! -d $(DI)/libpng10 ]; then $(MKDIR_P) $(DI)/libpng10; fi
50 + cp png.h pngconf.h $(DI)/libpng10
51 + chmod 644 $(DI)/libpng10/png.h $(DI)/libpng10/pngconf.h
52 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
53 -@$(RM_F) $(DI)/libpng
54 - (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
55 + (cd $(DI); $(LN_SF) libpng10 libpng; $(LN_SF) libpng10/* .)
57 install-static: install-headers libpng.a
58 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
59 cp libpng.a $(DL)/$(LIBNAME).a
60 chmod 644 $(DL)/$(LIBNAME).a
61 - -@$(RM_F) $(DL)/libpng.a
62 - (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
63 + -@$(RM_F) $(DL)/libpng10.a
64 + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng10.a)
66 install-shared: install-headers $(LIBSOVER) libpng.pc \
68 + libpng10.so.0.$(PNGMIN)
69 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
70 -@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
71 -@$(RM_F) $(DL)/$(LIBSOMAJ)
72 - -@$(RM_F) $(DL)/$(OLDSO)
73 - -@$(RM_F) $(DL)/$(OLDSOMAJ)
74 - -@$(RM_F) $(DL)/$(OLDSOVER)*
75 + -@$(RM_F) $(DL)/libpng10.so
76 + -@$(RM_F) $(DL)/libpng10.so.0
77 + -@$(RM_F) $(DL)/libpng10.so.0.$(PNGMIN)*
79 - cp $(OLDSOVER) $(DL)
80 chmod 755 $(DL)/$(LIBSOVER)
81 - chmod 755 $(DL)/$(OLDSOVER)
83 - $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
84 - $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
85 + ln -sf $(LIBNAME).so.$(PNGVER) libpng10.so.0.$(PNGMIN); \
86 + ln -sf libpng10.so.0.$(PNGMIN) libpng10.so.0; \
87 + ln -sf libpng10.so.0 libpng10.so; \
88 $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
89 $(LN_SF) $(LIBSOMAJ) $(LIBSO))
90 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
91 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
92 - -@$(RM_F) $(DL)/pkgconfig/libpng.pc
93 + -@$(RM_F) $(DL)/pkgconfig/libpng10.pc
94 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
95 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
96 - (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
97 + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng10.pc)
99 install-man: libpng.3 libpngpf.3 png.5
100 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
101 @@ -194,11 +197,11 @@
103 install-config: libpng-config
104 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
105 - -@$(RM_F) $(DB)/libpng-config
106 + -@$(RM_F) $(DB)/libpng10-config
107 -@$(RM_F) $(DB)/$(LIBNAME)-config
108 cp libpng-config $(DB)/$(LIBNAME)-config
109 chmod 755 $(DB)/$(LIBNAME)-config
110 - (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
111 + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng10-config)
113 install: install-static install-shared install-man install-config
115 --- libpng-1.0.63/scripts/makefile.gcmmx.orig 2008-03-15 15:25:16.211287745 +0100
116 +++ libpng-1.0.63/scripts/makefile.gcmmx 2008-03-15 15:25:55.143148910 +0100
118 # the background! Context switches between MMX and FPU are expensive.
126 PNGVER = $(PNGMAJ).$(PNGMIN)
129 # -m486 -malign-double -ffast-math \
130 # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
132 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm
133 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
134 +LDFLAGS=-L. -lpng -lz -lm
135 +LDFLAGS_A=libpng.a -lz -lm
138 INCPATH=$(prefix)/include
139 @@ -138,12 +138,16 @@
140 $(LIBSOVER): $(OBJSDLL)
141 $(CC) -shared -Wl,-soname,$(LIBSOMAJ) \
146 +libpng10.so.0.$(PNGMIN): $(LIBSOMAJ)
147 + ln -sf $(LIBNAME).so.$(PNGVER) libpng10.so.0.$(PNGMIN)
148 + ln -sf libpng10.so.0.$(PNGMIN) libpng10.so.0
150 $(OLDSOVER): $(OBJSDLL)
151 $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
156 pngtest: pngtest.o $(LIBSO)
157 $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
158 @@ -163,43 +167,42 @@
160 install-headers: png.h pngconf.h
161 -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
162 - -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
163 - cp png.h pngconf.h $(DI)/$(LIBNAME)
164 - chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
165 + -@if [ ! -d $(DI)/libpng10 ]; then $(MKDIR_P) $(DI)/libpng10; fi
166 + cp png.h pngconf.h $(DI)/libpng10
167 + chmod 644 $(DI)/libpng10/png.h $(DI)/libpng10/pngconf.h
168 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
169 -@$(RM_F) $(DI)/libpng
170 - (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
171 + (cd $(DI); $(LN_SF) libpng10 libpng; $(LN_SF) libpng10/* .)
173 install-static: install-headers libpng.a
174 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
175 cp libpng.a $(DL)/$(LIBNAME).a
176 chmod 644 $(DL)/$(LIBNAME).a
177 - -@$(RM_F) $(DL)/libpng.a
178 - (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
179 + -@$(RM_F) $(DL)/libpng10.a
180 + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng10.a)
182 install-shared: install-headers $(LIBSOVER) libpng.pc \
184 + libpng10.so.0.$(PNGMIN)
185 -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
186 -@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
187 -@$(RM_F) $(DL)/$(LIBSOMAJ)
188 - -@$(RM_F) $(DL)/$(OLDSO)
189 - -@$(RM_F) $(DL)/$(OLDSOMAJ)
190 - -@$(RM_F) $(DL)/$(OLDSOVER)*
191 + -@$(RM_F) $(DL)/libpng10.so
192 + -@$(RM_F) $(DL)/libpng10.so.0
193 + -@$(RM_F) $(DL)/libpng10.so.$(PNGMIN)*
195 - cp $(OLDSOVER) $(DL)
196 chmod 755 $(DL)/$(LIBSOVER)
197 - chmod 755 $(DL)/$(OLDSOVER)
199 - $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
200 - $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
201 + ln -sf $(LIBNAME).so.$(PNGVER) libpng10.so.0.$(PNGMIN); \
202 + ln -sf libpng10.so.0.$(PNGMIN) libpng10.so.0; \
203 + ln -sf libpng10.so.0 libpng10.so; \
204 $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
205 $(LN_SF) $(LIBSOMAJ) $(LIBSO))
206 -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
207 -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
208 - -@$(RM_F) $(DL)/pkgconfig/libpng.pc
209 + -@$(RM_F) $(DL)/pkgconfig/libpng10.pc
210 cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
211 chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
212 - (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
213 + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng10.pc)
215 install-man: libpng.3 libpngpf.3 png.5
216 -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
217 @@ -214,11 +217,11 @@
219 install-config: libpng-config
220 -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
221 - -@$(RM_F) $(DB)/libpng-config
222 + -@$(RM_F) $(DB)/libpng10-config
223 -@$(RM_F) $(DB)/$(LIBNAME)-config
224 cp libpng-config $(DB)/$(LIBNAME)-config
225 chmod 755 $(DB)/$(LIBNAME)-config
226 - (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
227 + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng10-config)
229 install: install-static install-shared install-man install-config