summaryrefslogtreecommitdiff
path: root/lib/am/program.am
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>1997-08-25 23:25:10 +0000
committerTom Tromey <tromey@redhat.com>1997-08-25 23:25:10 +0000
commit3038064b644d5aed9bc7d87810670110ed2335d4 (patch)
tree88742bc4d38c4c17640bef9cc40f8ff7df693db8 /lib/am/program.am
parent4a1fc02ad1b25e8a317695e2951b86cc538b5af1 (diff)
downloadautomake-3038064b644d5aed9bc7d87810670110ed2335d4.tar.gz
merged changes from Cygnus
Diffstat (limited to 'lib/am/program.am')
-rw-r--r--lib/am/program.am15
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/am/program.am b/lib/am/program.am
index 91bf3652b..be5fb26d3 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 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
@@ -15,20 +15,11 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-@PROGRAM@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES)
+@PROGRAM@@EXEEXT@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES)
## Remove program before linking. Otherwise the link will fail if the
## program is running somewhere. FIXME: this could be a loss if
## you're using an incremental linker. Maybe we should think twice?
## Or maybe not... sadly, incremental linkers are rarer than losing
## systems.
-NOTCYGWIN @rm -f @PROGRAM@
-CYGWIN @rm -f @PROGRAM@$(EXEEXT)
+ @rm -f @PROGRAM@@EXEEXT@
$(@XLINK@) $(@XPROGRAM@_LDFLAGS) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS)
-## Why take such a funny approach to Cygwin32 executables? Why not
-## just rewrite this file to PROGRAM$(EXEEXT), and then rewrite
-## foo_PROGRAMS similarly? Because then EXTRA_PROGRAMS won't work
-## correctly -- every configure.in will have to know to add $(EXEEXT)
-## when putting a program name into a variable. By doing things this
-## way we can get Cygwin32 support by adding a single macro to
-## configure.in and then re-running automake.
-CYGWIN @test -z "$(EXEEXT)" || echo timestamp > @PROGRAM@