This is the mail archive of the insight@sources.redhat.com mailing list for the Insight project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Re: PATCH: Remove unused ITCL_DIR variable in libgui config.

To: insight at sources dot redhat dot com
Subject: Re: PATCH: Remove unused ITCL_DIR variable in libgui config.
From: Mo DeJong <mdejong at cygnus dot com>
Date: Mon, 6 Aug 2001 15:03:37 -0700 (PDT)
On Mon, 6 Aug 2001, Keith Seitz wrote:

> On Mon, 6 Aug 2001, Mo DeJong wrote:
> 
> > Here is the ChangeLog entry that implements the change
> > along with the patch for configure.in:
> 
> This seems harmless enough. I'll assume you've done rebuilt insight and
> found no problems.

Yup.
 
> > 2001-08-06  Mo DeJong  <mdejong@redhat.com>
> >
> >         * Makefile.in: Regen.
> >         * configure: Regen.
> >         * configure.in: Remove unused ITCL_DIR variable.
> >         * library/Makefile.in: Regen.
> >         * src/Makefile.in: Regen.
> 
> Approved.
> 
> > Does anyone know what version of automake should be used to
> > regen for code on sources.redhat.com? Should the maintainer-tools
> > module be used? Some of the current configure scripts seem to
> > have been generated by autoconf 2.13 which is why I ask.
> 
> I've been using 2.13... Maybe someone in the know will chime in.
> 
> Keith

Here is the problem I am running into. While working on the
last patch, I noticed that I neglected to run automake after
fixing the AR cross compiling problems. It looks like the
existing Makefile.in's were created with the maintainer-tool
versions of autoconf and automake.

Here is a diff of the maintainer-tools generated Makefiles.


2001-08-06  Mo DeJong  <mdejong@redhat.com>

	* Makefile.in:
	* library/Makefile.in:
	* src/Makefile.in:
	Regenerate Makefiles to account for AR fix
	on 2001-08-03.


Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/libgui/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- Makefile.in	2000/06/27 21:53:32	1.2
+++ Makefile.in	2001/08/06 21:50:08
@@ -59,6 +59,7 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AR = @AR@
 BFDHDIR = @BFDHDIR@
 BFDLIB = @BFDLIB@
 CC = @CC@
@@ -154,7 +155,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
Index: library/Makefile.in
===================================================================
RCS file: /cvs/src/src/libgui/library/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- Makefile.in	2000/07/13 00:00:27	1.4
+++ Makefile.in	2001/08/06 21:50:08
@@ -59,6 +59,7 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AR = @AR@
 BFDHDIR = @BFDHDIR@
 BFDLIB = @BFDLIB@
 CC = @CC@
@@ -174,7 +175,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
Index: src/Makefile.in
===================================================================
RCS file: /cvs/src/src/libgui/src/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- Makefile.in	2000/07/13 00:00:27	1.4
+++ Makefile.in	2001/08/06 21:50:08
@@ -60,6 +60,7 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AR = @AR@
 BFDHDIR = @BFDHDIR@
 BFDLIB = @BFDLIB@
 CC = @CC@
@@ -198,7 +199,6 @@
 tkTableCmd.$(OBJEXT) tkTableCell.$(OBJEXT) tkTableTag.$(OBJEXT) \
 tkTableWin.$(OBJEXT) tkWinPrintText.$(OBJEXT) \
 tkWinPrintCanvas.$(OBJEXT) tkWarpPointer.$(OBJEXT)
-AR = ar
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -210,7 +210,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libgui_a_SOURCES)
 OBJECTS = $(libgui_a_OBJECTS)




And here is the diff that gets created when using automake 1.4.


Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/libgui/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- Makefile.in	2000/06/27 21:53:32	1.2
+++ Makefile.in	2001/08/06 21:50:40
@@ -59,6 +59,7 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AR = @AR@
 BFDHDIR = @BFDHDIR@
 BFDLIB = @BFDLIB@
 CC = @CC@
@@ -154,7 +155,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
Index: library/Makefile.in
===================================================================
RCS file: /cvs/src/src/libgui/library/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- Makefile.in	2000/07/13 00:00:27	1.4
+++ Makefile.in	2001/08/06 21:50:40
@@ -59,6 +59,7 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AR = @AR@
 BFDHDIR = @BFDHDIR@
 BFDLIB = @BFDLIB@
 CC = @CC@
@@ -143,25 +144,19 @@
 
 AUTOMAKE_OPTIONS = cygnus
 
-TCL = advice.tcl balloon.tcl bbox.tcl bgerror.tcl bindings.tcl \
-canvas.tcl cframe.tcl center.tcl debug.tcl def.tcl internet.tcl	\
-font.tcl gensym.tcl gettext.tcl hooks.tcl lframe.tcl list.tcl \
-looknfeel.tcl menu.tcl mono.tcl multibox.tcl parse_args.tcl path.tcl \
-postghost.tcl prefs.tcl print.tcl sendpr.tcl topbind.tcl toolbar.tcl \
-ulset.tcl wframe.tcl wingrab.tcl ventry.tcl combobox.tcl \
-pane.tcl panedwindow.tcl
+TCL = advice.tcl balloon.tcl bbox.tcl bgerror.tcl bindings.tcl 
canvas.tcl cframe.tcl center.tcl debug.tcl def.tcl internet.tcl	font.tcl 
gensym.tcl gettext.tcl hooks.tcl lframe.tcl list.tcl looknfeel.tcl 
menu.tcl mono.tcl multibox.tcl parse_args.tcl path.tcl postghost.tcl 
prefs.tcl print.tcl sendpr.tcl topbind.tcl toolbar.tcl ulset.tcl 
wframe.tcl wingrab.tcl ventry.tcl combobox.tcl pane.tcl panedwindow.tcl
 
 
 PACKAGES = combobox.tcl
 
 guidir = $(datadir)/cygnus/gui
 gui_DATA = tclIndex pkgIndex.tcl $(TCL) $(PACKAGES)
