← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/libpng/intrepid-security

« back to all changes in this revision

Viewing changes to scripts/makefile.dec

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2005-10-03 20:18:43 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051003201843-cv2i5v7no1ff08tx
Tags: 1.2.8rel-5
http://bugs.debian.org/331383
* drop_pass_width.patch: don't export png_pass_width, it's absolutely 
  unnecessary.
* libpng12-0.shlibs: downgrade the shlibs accordingly
  (closes: #331383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/makefile.dec
32
32
ZLIBINC=../zlib
33
33
 
34
34
PNGMAJ = 0
35
 
PNGMIN = 1.0.18
 
35
PNGMIN = 1.2.8
36
36
PNGVER = $(PNGMAJ).$(PNGMIN)
37
 
LIBNAME = libpng10
 
37
LIBNAME = libpng12
38
38
 
39
39
CC=cc
40
40
CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
62
62
        echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
63
63
        echo ccopts=\"-std\"; \
64
64
        echo L_opts=\"-L$(LIBPATH)\"; \
65
 
        echo libs=\"-lpng10 -lz -lm\"; \
 
65
        echo libs=\"-lpng12 -lz -lm\"; \
66
66
        cat scripts/libpng-config-body.in ) > libpng-config
67
67
        chmod +x libpng-config
68
68
 
76
76
        $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
77
77
        -soname $(LIBNAME).so.$(PNGMAJ)
78
78
 
79
 
libpng.so.2.$(PNGMIN): $(OBJS)
 
79
libpng.so.3.$(PNGMIN): $(OBJS)
80
80
        $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
81
 
        -soname libpng.so.2
 
81
        -soname libpng.so.3
82
82
 
83
83
pngtest: pngtest.o libpng.a
84
84
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
103
103
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
104
104
 
105
105
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
106
 
        libpng.so.2.$(PNGMIN)
 
106
        libpng.so.3.$(PNGMIN)
107
107
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
108
108
        -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
109
109
        -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
110
110
        -@/bin/rm -f $(DL)/libpng.so
111
 
        -@/bin/rm -f $(DL)/libpng.so.2
112
 
        -@/bin/rm -f $(DL)/libpng.so.2.$(PNGMIN)*
 
111
        -@/bin/rm -f $(DL)/libpng.so.3
 
112
        -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
113
113
        cp $(LIBNAME).so.$(PNGVER) $(DL)
114
 
        cp libpng.so.2.$(PNGMIN) $(DL)
 
114
        cp libpng.so.3.$(PNGMIN) $(DL)
115
115
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
116
 
        chmod 755 $(DL)/libpng.so.2.$(PNGMIN)
 
116
        chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
117
117
        (cd $(DL); \
118
 
        ln -f -s libpng.so.2.$(PNGMIN) libpng.so.2; \
119
 
        ln -f -s libpng.so.2 libpng.so; \
 
118
        ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
 
119
        ln -f -s libpng.so.3 libpng.so; \
120
120
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
121
121
        ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
122
122
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
155
155
        echo
156
156
        echo Testing installed dynamic shared library in $(DL).
157
157
        $(CC) -w1 -I$(DI) -I$(ZLIBINC) \
158
 
           `$(BINPATH)/libpng10-config --cflags` pngtest.c \
 
158
           `$(BINPATH)/libpng12-config --cflags` pngtest.c \
159
159
           -L$(DL) -L$(ZLIBLIB)  -R$(ZLIBLIB) -R$(DL) \
160
 
           -o pngtestd `$(BINPATH)/libpng10-config --ldflags`
 
160
           -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
161
161
        ./pngtestd pngtest.png
162
162
 
163
163
test-installed:
164
164
        echo
165
165
        echo Testing installed dynamic shared library.
166
166
        $(CC) -w1 -I$(ZLIBINC) \
167
 
           `$(BINPATH)/libpng10-config --cflags` pngtest.c \
 
167
           `$(BINPATH)/libpng12-config --cflags` pngtest.c \
168
168
           -L$(ZLIBLIB) -R$(ZLIBLIB) \
169
 
           -o pngtesti `$(BINPATH)/libpng10-config --ldflags`
 
169
           -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
170
170
        ./pngtesti pngtest.png
171
171
 
172
172
clean:
173
173
        /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
174
174
        libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
175
 
        libpng.so.2.$(PNGMIN) \
 
175
        libpng.so.3.$(PNGMIN) \
176
176
        libpng.pc
177
177
 
178
178
# DO NOT DELETE THIS LINE -- make depend depends on it.