[gtk-list] Bugs in makefiles

[Elliot Lee <sopwith redhat com>]

Not sure who to send this patch (after .sig) to, but it allows people to
build gimp & gtk on their system if they don't already have
-lgdk/-lgtk/-lgdk on their library search path (i.e. anyone compiling gimp
for the first time). 

Note that this changes the libtool scripts, which for some reason refuse
to take a relative -L specification (this should be fine, as opposed to a
relative -rpath specification). Another way to solve the problem would be
to properly set up $(top_builddir) in $(top_srcdir)/configure, and then
specify the -L paths using that. 

Hope this helps,
-- Elliot		http://www.redhat.com/
UNIX is easy to use.
UNIX is not necessarily easy to learn.
Learn the difference.

--- gimp-0.99.9/libgimp/Makefile.in.root	Sun May 11 02:54:11 1997
+++ gimp-0.99.9/libgimp/Makefile.in	Sun May 11 02:54:37 1997
@@ -90,8 +90,8 @@
 			gimpmenu.h	\
 			gimpui.h
 
-libgimp_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) -lglib
-libgimpui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) -lgtk
+libgimp_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) -L../gtk+/glib/.libs -lglib
+libgimpui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) -L../gtk+/gtk/.libs -lgtk
 
 INCLUDES = \
 	-I$(top_srcdir)/gtk+	\
--- gimp-0.99.9/gtk+/gdk/Makefile.in.root	Sun May 11 02:53:07 1997
+++ gimp-0.99.9/gtk+/gdk/Makefile.in	Sun May 11 02:53:33 1997
@@ -83,7 +83,7 @@
 	gdktypes.h	\
 	gdkx.h
 
-libgdk_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) @x_ldflags@ @x_libs@ -lglib
+libgdk_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) @x_ldflags@ @x_libs@ -L../glib/.libs -lglib
 
 INCLUDES = @x_cflags@ -I$(top_srcdir)
 
--- gimp-0.99.9/gtk+/gtk/Makefile.in.root	Sun May 11 02:53:43 1997
+++ gimp-0.99.9/gtk+/gtk/Makefile.in	Sun May 11 02:54:04 1997
@@ -202,7 +202,7 @@
 	gtkwidget.h		\
 	gtkwindow.h
 
-libgtk_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) -lgdk
+libgtk_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) -L../gdk/.libs -lgdk
 
 EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
 INCLUDES = @x_cflags@ -I$(top_srcdir)
--- gimp-0.99.9/gtk+/glib/ltmain.sh.root	Sun May 11 03:05:22 1997
+++ gimp-0.99.9/gtk+/glib/ltmain.sh	Sun May 11 03:05:29 1997
@@ -336,7 +336,7 @@
       -L*)
 	dir=`echo "$arg" | sed 's%^-L\(.*\)$%\1%'`
 	case "$dir" in
-	*)
+	/*)
 	  ;;
 	*)
 	  echo "$progname: \`-L$dir' cannot specify a relative directory" 1>&2
--- gimp-0.99.9/gtk+/ltmain.sh.root	Sun May 11 03:04:58 1997
+++ gimp-0.99.9/gtk+/ltmain.sh	Sun May 11 03:01:09 1997
@@ -336,7 +336,7 @@
       -L*)
 	dir=`echo "$arg" | sed 's%^-L\(.*\)$%\1%'`
 	case "$dir" in
-	/*)
+	*)
 	  ;;
 	*)
 	  echo "$progname: \`-L$dir' cannot specify a relative directory" 1>&2
--- gimp-0.99.9/ltmain.sh.root	Sun May 11 03:04:44 1997
+++ gimp-0.99.9/ltmain.sh	Sun May 11 03:02:04 1997
@@ -336,7 +336,7 @@
       -L*)
 	dir=`echo "$arg" | sed 's%^-L\(.*\)$%\1%'`
 	case "$dir" in
-	/*)
+	*)
 	  ;;
 	*)
 	  echo "$progname: \`-L$dir' cannot specify a relative directory" 1>&2

--
To unsubscribe: mail -s unsubscribe gtk-list-request@redhat.com < /dev/null