*** ./lib/Imakefile	Thu Mar 19 11:50:59 1998
--- ../libxpm-3.4k/./lib/Imakefile	Mon Jun 29 11:01:50 1998
***************
*** 99,104 ****
--- 99,105 ----
  #include "xpm.h"
  SOXPMLIBREV = XpmVersion./**/XpmRevision
  
+ 
  HEADERS = xpm.h
    SRCS = data.c create.c misc.c rgb.c scan.c parse.c hashtab.c \
  	 CrBufFrI.c CrDatFrP.c CrPFrBuf.c RdFToI.c WrFFrI.c \
***************
*** 184,186 ****
--- 185,202 ----
  #endif /* (ProjectX < 6) */
  
  DependTarget()
+ 
+ 
+ XCOMM
+ XCOMM Targets to support multi-ABI building --tmk
+ XCOMM
+ 
+ bin:
+ lib:	$(ABIOBJDIR)/libXpm$(LIBEXT)
+ 
+ $(ABIOBJDIR)/libXpm$(LIBEXT):	$(OBJS)
+ 	@-[ -d $(ABIOBJDIR) ] || mkdir $(ABIOBJDIR)
+ 	rm -f $(ABIOBJDIR)/libXpm$(ASOEXT) $(ABIOBJDIR)/libXpm$(LIBEXT)
+ 	$(AR) $(ABIOBJDIR)/libXpm$(ASOEXT) $(OBJS)
+ 	$(RANLIB) $(ABIOBJDIR)/libXpm$(ASOEXT)
+ 	cp -f $(ABIOBJDIR)/libXpm$(ASOEXT) $(ABIOBJDIR)/libXpm$(LIBEXT)
*** ./cxpm/Imakefile	Thu Mar 19 11:51:01 1998
--- ../libxpm-3.4k/./cxpm/Imakefile	Tue Jun 16 15:46:46 1998
***************
*** 30,35 ****
--- 30,36 ----
  XCOMM XPM Imakefile - Arnaud LE HORS
  XCOMM
  
+ 
  XCOMM default locations
  #ifndef XpmBinDir
  #define XpmBinDir $(BINDIR)
***************
*** 64,66 ****
--- 65,78 ----
  InstallManPage(cxpm,$(XPMMANDIR))
  DependTarget()
  LintTarget()
+ 
+ 
+ XCOMM
+ XCOMM Targets to support multi-ABI building --tmk
+ XCOMM
+ bin:			$(ABIOBJDIR)/cxpm
+ lib:
+ 
+ $(ABIOBJDIR)/cxpm:	cxpm
+ 	@-[ -d $(ABIOBJDIR) ] || mkdir $(ABIOBJDIR)
+ 	cp cxpm $@
*** ./sxpm/Imakefile	Thu Mar 19 11:51:01 1998
--- ../libxpm-3.4k/./sxpm/Imakefile	Tue Jun 16 16:36:49 1998
***************
*** 49,55 ****
        XPMMANDIR = XpmManDir
        XPMINCDIR = XpmIncDir
  
!          XPMLIB = -lXpm
         INCLUDES = -I$(BUILDINCDIR) -I$(XPMINCDIR)
          DEPLIBS = $(DEPXTOOLLIB) $(DEPXLIB)
  
--- 49,55 ----
        XPMMANDIR = XpmManDir
        XPMINCDIR = XpmIncDir
  
!          XPMLIB = -lXpm$(ABIEXT)
         INCLUDES = -I$(BUILDINCDIR) -I$(XPMINCDIR)
          DEPLIBS = $(DEPXTOOLLIB) $(DEPXLIB)
  
***************
*** 56,62 ****
  #ifdef Win32Architecture
  LOCAL_LIBRARIES = ../lib/Xpm.lib $(XTOOLLIB) $(XLIB)
  #else
! LOCAL_LIBRARIES = -L../lib -L$(XPMLIBDIR) $(XPMLIB) $(XTOOLLIB) $(XLIB)
  #endif
  
  XCOMM try hard to set things so we'll find the shared lib once installed
--- 56,62 ----
  #ifdef Win32Architecture
  LOCAL_LIBRARIES = ../lib/Xpm.lib $(XTOOLLIB) $(XLIB)
  #else
! LOCAL_LIBRARIES = -L../objs $(LIBBEF) $(XPMLIB) $(LIBAFT) $(XTOOLLIB) $(XLIB)
  #endif
  
  XCOMM try hard to set things so we'll find the shared lib once installed
***************
*** 96,98 ****
--- 96,108 ----
  clean::	
  	$(RM) sxpmout.xpm
  
+ 
+ XCOMM
+ XCOMM Targets to support multi-ABI building --tmk
+ XCOMM
+ bin:			$(ABIOBJDIR)/sxpm
+ lib:
+ 
+ $(ABIOBJDIR)/sxpm:	sxpm
+ 	@-[ -d $(ABIOBJDIR) ] || mkdir $(ABIOBJDIR)
+ 	cp sxpm $@
*** ./Imakefile	Thu Mar 19 11:50:59 1998
--- ../libxpm-3.4k/./Imakefile	Tue Jun 16 15:57:28 1998
***************
*** 72,74 ****
--- 72,94 ----
  
  MakeSubdirs($(SUBDIRS))
  DependSubdirs($(SUBDIRS))
+ 
+ 
+ XCOMM
+ XCOMM Additional targets to build all binaries or libraries
+ XCOMM
+ 
+    ABIOBJDIR = objs
+ 
+ 
+ XCOMM #define CustomPassFlags "CCOPTIONS=-woff 1136"
+ XCOMM #define CustomPassFlags "CCOPTIONS="
+ #define CustomPassFlags "DSOSTARTOPT=" "LLDDSOOPTS=-woff 157" "ABIOBJDIR=../$(ABIOBJDIR)"
+ 
+ 
+ NamedTargetSubdirs(lib,$(SUBDIRS),"making lib",PassCDebugFlags CustomPassFlags,lib)
+ NamedTargetSubdirs(bin,$(SUBDIRS),"making bin",PassCDebugFlags CustomPassFlags,bin)
+ 
+ 
+ distclean: clean
+ 	@rm -rf $(ABIOBJDIR)