diff options
Diffstat (limited to 'scripts/makefile.so9')
| -rw-r--r-- | scripts/makefile.so9 | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index f12d382a4..b69c97d93 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.4.0beta1 +PNGMIN = 1.4.0beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 @@ -17,8 +17,6 @@ LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOVER=$(LIBNAME).so.$(PNGVER) OLDSO=libpng.so -OLDSOMAJ=libpng.so.14 -OLDSOVER=libpng.so.14.$(PNGMIN) # Utilities: # gcc 2.95 doesn't work. @@ -123,10 +121,6 @@ $(LIBSOVER): $(OBJSDLL) $(LD) -G -h $(LIBSOMAJ) \ -o $(LIBSOVER) $(OBJSDLL) -$(OLDSOVER): $(OBJS) - $(LD) -G -h $(OLDSOMAJ) \ - -o $(OLDSOVER) $(OBJSDLL) - pngtest: pngtest.o $(LIBSO) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @@ -149,23 +143,17 @@ install-static: install-headers libpng.a -@$(RM_F) $(DL)/libpng.a (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) -install-shared: install-headers $(LIBSOVER) libpng.pc \ - $(OLDSOVER) +install-shared: install-headers $(LIBSOVER) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(OLDSO) - -@$(RM_F) $(DL)/$(OLDSOMAJ) - -@$(RM_F) $(DL)/$(OLDSOVER)* cp $(LIBSOVER) $(DL) - cp $(OLDSOVER) $(DL) chmod 755 $(DL)/$(LIBSOVER) - chmod 755 $(DL)/$(OLDSOVER) (cd $(DL); \ - $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \ - $(LN_SF) $(OLDSOMAJ) $(OLDSO); \ $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO)) + $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(OLDSO) $(LIBSO)) -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc @@ -219,7 +207,6 @@ test-installed: clean: $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBSO) $(LIBSOMAJ)* \ - $(OLDSOVER) \ libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO |