-Fix the build/installation with libtool 2.2.

-Get all files/* to use '-ur' flag with diff(1). Got dizzy without -ur. :-P

Reported by:	pointyhat-exp

10 files changed, 291 insertions, 201 deletions

diff --git a/x11-toolkits/xmhtml/files/patch-aa b/x11-toolkits/xmhtml/files/patch-aa
index 3339cbd191d..041ac03a116 100644
--- a/x11-toolkits/xmhtml/files/patch-aa
+++ b/x11-toolkits/xmhtml/files/patch-aa
@@ -1,150 +1,85 @@
-*** Makefile.org	Sat Jan  6 19:35:41 2001
---- Makefile	Sat Jan  6 19:46:00 2001
-***************
-*** 40,46 ****
-  # remove the examples directory from this line.
-  # If you want to build the XmHTML tutorial examples, add the book directory.
-  
-! SUBDIRS= lib http examples tools
-  
-  # some common definitions
-  #
---- 40,46 ----
-  # remove the examples directory from this line.
-  # If you want to build the XmHTML tutorial examples, add the book directory.
-  
-! SUBDIRS= lib http
-  
-  # some common definitions
-  #
-***************
-*** 55,61 ****
-  RANLIB= ranlib
-  
-  SHELL     = /bin/sh
-! MAKE      = make 
-  # change this to makedepend if your system doesn't have gcc
-  MAKEDEPEND= gccmakedep
-  
---- 55,61 ----
-  RANLIB= ranlib
-  
-  SHELL     = /bin/sh
-! #MAKE      = make
-  # change this to makedepend if your system doesn't have gcc
-  MAKEDEPEND= gccmakedep
-  
-***************
-*** 64,72 ****
-  # Compiler Settings #
-  #                   #
-  #####################
-! CC       = gcc
-! CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
-! LDFLAGS  = 
-  
-  # The following flags are *very* usefull if you are getting unresolved
-  # references to functions in libraries that you *know* to exist.
---- 64,72 ----
-  # Compiler Settings #
-  #                   #
-  #####################
-! #CC       = gcc
-! #CFLAGS   = -g -funroll-loops -Wall -pipe -ansi
-! #LDFLAGS  =
-  
-  # The following flags are *very* usefull if you are getting unresolved
-  # references to functions in libraries that you *know* to exist.
-***************
-*** 115,121 ****
-  # HAVE_LIBZ => zlib.h
-  
-  ZLIBINC       =
-! IMAGEINCLUDES = $(ZLIBINC)
-  
-  # Image libraries
-  # No need to add -lXpm if you need to include it with LIBS below
---- 115,121 ----
-  # HAVE_LIBZ => zlib.h
-  
-  ZLIBINC       =
-! IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC)
-  
-  # Image libraries
-  # No need to add -lXpm if you need to include it with LIBS below
-***************
-*** 126,132 ****
-  # HAVE_LIBZ => libz (and possibly libm)
-  
-  ZLIBLIB   = -lz -lm
-! IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
-  
-  # It might be troublesome to know what the correct defines are for your
-  # system. A possible set of defines for some OS's is given below. Pick
---- 126,132 ----
-  # HAVE_LIBZ => libz (and possibly libm)
-  
-  ZLIBLIB   = -lz -lm
-! IMAGELIBS = -L${LOCALBASE}/lib -ljpeg -lpng $(ZLIBLIB)
-  
-  # It might be troublesome to know what the correct defines are for your
-  # system. A possible set of defines for some OS's is given below. Pick
-***************
-*** 166,182 ****
-  # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
-  # info).
-  #
-! CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) 
-  
-  # Various include directories
-  LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
-  
-  # Platform specific includes
-  ifeq ($(PLATFORM),Motif)
-! PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
-  else
-  ifeq ($(PLATFORM),gtk)
-! PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
-  endif
-  endif
-  
---- 166,182 ----
-  # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
-  # info).
-  #
-! CPPFLAGS = -DHAVE_REGEX_H $(IMAGEDEFINES)
-  
-  # Various include directories
-  LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
-  
-  # Platform specific includes
-  ifeq ($(PLATFORM),Motif)
-! PLATFORMINC=-I../../include/XmHTML -I${LOCALBASE}/include
-  else
-  ifeq ($(PLATFORM),gtk)
-! PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include
-  endif
-  endif
-  
-***************
-*** 192,201 ****
-  # Motif version (default)
-  ifeq ($(PLATFORM),Motif)
-  
-! LIBDIR = -L/usr/X11R6/lib
-  # This is what is required under Linux (Motif 2.0.1).
-  # Your mileage may vary.
-! LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
-  
-  else
-  
---- 192,201 ----
-  # Motif version (default)
-  ifeq ($(PLATFORM),Motif)
-  
-! LIBDIR = -L${LOCALBASE}/lib
-  # This is what is required under Linux (Motif 2.0.1).
-  # Your mileage may vary.
-! LIBS   = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
-  
-  else
+--- Makefile.orig	1999-02-03 18:43:27.000000000 -0600
++++ Makefile	2009-07-12 10:57:05.000000000 -0500
+@@ -40,7 +40,7 @@
+ # remove the examples directory from this line.
+ # If you want to build the XmHTML tutorial examples, add the book directory.
+ 
+-SUBDIRS= lib http examples tools
++SUBDIRS= lib http
+ 
+ # some common definitions
+ #
+@@ -55,7 +55,7 @@
+ RANLIB= ranlib
+ 
+ SHELL     = /bin/sh
+-MAKE      = make 
++#MAKE      = make
+ # change this to makedepend if your system doesn't have gcc
+ MAKEDEPEND= gccmakedep
+ 
+@@ -64,9 +64,9 @@
+ # Compiler Settings #
+ #                   #
+ #####################
+-CC       = gcc
+-CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
+-LDFLAGS  = 
++#CC       = gcc
++#CFLAGS   = -g -funroll-loops -Wall -pipe -ansi
++#LDFLAGS  =
+ 
+ # The following flags are *very* usefull if you are getting unresolved
+ # references to functions in libraries that you *know* to exist.
+@@ -115,7 +115,7 @@
+ # HAVE_LIBZ => zlib.h
+ 
+ ZLIBINC       =
+-IMAGEINCLUDES = $(ZLIBINC)
++IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC)
+ 
+ # Image libraries
+ # No need to add -lXpm if you need to include it with LIBS below
+@@ -126,7 +126,7 @@
+ # HAVE_LIBZ => libz (and possibly libm)
+ 
+ ZLIBLIB   = -lz -lm
+-IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
++IMAGELIBS = -L${LOCALBASE}/lib -ljpeg -lpng $(ZLIBLIB)
+ 
+ # It might be troublesome to know what the correct defines are for your
+ # system. A possible set of defines for some OS's is given below. Pick
+@@ -166,17 +166,17 @@
+ # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
+ # info).
+ #
+-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) 
++CPPFLAGS = -DHAVE_REGEX_H $(IMAGEDEFINES)
+ 
+ # Various include directories
+ LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
+ 
+ # Platform specific includes
+ ifeq ($(PLATFORM),Motif)
+-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
++PLATFORMINC=-I../../include/XmHTML -I${LOCALBASE}/include
+ else
+ ifeq ($(PLATFORM),gtk)
+-PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
++PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include
+ endif
+ endif
+ 
+@@ -192,10 +192,10 @@
+ # Motif version (default)
+ ifeq ($(PLATFORM),Motif)
+ 
+-LIBDIR = -L/usr/X11R6/lib
++LIBDIR = -L${LOCALBASE}/lib
+ # This is what is required under Linux (Motif 2.0.1).
+ # Your mileage may vary.
+-LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
++LIBS   = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
+ 
+ else
+ 
diff --git a/x11-toolkits/xmhtml/files/patch-ab b/x11-toolkits/xmhtml/files/patch-ab
index 553cfa6520f..34f70822848 100644
--- a/x11-toolkits/xmhtml/files/patch-ab
+++ b/x11-toolkits/xmhtml/files/patch-ab
@@ -1,5 +1,5 @@
---- examples/Makefile.orig	Wed Feb  3 19:43:27 1999
-+++ examples/Makefile	Tue Nov  2 01:39:14 1999
+--- examples/Makefile.orig	1999-02-03 18:43:27.000000000 -0600
++++ examples/Makefile	2009-07-12 11:02:35.000000000 -0500
 @@ -11,10 +11,10 @@
  EXAMPLES=example_1 example_2 example_4
  
@@ -13,3 +13,31 @@
  
  # Libraries against which all examples are linked 
  LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
+@@ -22,7 +22,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ all: $(EXAMPLES)
+ 
+@@ -30,15 +30,15 @@
+ 
+ example_1::  ../src/libXmHTML.a example_1.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) example_1.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_1.o $(LINKLIBS)
+ 
+ example_2::  ../src/libXmHTML.a example_2.o $(MOBJS)
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) example_2.o $(MOBJS) $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_2.o $(MOBJS) $(LINKLIBS)
+ 
+ example_4::  ../src/libXmHTML.a example_4.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) example_4.o $(LINKLIBS) $(HTTPLIB)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) example_4.o $(LINKLIBS) $(HTTPLIB)
+ 
+ .PHONY: ../src/libXmHTML.a 
+ .PHONY: stamp-includes
diff --git a/x11-toolkits/xmhtml/files/patch-ac b/x11-toolkits/xmhtml/files/patch-ac
index d9bb79622f0..7dbdb547a9d 100644
--- a/x11-toolkits/xmhtml/files/patch-ac
+++ b/x11-toolkits/xmhtml/files/patch-ac
@@ -1,5 +1,5 @@
---- http/Makefile.orig	Wed Feb  3 19:43:27 1999
-+++ http/Makefile	Tue Nov  2 01:28:54 1999
+--- http/Makefile.orig	1999-02-03 18:43:27.000000000 -0600
++++ http/Makefile	2009-07-12 11:03:51.000000000 -0500
 @@ -2,7 +2,7 @@
  # lint configuration. I use lclint.
  #
@@ -9,7 +9,15 @@
  
  # List of source, object and header files 
  SRCS=HTTP.c cookie.c
-@@ -27,9 +27,8 @@
+@@ -20,16 +20,15 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ all: $(TARGET)
+ 
  # targets to build
  
  $(TARGET):: $(OBJS)  
@@ -17,7 +25,7 @@
 -	$(AR) $@ $(OBJS)  
 -	$(RANLIB) $@
 +	$(RM) $@
-+	$(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
  
  stamp-includes:
  	@if [ -d ../include ]; then set +x; \
diff --git a/x11-toolkits/xmhtml/files/patch-ad b/x11-toolkits/xmhtml/files/patch-ad
index b8a57c67520..67e7f696c31 100644
--- a/x11-toolkits/xmhtml/files/patch-ad
+++ b/x11-toolkits/xmhtml/files/patch-ad
@@ -1,5 +1,5 @@
---- lib/Makefile.orig	Wed Feb  3 19:43:26 1999
-+++ lib/Makefile	Tue Nov  2 01:28:54 1999
+--- lib/Makefile.orig	1999-02-03 18:43:26.000000000 -0600
++++ lib/Makefile	2009-07-12 11:05:25.000000000 -0500
 @@ -25,7 +25,7 @@
  # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         #
  ##############################################################################
@@ -17,7 +17,7 @@
 -	$(AR) $@ common/*.o $(PLATFORM)/*.o
 -	$(RANLIB) $@
 +	$(RM) $@
-+	$(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
++	$(LIBTOOL) --mode=link $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
 +		-rpath ${PREFIX}/lib -version-info 1:2
  	
  depend:: 
diff --git a/x11-toolkits/xmhtml/files/patch-ae b/x11-toolkits/xmhtml/files/patch-ae
index 18b814870e5..351bc00406e 100644
--- a/x11-toolkits/xmhtml/files/patch-ae
+++ b/x11-toolkits/xmhtml/files/patch-ae
@@ -1,11 +1,72 @@
---- tools/Makefile.orig	Wed Feb  3 19:43:27 1999
-+++ tools/Makefile	Tue Nov  2 01:38:36 1999
-@@ -88,7 +88,7 @@
+--- tools/Makefile.orig	1999-02-03 18:43:27.000000000 -0600
++++ tools/Makefile	2009-07-12 11:08:00.000000000 -0500
+@@ -39,7 +39,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+ #
+ # Special object rules
+@@ -50,21 +50,21 @@
+ #
+ gif2gzf.o: gif2gzf.c
+ 	$(RM) $@
+-	$(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(ZLIBINC) $*.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(ZLIBINC) $*.c
+ 
+ #
+ # LZWStream compiled for standalone usage
+ #
+ LZWStream.o: ../lib/common/LZWStream.c
+ 	$(RM) $@
+-	$(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DNO_XmHTML ../lib/common/LZWStream.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DNO_XmHTML ../lib/common/LZWStream.c
+ 
+ #
+ # XmHTML HTML Parser compiled for standalone usage
+ #
+ parse.o: ../lib/common/parse.c
+ 	$(RM) $@
+-	$(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DMINIPARSE ../lib/common/parse.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DMINIPARSE ../lib/common/parse.c
+ 
+ #
+ # All Targets
+@@ -76,29 +76,29 @@
+ 
+ reptype::  GetRepTypes.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) GetRepTypes.o $(LOADLIBES)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) GetRepTypes.o $(LOADLIBES)
+ 
+ wsize::  WidgetSize.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) WidgetSize.o
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) WidgetSize.o
+ 
+ gifinfo::  gifinfo.o ImBuffer.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) gifinfo.o ImBuffer.o
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) gifinfo.o ImBuffer.o
  
  httpget::  httpget.o
  	$(RM) $@ \ 
 -	$(CC) -o $@ $(LDFLAGS) httpget.o -L../http -lhttp $(DMALLOCLIB)
-+	$(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
  
  # gif to gzf converter
  gif2gzf:: gif2gzf.o LZWStream.o ImBuffer.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) gif2gzf.o LZWStream.o ImBuffer.o $(ZLIBLIB)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) gif2gzf.o LZWStream.o ImBuffer.o $(ZLIBLIB)
+ 
+ # stand alone parser
+ HTMLparse:: parse.o miniparse.o
+ 	$(RM) $@
+-	$(CC) -o $@ $(LDFLAGS) parse.o miniparse.o
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) parse.o miniparse.o
+ 
+ depend:: $(SRCS) 
+ 	$(MAKEDEPEND) $(INCLUDES) $(CPPFLAGS) -DMINIPARSE -DNO_XmHTML $(SRCS)
diff --git a/x11-toolkits/xmhtml/files/patch-ag b/x11-toolkits/xmhtml/files/patch-ag
index 214052ee4d2..6ad0f27833b 100644
--- a/x11-toolkits/xmhtml/files/patch-ag
+++ b/x11-toolkits/xmhtml/files/patch-ag
@@ -1,19 +1,11 @@
-*** XmHTML.cf~	Thu Oct  8 23:50:32 1998
---- XmHTML.cf	Sat Aug  5 14:32:52 2000
-***************
-*** 61,67 ****
-  
-  #define IHaveJPEG YES
-  JPEGINC =
-! JPEGLIB = -ljpeg
-  
-  XCOMM PNG Support. Enabled by default.
-  XCOMM You require libpng, version 0.96 or above. If you don't have this lib
---- 61,67 ----
-  
-  #define IHaveJPEG YES
-  JPEGINC =
-! JPEGLIB = -L${LOCALBASE}/lib -ljpeg
-  
-  XCOMM PNG Support. Enabled by default.
-  XCOMM You require libpng, version 0.96 or above. If you don't have this lib
+--- XmHTML.cf.orig	1998-10-08 16:50:32.000000000 -0500
++++ XmHTML.cf	2009-07-12 10:57:05.000000000 -0500
+@@ -61,7 +61,7 @@
+ 
+ #define IHaveJPEG YES
+ JPEGINC =
+-JPEGLIB = -ljpeg
++JPEGLIB = -L${LOCALBASE}/lib -ljpeg
+ 
+ XCOMM PNG Support. Enabled by default.
+ XCOMM You require libpng, version 0.96 or above. If you don't have this lib
diff --git a/x11-toolkits/xmhtml/files/patch-ah b/x11-toolkits/xmhtml/files/patch-ah
index b70efb80f5c..cffff2e4df6 100644
--- a/x11-toolkits/xmhtml/files/patch-ah
+++ b/x11-toolkits/xmhtml/files/patch-ah
@@ -1,19 +1,52 @@
-*** book/Makefile.org	Wed Dec 23 04:58:46 1998
---- book/Makefile	Sat Aug  5 18:08:51 2000
-***************
-*** 12,18 ****
-  
-  # The library
-  XMHTMLINC= -I../lib
-! XMHTMLLIB= -L../lib -lXmHTML
-  LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
-  
-  # rule to create .o files from .c files 
---- 12,18 ----
-  
-  # The library
-  XMHTMLINC= -I../lib
-! XMHTMLLIB= ../lib/libXmHTML.la
-  LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
-  
-  # rule to create .o files from .c files 
+--- book/Makefile.orig	1999-02-03 18:43:27.000000000 -0600
++++ book/Makefile	2009-07-12 11:11:05.000000000 -0500
+@@ -12,13 +12,13 @@
+ 
+ # The library
+ XMHTMLINC= -I../lib
+-XMHTMLLIB= -L../lib -lXmHTML
++XMHTMLLIB= ../lib/libXmHTML.la
+ LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
+ 
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
+ 
+ all: $(EXAMPLES)
+ 
+@@ -26,27 +26,27 @@
+ 
+ simple_html::  ../src/libXmHTML.a simple_html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
+ 
+ simple_html2::  ../src/libXmHTML.a simple_html2.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
+ 
+ autosize_html::  ../src/libXmHTML.a autosize_html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
+ 
+ forced_html::  ../src/libXmHTML.a forced_html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
+ 
+ html::  ../src/libXmHTML.a html.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
+ 
+ html_browser::  ../src/libXmHTML.a html_browser.o
+ 	$(RM) $@ \ 
+-	$(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
+ 
+ .PHONY: ../src/libXmHTML.a 
+ 
diff --git a/x11-toolkits/xmhtml/files/patch-lib_Motif_Makefile b/x11-toolkits/xmhtml/files/patch-lib_Motif_Makefile
new file mode 100644
index 00000000000..6a52d19b8d7
--- /dev/null
+++ b/x11-toolkits/xmhtml/files/patch-lib_Motif_Makefile
@@ -0,0 +1,11 @@
+--- lib/Motif/Makefile.orig	2009-07-12 11:26:03.000000000 -0500
++++ lib/Motif/Makefile	2009-07-12 11:26:33.000000000 -0500
+@@ -50,7 +50,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ # targets to build
+ all: $(TARGET)
diff --git a/x11-toolkits/xmhtml/files/patch-lib_common_Makefile b/x11-toolkits/xmhtml/files/patch-lib_common_Makefile
new file mode 100644
index 00000000000..dd4a297be2b
--- /dev/null
+++ b/x11-toolkits/xmhtml/files/patch-lib_common_Makefile
@@ -0,0 +1,11 @@
+--- lib/common/Makefile.orig	2009-07-12 11:21:10.000000000 -0500
++++ lib/common/Makefile	2009-07-12 11:22:01.000000000 -0500
+@@ -56,7 +56,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ # targets to build
+ all: $(TARGET)
diff --git a/x11-toolkits/xmhtml/files/patch-lib_gtk_Makefile b/x11-toolkits/xmhtml/files/patch-lib_gtk_Makefile
new file mode 100644
index 00000000000..4753421365d
--- /dev/null
+++ b/x11-toolkits/xmhtml/files/patch-lib_gtk_Makefile
@@ -0,0 +1,11 @@
+--- lib/gtk/Makefile.orig	2009-07-12 11:27:47.000000000 -0500
++++ lib/gtk/Makefile	2009-07-12 11:28:09.000000000 -0500
+@@ -50,7 +50,7 @@
+ # rule to create .o files from .c files 
+ .c.o:
+ 	$(RM) $@
+-	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
+ 
+ # targets to build
+ all: $(TARGET)