From 243027ecf1d6f984ef1efb1147c09b0aa813c57e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 2 Feb 1999 09:51:58 +0000 Subject: [PATCH] * automake.in (handle_merge_targets): Use INSTALL_STRIP_FLAG. * progs.am (install-@DIR@PROGRAMS): Added INSTALL_STRIP_FLAG. * header-vars.am (INSTALL_PROGRAM): Removed AM_INSTALL_PROGRAM_FLAGS. (INSTALL_STRIP_FLAG): New macro. --- ChangeLog | 6 ++++++ TODO | 3 +++ automake.in | 2 +- header-vars.am | 8 +++----- lib/am/header-vars.am | 8 +++----- lib/am/progs.am | 6 +++--- progs.am | 6 +++--- 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12bd9cd..3bd316e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 1999-02-02 Tom Tromey + * automake.in (handle_merge_targets): Use INSTALL_STRIP_FLAG. + * progs.am (install-@DIR@PROGRAMS): Added INSTALL_STRIP_FLAG. + * header-vars.am (INSTALL_PROGRAM): Removed + AM_INSTALL_PROGRAM_FLAGS. + (INSTALL_STRIP_FLAG): New macro. + * automake.in: Handle `ypp' as C++ yacc source and `lpp' as C++ lex source. (lang_yacc_finish): Likewise. diff --git a/TODO b/TODO index e327c05..9bbb513 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,9 @@ still won't put the file into the disty. This is wrong. From Mark H Wilkinson +* using "include" inside a conditional doesn't currently + work properly. + * AM_CONFIG_HEADER might generate the wrong stamp file names when given multiple headers. Write a test. diff --git a/automake.in b/automake.in index 08b7a17..5c04e83 100755 --- a/automake.in +++ b/automake.in @@ -3490,7 +3490,7 @@ sub handle_merge_targets # Generate the new 'install-strip' target. We can't just set # INSTALL_PROGRAM because that might be a relative path. $output_rules .= ("install-strip:\n\t" - . '$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install' + . '$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install' . "\n"); } diff --git a/header-vars.am b/header-vars.am index 1dd0813..84d2a06 100644 --- a/header-vars.am +++ b/header-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -52,12 +52,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -## We use AM_INSTALL_PROGRAM_FLAGS so that install-strip can pass -s -## easily. We can't just set INSTALL_PROGRAM because that might have -## a relative path. -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ ## These are defined because otherwise make on NetBSD V1.1 will print diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 1dd0813..84d2a06 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -52,12 +52,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -## We use AM_INSTALL_PROGRAM_FLAGS so that install-strip can pass -s -## easily. We can't just set INSTALL_PROGRAM because that might have -## a relative path. -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ ## These are defined because otherwise make on NetBSD V1.1 will print diff --git a/lib/am/progs.am b/lib/am/progs.am index 3a598c3..aefad80 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -25,8 +25,8 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. - echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done diff --git a/progs.am b/progs.am index 3a598c3..aefad80 100644 --- a/progs.am +++ b/progs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -25,8 +25,8 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. - echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done -- 2.7.4