*** ./makefile.cfg	Sat Mar 21 11:08:57 1998
--- ../libjpeg-6b/./makefile.cfg	Thu Jun 25 19:50:28 1998
***************
*** 35,40 ****
--- 35,51 ----
  # To link any special libraries, add the necessary -l commands here.
  LDLIBS= @LIBS@
  
+ # Special variable that links the appropriate ABI of libjpeg. --tmk
+ LDJPEG= $(LIBBEF) -L. -ljpeg $(LIBAFT)
+ 
+ # These vars are normally set by the parent makefile. --tmk
+ ABIEXT=
+ ASOEXT=
+ BINEXT=
+ LIBEXT=.a
+ LIBBEF=
+ LIBAFT=
+ 
  # If using GNU libtool, LIBTOOL references it; if not, LIBTOOL is empty.
  LIBTOOL = @LIBTOOL@
  # $(O) expands to "lo" if using libtool, plain "o" if not.
***************
*** 123,129 ****
          jdmainct.$(O) jdcoefct.$(O) jdpostct.$(O) jddctmgr.$(O) \
          jidctfst.$(O) jidctflt.$(O) jidctint.$(O) jidctred.$(O) \
          jdsample.$(O) jdcolor.$(O) jquant1.$(O) jquant2.$(O) jdmerge.$(O)
! # These objectfiles are included in libjpeg.a
  LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
  # object files for sample applications (excluding library files)
  COBJECTS= cjpeg.$(O) rdppm.$(O) rdgif.$(O) rdtarga.$(O) rdrle.$(O) \
--- 134,140 ----
          jdmainct.$(O) jdcoefct.$(O) jdpostct.$(O) jddctmgr.$(O) \
          jidctfst.$(O) jidctflt.$(O) jidctint.$(O) jidctred.$(O) \
          jdsample.$(O) jdcolor.$(O) jquant1.$(O) jquant2.$(O) jdmerge.$(O)
! # These objectfiles are included in libjpeg$(LIBEXT)
  LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
  # object files for sample applications (excluding library files)
  COBJECTS= cjpeg.$(O) rdppm.$(O) rdgif.$(O) rdtarga.$(O) rdrle.$(O) \
***************
*** 133,139 ****
  TROBJECTS= jpegtran.$(O) rdswitch.$(O) cdjpeg.$(O) transupp.$(O)
  
  
! all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
  
  # Special compilation rules to support ansi2knr and libtool.
  .SUFFIXES: .lo .la
--- 144,150 ----
  TROBJECTS= jpegtran.$(O) rdswitch.$(O) cdjpeg.$(O) transupp.$(O)
  
  
! all: @A2K_DEPS@ libjpeg$(LIBEXT) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
  
  # Special compilation rules to support ansi2knr and libtool.
  .SUFFIXES: .lo .la
