--- xforms-1.0.90/fd2ps/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.in	2006-01-02 15:18:01.000000000 -0600
@@ -115,7 +115,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/fd2ps/Makefile.am.prelink	2003-11-13 15:46:47.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.am	2006-01-02 15:18:10.000000000 -0600
@@ -16,7 +16,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/image/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/image/Makefile.in	2006-01-02 15:05:52.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/image/Makefile.am.prelink	2003-11-13 15:46:48.000000000 -0600
+++ xforms-1.0.90/image/Makefile.am	2006-01-02 15:05:50.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/gl/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.in	2006-01-02 15:04:24.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/gl/Makefile.am.prelink	2003-11-20 03:33:11.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.am	2006-01-02 15:04:20.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/demos/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.in	2006-01-02 15:07:41.000000000 -0600
@@ -206,7 +206,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -263,12 +263,12 @@
 
 gl_SOURCES = gl.c
 gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 glwin_SOURCES = glwin.c
 glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 goodies_SOURCES = goodies.c
@@ -276,7 +276,7 @@
 
 ibrowser_SOURCES = ibrowser.c
 ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -284,7 +284,7 @@
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -295,7 +295,7 @@
 
 itest_SOURCES = itest.c
 itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -304,7 +304,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -355,7 +355,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
--- xforms-1.0.90/demos/Makefile.am.prelink	2004-02-24 09:42:43.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.am	2006-01-02 15:19:03.000000000 -0600
@@ -105,7 +105,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -168,11 +168,11 @@
 
 gl_SOURCES = gl.c
 gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 glwin_SOURCES = glwin.c
 glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 goodies_SOURCES = goodies.c
 group_SOURCES = group.c
@@ -180,14 +180,14 @@
 ibrowser_SOURCES = ibrowser.c
 ibrowser.$(OBJEXT): fd/ibrowser_gui.c
 ibrowser_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 iconify_SOURCES = iconify.c
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 inputall_SOURCES = inputall.c
@@ -199,7 +199,7 @@
 itest_SOURCES = itest.c
 itest.$(OBJEXT): fd/is_gui.c
 itest_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 lalign_SOURCES = lalign.c
@@ -207,7 +207,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 longlabel_SOURCES = longlabel.c
@@ -260,7 +260,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 yesno_SOURCES = yesno.c
--- xforms-1.0.90/lib/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.in	2006-01-02 14:52:11.000000000 -0600
@@ -116,7 +116,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \
--- xforms-1.0.90/lib/Makefile.am.prelink	2003-11-20 03:33:16.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.am	2006-01-02 14:52:19.000000000 -0600
@@ -17,7 +17,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \