* Re: [rfa] Regenerate Makefile.in to fix tix omission
@ 2003-03-14 19:26 Michael Elizabeth Chastain
2003-03-14 19:30 ` DJ Delorie
0 siblings, 1 reply; 5+ messages in thread
From: Michael Elizabeth Chastain @ 2003-03-14 19:26 UTC (permalink / raw)
To: dj; +Cc: binutils, gdb-patches, hunt, neroden
I don't have the ability to commit to the gcc repository.
Could DJ or Nathanael commit this patch to gcc?
Or just regenerate Makefile.in with 'autogen Makefile.def',
which is all that I did.
Michael C
===
2003-03-14 Michael Chastain <mec@shout.net>
* Makefile.in: Regenerate with correct Makefile.def.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/Makefile.in,v
retrieving revision 1.120
diff -u -r1.120 Makefile.in
--- Makefile.in 12 Mar 2003 20:47:07 -0000 1.120
+++ Makefile.in 14 Mar 2003 16:31:47 -0000
@@ -641,7 +641,8 @@
clean-gdb \
clean-expect \
clean-guile \
- clean-tk
+ clean-tk \
+ clean-tix
# The target built for a native build.
# This list only includes modules actually being configured and built.
@@ -5402,6 +5403,73 @@
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+
+
+.PHONY: configure-tix maybe-configure-tix
+maybe-configure-tix:
+configure-tix:
+ @test ! -f tix/Makefile || exit 0; \
+ [ -d tix ] || mkdir tix; \
+ r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ CC="$(CC)"; export CC; \
+ CFLAGS="$(CFLAGS)"; export CFLAGS; \
+ CXX="$(CXX)"; export CXX; \
+ CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+ if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
+ AR="$(AR)"; export AR; \
+ AS="$(AS)"; export AS; \
+ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
+ DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+ LD="$(LD)"; export LD; \
+ NM="$(NM)"; export NM; \
+ RANLIB="$(RANLIB)"; export RANLIB; \
+ WINDRES="$(WINDRES)"; export WINDRES; \
+ OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
+ OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+ fi; \
+ echo Configuring in tix; \
+ cd tix || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/tix"; \
+ libsrcdir="$$s/tix";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/tix"; \
+ libsrcdir="$$s/tix";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ || exit 1
+
+.PHONY: all-tix maybe-all-tix
+maybe-all-tix:
+all-tix: configure-tix
+ @r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ $(SET_LIB_PATH) \
+ (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+
+
+.PHONY: check-tix
+check-tix:
+ @r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ $(SET_LIB_PATH) \
+ (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+
+
+
+.PHONY: install-tix maybe-install-tix
+maybe-install-tix:
+install-tix: installdirs
+ @r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ $(SET_LIB_PATH) \
+ (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
.PHONY: configure-libtermcap maybe-configure-libtermcap
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [rfa] Regenerate Makefile.in to fix tix omission
2003-03-14 19:26 [rfa] Regenerate Makefile.in to fix tix omission Michael Elizabeth Chastain
@ 2003-03-14 19:30 ` DJ Delorie
0 siblings, 0 replies; 5+ messages in thread
From: DJ Delorie @ 2003-03-14 19:30 UTC (permalink / raw)
To: mec; +Cc: binutils, gdb-patches, hunt, neroden
> I don't have the ability to commit to the gcc repository.
> Could DJ or Nathanael commit this patch to gcc?
Already done.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [rfa] Regenerate Makefile.in to fix tix omission
2003-03-14 16:42 Michael Elizabeth Chastain
2003-03-14 17:02 ` DJ Delorie
@ 2003-03-14 19:36 ` Nathanael Nerode
1 sibling, 0 replies; 5+ messages in thread
From: Nathanael Nerode @ 2003-03-14 19:36 UTC (permalink / raw)
To: Michael Elizabeth Chastain; +Cc: binutils, gdb-patches, gcc-patches
Michael Elizabeth Chastain wrote:
> The version of Makefile.in currently in CVS was generated from a
> Makefile.def that is not in CVS, and it does not work properly:
> 'make install' fails with missing goal on 'maybe-install-tix'.
>
> This patch regenerates Makefile.in from Makefile.tpl and Makefile.def.
> Glitches happen, this is just a cleanup patch for a glitch.
Thank you very much and sorry for allowing the glitched copy to get in.
I try to clean my tree and 'repatch' before committing, but clearly I
messed up.
--Nathanael
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [rfa] Regenerate Makefile.in to fix tix omission
2003-03-14 16:42 Michael Elizabeth Chastain
@ 2003-03-14 17:02 ` DJ Delorie
2003-03-14 19:36 ` Nathanael Nerode
1 sibling, 0 replies; 5+ messages in thread
From: DJ Delorie @ 2003-03-14 17:02 UTC (permalink / raw)
To: mec; +Cc: binutils, gdb-patches, hunt, neroden
> OK to commit?
Yes. Please commit to both gcc and src.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [rfa] Regenerate Makefile.in to fix tix omission
@ 2003-03-14 16:42 Michael Elizabeth Chastain
2003-03-14 17:02 ` DJ Delorie
2003-03-14 19:36 ` Nathanael Nerode
0 siblings, 2 replies; 5+ messages in thread
From: Michael Elizabeth Chastain @ 2003-03-14 16:42 UTC (permalink / raw)
To: binutils, gdb-patches; +Cc: hunt, neroden
The version of Makefile.in currently in CVS was generated from a
Makefile.def that is not in CVS, and it does not work properly:
'make install' fails with missing goal on 'maybe-install-tix'.
This patch regenerates Makefile.in from Makefile.tpl and Makefile.def.
Glitches happen, this is just a cleanup patch for a glitch.
Testing: I tested this with 'make install' on native i686-pc-linux-gnu.
OK to commit?
Michael C
2003-03-14 Michael Chastain <mec@shout.net>
* Makefile.in: Regenerate with correct Makefile.def.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/Makefile.in,v
retrieving revision 1.120
diff -u -r1.120 Makefile.in
--- Makefile.in 12 Mar 2003 20:47:07 -0000 1.120
+++ Makefile.in 14 Mar 2003 16:31:47 -0000
@@ -641,7 +641,8 @@
clean-gdb \
clean-expect \
clean-guile \
- clean-tk
+ clean-tk \
+ clean-tix
# The target built for a native build.
# This list only includes modules actually being configured and built.
@@ -5402,6 +5403,73 @@
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+
+
+.PHONY: configure-tix maybe-configure-tix
+maybe-configure-tix:
+configure-tix:
+ @test ! -f tix/Makefile || exit 0; \
+ [ -d tix ] || mkdir tix; \
+ r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ CC="$(CC)"; export CC; \
+ CFLAGS="$(CFLAGS)"; export CFLAGS; \
+ CXX="$(CXX)"; export CXX; \
+ CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+ if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
+ AR="$(AR)"; export AR; \
+ AS="$(AS)"; export AS; \
+ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
+ DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+ LD="$(LD)"; export LD; \
+ NM="$(NM)"; export NM; \
+ RANLIB="$(RANLIB)"; export RANLIB; \
+ WINDRES="$(WINDRES)"; export WINDRES; \
+ OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
+ OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+ fi; \
+ echo Configuring in tix; \
+ cd tix || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/tix"; \
+ libsrcdir="$$s/tix";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/tix"; \
+ libsrcdir="$$s/tix";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ || exit 1
+
+.PHONY: all-tix maybe-all-tix
+maybe-all-tix:
+all-tix: configure-tix
+ @r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ $(SET_LIB_PATH) \
+ (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+
+
+.PHONY: check-tix
+check-tix:
+ @r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ $(SET_LIB_PATH) \
+ (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+
+
+
+.PHONY: install-tix maybe-install-tix
+maybe-install-tix:
+install-tix: installdirs
+ @r=`${PWD}`; export r; \
+ s=`cd $(srcdir); ${PWD}`; export s; \
+ $(SET_LIB_PATH) \
+ (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
.PHONY: configure-libtermcap maybe-configure-libtermcap
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2003-03-14 19:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-03-14 19:26 [rfa] Regenerate Makefile.in to fix tix omission Michael Elizabeth Chastain
2003-03-14 19:30 ` DJ Delorie
-- strict thread matches above, loose matches on Subject: below --
2003-03-14 16:42 Michael Elizabeth Chastain
2003-03-14 17:02 ` DJ Delorie
2003-03-14 19:36 ` Nathanael Nerode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).