From 14b478969763b156c50498570f768f50e7bb755c Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 3 Nov 2011 22:18:36 +0000 Subject: Remove use of $< in Makefiles, for compatibility with OpenBSD's make. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2473 --- data/Makefile.am | 4 ++-- setup/Makefile.am | 4 ++-- src/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 05951cb0..1fd4588c 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 doom.png $@ @PROGRAM_PREFIX@setup.png : setup.png - cp $< $@ + cp setup.png $@ diff --git a/setup/Makefile.am b/setup/Makefile.am index 37bea567..9263a3a8 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -40,7 +40,7 @@ appdir = $(prefix)/share/applications app_DATA = @PROGRAM_PREFIX@setup.desktop @PROGRAM_PREFIX@setup.desktop : setup.desktop - cp $^ $@ + cp setup.desktop $@ .rc.o: $(WINDRES) $^ -o $@ @@ -50,7 +50,7 @@ app_DATA = @PROGRAM_PREFIX@setup.desktop if HAVE_PYTHON setup_icon.c : ../data/setup8.ico - ../data/convert-icon $^ $@ + ../data/convert-icon ../data/setup8.ico $@ endif diff --git a/src/Makefile.am b/src/Makefile.am index 40be7787..62cf3544 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -187,13 +187,13 @@ appdir = $(prefix)/share/applications app_DATA = @PROGRAM_PREFIX@doom.desktop @PROGRAM_PREFIX@doom.desktop : doom.desktop - cp $< $@ + cp doom.desktop $@ screensaverdir = $(prefix)/share/applications/screensavers screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop @PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop - cp $< $@ + cp doom-screensaver.desktop $@ .rc.o: $(WINDRES) $< -o $@ -- cgit v1.2.3