commit 736082f2c07aec39311b8356e474f447c06abcd3
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Jul 21 14:21:57 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Thu Jul 21 14:21:57 2011 +0000
Don't use $^ in Makefiles, as it s a GNU make extension (thanks Jakub
Lach).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2354
---
data/Makefile.am | 4 ++--
src/Makefile.am | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index dccb51a3..05951cb0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,8 +14,8 @@ icons_DATA = @PROGRAM_PREFIX@doom.png \
@PROGRAM_PREFIX@setup.png
@PROGRAM_PREFIX@doom.png : doom.png
- cp $^ $@
+ cp $< $@
@PROGRAM_PREFIX@setup.png : setup.png
- cp $^ $@
+ cp $< $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 24c6e2b2..40be7787 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -187,26 +187,26 @@ appdir = $(prefix)/share/applications
app_DATA = @PROGRAM_PREFIX@doom.desktop
@PROGRAM_PREFIX@doom.desktop : doom.desktop
- cp $^ $@
+ cp $< $@
screensaverdir = $(prefix)/share/applications/screensavers
screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop
@PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop
- cp $^ $@
+ cp $< $@
.rc.o:
- $(WINDRES) $^ -o $@
+ $(WINDRES) $< -o $@
%.o : %.rc
- $(WINDRES) $^ -o $@
+ $(WINDRES) $< -o $@
if HAVE_PYTHON
icon.c : ../data/doom8.ico
- ../data/convert-icon $^ $@
+ ../data/convert-icon $< $@
endif
midiread : midifile.c
- $(CC) -DTEST $(CFLAGS) @LDFLAGS@ $^ -o $@
+ $(CC) -DTEST $(CFLAGS) @LDFLAGS@ $< -o $@