Small Makefile updates.

committer: mfx <mfx> 1138080320 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2006-01-24 05:25:20 +00:00
parent 4ecfff4d8d
commit 9c0f1b02a7
2 changed files with 9 additions and 7 deletions

View File

@ -1,6 +1,8 @@
# Toplevel Makefile for UPX # Toplevel Makefile for UPX
SHELL = /bin/sh MAKEFLAGS += -rR
.SUFFIXES:
export SHELL = /bin/sh
srcdir = . srcdir = .
top_srcdir = . top_srcdir = .
@ -19,20 +21,20 @@ dist: distclean
false false
ifneq ($(wildcard CVS/R*),)
CVS_ROOT := $(shell cat CVS/Root) CVS_ROOT := $(shell cat CVS/Root)
CVS_REPO := $(shell cat CVS/Repository) CVS_REPO := $(shell cat CVS/Repository)
endif
cvs-info: cvs-info:
@echo 'CVS info: $(CVS_ROOT) $(CVS_REPO)'; false @echo 'CVS info: $(CVS_ROOT) $(CVS_REPO)'
cvs-admin-ko: cvs-admin-ko:
cvs admin -ko . cvs admin -ko .
cvs -q -z6 update -P -d cvs -q -z6 update -P -d
# automatically generate ChangeLog from CVS # automatically generate ChangeLog from CVS
ChangeLog: ChangeLog.cvs ChangeLog ChangeLog.cvs:
ChangeLog.cvs:
perl $(srcdir)/scripts/cvs2cl.pl --utc -f ChangeLog.cvs perl $(srcdir)/scripts/cvs2cl.pl --utc -f ChangeLog.cvs

View File

@ -2,9 +2,9 @@
# UPX Makefile - needs GNU make 3.80 or better # UPX Makefile - needs GNU make 3.80 or better
# #
SHELL = /bin/sh
.SUFFIXES:
MAKEFLAGS += -rR MAKEFLAGS += -rR
.SUFFIXES:
export SHELL = /bin/sh
override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1) override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1)
srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))