-@TCL_SHARED_TRUE@SET_LIB_PATH = 
@TCL_SHARED_TRUE@$(RPATH_ENVVAR)=$$here/../../tcl/unix:$$here/../../itcl/itcl/unix:$$$(RPATH_ENVVAR); export $(RPATH_ENVVAR);
+@TCL_SHARED_TRUE@SET_LIB_PATH = 
$(RPATH_ENVVAR)=$$here/../../tcl/unix:$$here/../../itcl/itcl/unix:$$$(RPATH_ENVVAR); export $(RPATH_ENVVAR);
 @TCL_SHARED_FALSE@SET_LIB_PATH = 
 
 WISH = wish
-@CROSS_COMPILING_TRUE@ITCL_SH = @CROSS_COMPILING_TRUE@itclsh3.0
-@CROSS_COMPILING_FALSE@ITCL_SH = @CROSS_COMPILING_FALSE@@ITCL_SH@
+@CROSS_COMPILING_TRUE@ITCL_SH = itclsh3.0
+@CROSS_COMPILING_FALSE@ITCL_SH = @ITCL_SH@
 
 ETAGS_ARGS = --lang=none --regex='/[ \t]*\(proc\|method\|itcl_class\)[ 
\t]+\([^ \t]+\)/\1/' $(TCL) --lang=auto
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
@@ -174,7 +169,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
Index: src/Makefile.in
===================================================================
RCS file: /cvs/src/src/libgui/src/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- Makefile.in	2000/07/13 00:00:27	1.4
+++ Makefile.in	2001/08/06 21:50:40
@@ -60,6 +60,7 @@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AR = @AR@
 BFDHDIR = @BFDHDIR@
 BFDLIB = @BFDLIB@
 CC = @CC@
@@ -146,8 +147,7 @@
 
 noinst_LIBRARIES = libgui.a
 
-@INSTALL_LIBGUI_TRUE@include_HEADERS = @INSTALL_LIBGUI_TRUE@\
-@INSTALL_LIBGUI_TRUE@	guitcl.h subcommand.h
+@INSTALL_LIBGUI_TRUE@include_HEADERS = 	guitcl.h subcommand.h
 
 TBL_VERSION = 2.1
 
@@ -160,23 +160,11 @@
 
 LIBGUI_CFLAGS = @LIBGUI_CFLAGS@
 
-INCLUDES = $(LIBGUI_CFLAGS) $(TCLHDIR) \
-$(TKHDIR) \
-$(TK_XINCLUDES) $(TCL_DEFS) $(TK_DEFS) \
-$(TKHDIR)/../unix $(TKHDIR)/../win \
--DTBL_VERSION=\"$(TBL_VERSION)\"\
--DTBL_COMMAND=\"$(TBL_COMMAND)\"\
--DTCL_RUNTIME=\"tkTable.tcl\"
-
-
-libgui_a_SOURCES = guitcl.h paths.c subcommand.c subcommand.h \
-xpmlib.c tclmain.c tkGraphCanvas.c \
-tkCanvEdge.c tkCanvLayout.c tkCanvLayout.h tclhelp.c tclgetdir.c \
-tclwinprint.c tclsizebox.c tclshellexe.c tclmapi.c tclwinfont.c	\
-tclwingrab.c tclwinmode.c tclwinpath.c tclmsgbox.c tclcursor.c \
-tkTable.c tkTableCmd.c tkTableCell.c tkTableTag.c tkTableWin.c \
-tkWinPrintText.c tkWinPrintCanvas.c tkWarpPointer.c
+INCLUDES = $(LIBGUI_CFLAGS) $(TCLHDIR) $(TKHDIR) $(TK_XINCLUDES) 
$(TCL_DEFS) $(TK_DEFS) $(TKHDIR)/../unix $(TKHDIR)/../win 
-DTBL_VERSION=\"$(TBL_VERSION)\" -DTBL_COMMAND=\"$(TBL_COMMAND)\" 
-DTCL_RUNTIME=\"tkTable.tcl\"
 
+
+libgui_a_SOURCES = guitcl.h paths.c subcommand.c subcommand.h xpmlib.c 
tclmain.c tkGraphCanvas.c tkCanvEdge.c tkCanvLayout.c tkCanvLayout.h 
tclhelp.c tclgetdir.c tclwinprint.c tclsizebox.c tclshellexe.c tclmapi.c 
tclwinfont.c	tclwingrab.c tclwinmode.c tclwinpath.c tclmsgbox.c 
tclcursor.c tkTable.c tkTableCmd.c tkTableCell.c tkTableTag.c 
tkTableWin.c tkWinPrintText.c tkWinPrintCanvas.c tkWarpPointer.c
+
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -198,7 +186,6 @@
 tkTableCmd.$(OBJEXT) tkTableCell.$(OBJEXT) tkTableTag.$(OBJEXT) \
 tkTableWin.$(OBJEXT) tkWinPrintText.$(OBJEXT) \
 tkWinPrintCanvas.$(OBJEXT) tkWarpPointer.$(OBJEXT)
-AR = ar
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -210,7 +197,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libgui_a_SOURCES)
 OBJECTS = $(libgui_a_OBJECTS)


So, it looks to me like not using the maintainer-tools
versions of autoconf and automake is going to really
hose things up. If there are no objections, I would
like to regen the autoconf and automake files in
libgui with the maintainer-tools versions.

cheers
Mo DeJong
Red Hat Inc
References:
- Re: PATCH: Remove unused ITCL_DIR variable in libgui config.
  - From: Keith Seitz
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]