***************
*** 158,163 ****
--- 169,184 ----
  	$(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr $(srcdir)/ansi2knr.c
  	$(MKDIR) knr
  
+ # special rules used by parent makefile for multi-ABI building --tmk
+ 
+ bin:			cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+ lib:			libjpeg$(LIBEXT)
+ libjpeg$(LIBEXT):	$(LIBOBJECTS)
+ 	rm -f libjpeg$(ASOEXT) libjpeg$(LIBEXT)
+ 	$(AR) libjpeg$(ASOEXT) $(LIBOBJECTS)
+ 	$(RANLIB) libjpeg$(ASOEXT)
+ 	cp -f libjpeg$(ASOEXT) libjpeg$(LIBEXT)
+ 
  # the library:
  
  # without libtool:
***************
*** 173,186 ****
  
  # sample programs:
  
! cjpeg: $(COBJECTS) libjpeg.$(A)
! 	$(LN) $(LDFLAGS) -o cjpeg $(COBJECTS) libjpeg.$(A) $(LDLIBS)
  
! djpeg: $(DOBJECTS) libjpeg.$(A)
! 	$(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) libjpeg.$(A) $(LDLIBS)
  
! jpegtran: $(TROBJECTS) libjpeg.$(A)
! 	$(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) libjpeg.$(A) $(LDLIBS)
  
  rdjpgcom: rdjpgcom.$(O)
  	$(LN) $(LDFLAGS) -o rdjpgcom rdjpgcom.$(O) $(LDLIBS)
--- 194,207 ----
  
  # sample programs:
  
! cjpeg: $(COBJECTS) libjpeg$(LIBEXT)
! 	$(LN) $(LDFLAGS) -o cjpeg $(COBJECTS) $(LDJPEG) $(LDLIBS)
  
! djpeg: $(DOBJECTS) libjpeg$(LIBEXT)
! 	$(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) $(LDJPEG) $(LDLIBS)
  
! jpegtran: $(TROBJECTS) libjpeg$(LIBEXT)
! 	$(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) $(LDJPEG) $(LDLIBS)
  
  rdjpgcom: rdjpgcom.$(O)
  	$(LN) $(LDFLAGS) -o rdjpgcom rdjpgcom.$(O) $(LDLIBS)
***************
*** 190,196 ****
  
  # Installation rules:
  
! install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
  	$(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
  	$(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
  	$(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
--- 211,223 ----
  
  # Installation rules:
  
! install: install-bin install-lib install-headers
! 
! #
! # Removed dependencies because install doesn't understand multi-ABI. --tmk
! #
! #install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom
! install-bin:
  	$(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
  	$(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
  	$(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
***************
*** 202,209 ****
  	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
  	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
  
! install-lib: libjpeg.$(A) install-headers
! 	$(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
  
  install-headers: jconfig.h
  	$(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
--- 229,241 ----
  	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
  	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
  
! #
! # Removed dependencies because install doesn't understand multi-ABI.
! # This doesn't actually correctly install all 6 ABIs. --tmk
! #
! #install-lib: libjpeg$(LIBEXT) install-headers
! install-lib: install-headers
! 	$(INSTALL_LIB) libjpeg$(LIBEXT) $(libdir)/$(binprefix)libjpeg$(LIBEXT)
  
  install-headers: jconfig.h
  	$(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
***************
*** 213,232 ****
  
  clean:
  	$(RM) *.o *.lo libjpeg.a libjpeg.la
! 	$(RM) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
! 	$(RM) ansi2knr core testout* config.log config.status
  	$(RM) -r knr .libs _libs
  
  distclean: clean
  	$(RM) Makefile jconfig.h libtool config.cache
  
  test: cjpeg djpeg jpegtran
  	$(RM) testout*
  	./djpeg -dct int -ppm -outfile testout.ppm  $(srcdir)/testorig.jpg
  	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp  $(srcdir)/testorig.jpg
  	./cjpeg -dct int -outfile testout.jpg  $(srcdir)/testimg.ppm
  	./djpeg -dct int -ppm -outfile testoutp.ppm $(srcdir)/testprog.jpg
  	./cjpeg -dct int -progressive -opt -outfile testoutp.jpg $(srcdir)/testimg.ppm
  	./jpegtran -outfile testoutt.jpg $(srcdir)/testprog.jpg
  	cmp $(srcdir)/testimg.ppm testout.ppm
  	cmp $(srcdir)/testimg.bmp testout.bmp
--- 245,271 ----
  
  clean:
  	$(RM) *.o *.lo libjpeg.a libjpeg.la
! 	$(RM) ansi2knr core so_locations testout* config.log config.status
  	$(RM) -r knr .libs _libs
  
  distclean: clean
  	$(RM) Makefile jconfig.h libtool config.cache
+ 	$(RM) -f libjpeg*.{so,a}
+ 	$(RM) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
  
  test: cjpeg djpeg jpegtran
  	$(RM) testout*
+ 	LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; \
  	./djpeg -dct int -ppm -outfile testout.ppm  $(srcdir)/testorig.jpg
+ 	LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; \
  	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp  $(srcdir)/testorig.jpg
+ 	LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; \
  	./cjpeg -dct int -outfile testout.jpg  $(srcdir)/testimg.ppm
+ 	LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; \
  	./djpeg -dct int -ppm -outfile testoutp.ppm $(srcdir)/testprog.jpg
+ 	LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; \
  	./cjpeg -dct int -progressive -opt -outfile testoutp.jpg $(srcdir)/testimg.ppm
+ 	LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; \
  	./jpegtran -outfile testoutt.jpg $(srcdir)/testprog.jpg
  	cmp $(srcdir)/testimg.ppm testout.ppm
  	cmp $(srcdir)/testimg.bmp testout.bmp