diff options
Diffstat (limited to 'scripts/makefile.hp64')
| -rw-r--r-- | scripts/makefile.hp64 | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index c56892c8d..656473b1c 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 0 -PNGMIN = 1.4.0beta1 +PNGMIN = 1.4.0beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -26,8 +26,6 @@ LIBSO=$(LIBNAME).sl LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) LIBSOVER=$(LIBNAME).sl.$(PNGVER) OLDSO=libpng.sl -OLDSOMAJ=libpng.sl.14 -OLDSOVER=libpng.sl.14.$(PNGMIN) # Utilities: AR_RC=ar rc @@ -108,10 +106,6 @@ $(LIBSOVER): $(OBJSDLL) $(LD) -b +s \ +h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) -$(OLDSOVER): $(OBJSDLL) - $(LD) -b +s \ - +h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL) - pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) @@ -134,23 +128,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 @@ -204,7 +192,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 |