From f5c43f706abc8fc2fe015ea9bfc90fce5424f62e Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 2 Sep 2017 19:26:52 +0000 Subject: [PATCH] make: Replace some executables by absolute paths to improve performance Signed-off-by: Jan Lindemann --- make/autoconf.mk | 4 ++-- make/backup.mk | 2 +- make/bin.mk | 2 +- make/cleandirs.mk | 2 +- make/conf.mk | 2 +- make/contrib.mk | 2 +- make/crontab.mk | 2 +- make/dav.mk | 2 +- make/debugger.mk | 2 +- make/defs.mk | 33 +++++++++++++---------------- make/depend.mk | 2 +- make/dirs.mk | 4 ++-- make/dist.mk | 6 +++--- make/doc-rules.mk | 2 +- make/doxygen.mk | 2 +- make/dummy.mk | 2 +- make/fc-mod-cpp.mk | 4 ++-- make/flex-bison.mk | 4 ++-- make/gettext.mk | 6 +++--- make/htdocs.mk | 2 +- make/include.mk | 2 +- make/includes.mk | 2 +- make/install-files.mk | 2 +- make/isolinux.mk | 6 +++--- make/lib.mk | 12 +++++------ make/lilypond.mk | 2 +- make/linux-rpm-build.mk | 8 +++---- make/linux-rpm.mk | 4 ++-- make/lo.mk | 4 ++-- make/make.mk | 2 +- make/plugin-version.mk | 2 +- make/py-mod.mk | 2 +- make/python-cli.mk | 2 +- make/qt-pro.mk | 2 +- make/rpmdist.mk | 6 +++--- make/rules.mk | 44 +++++++++++++++++++-------------------- make/run.mk | 26 +++++++++++------------ make/scripts-targets.mk | 2 +- make/smart-selection.mk | 2 +- make/song.mk | 4 ++-- make/srcdist.mk | 2 +- make/std-tools.mk | 2 +- make/subdirs.mk | 4 ++-- make/suse-selection.mk | 2 +- make/svg.mk | 2 +- make/swig.mk | 8 ++++--- make/test-exe.mk | 2 +- make/tex.mk | 6 +++--- make/textest.mk | 2 +- make/topdir.mk | 8 +++---- make/upload-rules.mk | 2 +- make/upload.mk | 2 +- make/yapp.mk | 2 +- make/zip-windows-files.mk | 4 ++-- 54 files changed, 134 insertions(+), 137 deletions(-) diff --git a/make/autoconf.mk b/make/autoconf.mk index 17cb5766..9c23ad15 100644 --- a/make/autoconf.mk +++ b/make/autoconf.mk @@ -23,7 +23,7 @@ make_rpm_release: config $(AC_FILES) make_install: if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi confclean: - rm -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache + $(RM) -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache configure.ac: configure.ac.tmpl VERSION $(CAT) $< | $(SED) -e "s/_VERSION_/`$(CAT) VERSION | $(SED) 's/-dev//'`/" > $@ @@ -48,4 +48,4 @@ $(TOPDIR)/include/%.h: $(TOPDIR)/include/%.h.in config.status touch $@ acclean: - rm -f *.acdone + $(RM) -f *.acdone diff --git a/make/backup.mk b/make/backup.mk index f96bc80f..51a08355 100644 --- a/make/backup.mk +++ b/make/backup.mk @@ -8,5 +8,5 @@ backup: distclean tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2 purge-last-backup: - rm -f $(shell ls $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-*.tar.bz2 | tail -1) + $(RM) -f $(shell ls $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-*.tar.bz2 | tail -1) diff --git a/make/bin.mk b/make/bin.mk index 365a9234..490d4664 100644 --- a/make/bin.mk +++ b/make/bin.mk @@ -5,5 +5,5 @@ all install: clean distclean: - rm -f $(filter-out Makefile CVS debug release,$(wildcard *)) + $(RM) -f $(filter-out Makefile CVS debug release,$(wildcard *)) test: diff --git a/make/cleandirs.mk b/make/cleandirs.mk index ce242231..34a7e867 100644 --- a/make/cleandirs.mk +++ b/make/cleandirs.mk @@ -19,5 +19,5 @@ do.install: do.%: set -e; for d in $(SUBDIRS); do make -wC $$d $*; done - rm -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done + $(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done diff --git a/make/conf.mk b/make/conf.mk index 03005605..5bc0e948 100644 --- a/make/conf.mk +++ b/make/conf.mk @@ -7,7 +7,7 @@ install: install_CFG install_files_SYSCFG install_files_LOGROT install_files_CRO install_files_APACHE_CONF install_files_SYSTEMD install_INIT $(CONF_D) clean.conf: - rm -rf *.h *~ .*.swp *.done + $(RM) -rf *.h *~ .*.swp *.done ifneq ($(CONFIG_SUBDIR),) $(INSTALLED_CFG): $(INSTALL_CFGDIR) diff --git a/make/contrib.mk b/make/contrib.mk index 1ed3a663..151c3ac0 100644 --- a/make/contrib.mk +++ b/make/contrib.mk @@ -41,7 +41,7 @@ apply-patches.done: unpack.done $(LOCAL_PATCH_DONE) install: distclean: - rm -rf *.done *.patch $(CFG_WORKING_DIR) + $(RM) -rf *.done *.patch $(CFG_WORKING_DIR) unpack: unpack.done apply-patches: apply-patches.done diff --git a/make/crontab.mk b/make/crontab.mk index 4642094b..c93d472a 100644 --- a/make/crontab.mk +++ b/make/crontab.mk @@ -6,7 +6,7 @@ clean: clean.conf install: install_CFG install_files_SYSCFG install_files_LOGROT $(CONF_D) clean.conf: - rm -rf *.h *~ .*.swp *.done + $(RM) -rf *.h *~ .*.swp *.done ifneq ($(CONFIG_SUBDIR),) $(INSTALLED_CFG): $(INSTALL_CFGDIR) diff --git a/make/dav.mk b/make/dav.mk index ccfa5298..0807dd74 100644 --- a/make/dav.mk +++ b/make/dav.mk @@ -41,5 +41,5 @@ dload.done: touch $@ dav.clean: - rm -f upload.done dload.done + $(RM) -f upload.done dload.done diff --git a/make/debugger.mk b/make/debugger.mk index 1da16af2..7fc427af 100644 --- a/make/debugger.mk +++ b/make/debugger.mk @@ -73,6 +73,6 @@ centralcore: coreclean: centralcore-clean centralcore-clean: - rm -f /var/cores/core* /var/cores/vgcore* || exit 0 + $(RM) -f /var/cores/core* /var/cores/vgcore* || exit 0 echo-pid: @echo PID = $(PID) diff --git a/make/defs.mk b/make/defs.mk index 5ced6810..562abf15 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -29,19 +29,23 @@ ifneq ($(wildcard pre-local.mk),) endif # ----- executables -SED = sed -CAT = /bin/cat +SED := /usr/bin/sed +CAT := /bin/cat SHELL ?= /bin/bash BROWSER ?= firefox +RM := /usr/bin/rm +AR = /usr/bin/ar +PWD := /usr/bin/pwd +BIN_INSTALL := /usr/bin/install # ----- standard variables CVSTOPDIR ?= $(CVS_PROJ_DIR)/.. ifeq ($(PROJECT),) - PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//'))) + PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); $(PWD) | $(SED) 's/.*\///; s/-[0-9].*//'))) endif -OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get-os.sh) +OS ?= $(shell /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh) CREATE_DEVEL ?= true #COMPILER_SUITE ?= clang @@ -112,7 +116,7 @@ CVS_RSH ?= /usr/bin/ssh # ----- input dirs JW_BUILD_DIR = $(MODDIR) PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) -CVS_ROOT_DIR = $(shell test -d CVS && pwd | $(SED) -e "s%`$(CAT) CVS/Repository`%%; s%/$$%%") +CVS_ROOT_DIR = $(shell test -d CVS && $(PWD) | $(SED) -e "s%`$(CAT) CVS/Repository`%%; s%/$$%%") REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}') FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh IMAGE_DIR ?= $(CVS_ROOT_DIR)/images @@ -161,7 +165,7 @@ endif JANWARE_USER ?= $(shell id -un) JANWARE_CLIENT ?= jw JANWARE_WIKI ?= $(JANWARE_CLIENT) -JANWARE_URL_DOC_MODULE ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell pwd)) +JANWARE_URL_DOC_MODULE ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell $(PWD))) JANWARE_URL_DOC_PROJECT ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(PROJECT) PKG_VENDOR ?= janware GmbH @@ -476,7 +480,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI)) INSTALLATION_FILE_TYPES += HTML BUILD_HTMLDIR = $(TOPDIR)/htdocs LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(IMAGES)) -HTML_SUBDIR ?= $(shell pwd | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%') +HTML_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%') ifeq ($(HTML_SUBDIR),) INSTALL_HTMLDIR = $(PROJECT_HTMLDIR) else @@ -488,7 +492,7 @@ INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML)) INSTALLATION_FILE_TYPES += TMPL BUILD_TMPLDIR = $(TOPDIR)/tmpl LOCAL_TMPL += $(filter-out $(DONT_INSTALL) Makefile,$(wildcard *.tmpl)) -TMPL_SUBDIR ?= $(shell pwd | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%') +TMPL_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%') ifeq ($(TMPL_SUBDIR),) INSTALL_TMPLDIR = $(PROJECT_TMPLDIR) else @@ -680,8 +684,6 @@ endif # do a conditional include of timer headers, yet GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh -RM = rm -AR = ar PKG_SH_EXE = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh LOG_INSTALL_SH = $(PKG_SH_EXE) log-install @@ -741,7 +743,7 @@ else endif define install_links - cwd=`pwd`; \ + cwd=`$(PWD)`; \ echo "o in $(INSTALL_$(1)DIR):" ;\ for f in $(notdir $(INSTALLED_$(1))); do \ cd $(INSTALL_$(1)DIR); \ @@ -974,14 +976,7 @@ ifeq ($(STRIP_SYMBOLS),true) STRIP_DONE ?= strip.done endif -INCLUDE += $(LOCAL_INCLUDE) - -# force use of double quotes, allow header namespaces -ifeq ($(HDRDIR_SCOPE_SUFFIX),) - INCLUDE += -I. -else - INCLUDE += -iquote . -endif +INCLUDE += $(LOCAL_INCLUDE) -I. ifeq ($(USE_PROJECT_LIB),true) INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include diff --git a/make/depend.mk b/make/depend.mk index e0d86647..eea751bd 100644 --- a/make/depend.mk +++ b/make/depend.mk @@ -20,7 +20,7 @@ clean: depclean my_depclean # convenience targets dep: $(DEPEND_MK) my_depclean: - rm -f .*.dep.mk + $(RM) -f .*.dep.mk # rules $(DEPEND_MK): $(PREREQ_DONE) diff --git a/make/dirs.mk b/make/dirs.mk index 92fa5761..f8adf093 100644 --- a/make/dirs.mk +++ b/make/dirs.mk @@ -96,10 +96,10 @@ endif dirs.clean: set -e; for d in $(call reverse,$(SUBDIRS)) ; do make -wC $$d clean; done - rm -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done + $(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done dirs.distclean: set -e; for d in $(call reverse,$(SUBDIRS)) ; do make -wC $$d distclean; done - rm -rf $(DISTCLEAN) + $(RM) -rf $(DISTCLEAN) endif # SUBDIRS_TO_ITERATE diff --git a/make/dist.mk b/make/dist.mk index ab3826e3..2d261425 100644 --- a/make/dist.mk +++ b/make/dist.mk @@ -25,7 +25,7 @@ SSI_PREFIX = $(TMPHTML)/ssi_download_ $(TMPHTML): mkdir -p $(TMPHTML) - test -d $(TMPHTML) && rm -rf $(TMPHTML)/* + test -d $(TMPHTML) && $(RM) -rf $(TMPHTML)/* $(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL) @@ -47,13 +47,13 @@ $(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL) " > $@ remove_dist: - rm -rf $(DISTDIR) + $(RM) -rf $(DISTDIR) distclean: remove_dist $(DIST_FILE): distclean mkdir -p $(DISTDIR)/src/$(PROJECT) mkdir -p $(DISTDIR)/pckg - rm -rf $(DISTDIR)/src/$(PROJECT)/* + $(RM) -rf $(DISTDIR)/src/$(PROJECT)/* mkdir -p $(DISTDIR)/src/$(PROJECT)/mod cd $(TOPDIR); find . -type f | \ grep -ve 'CVS\|contrib/nomake\|tar.gz\|/dist/\|experimental' | \ diff --git a/make/doc-rules.mk b/make/doc-rules.mk index 06b6b312..f8c6dbb8 100644 --- a/make/doc-rules.mk +++ b/make/doc-rules.mk @@ -9,6 +9,6 @@ clean: doc.clean distclean: doc.clean: - rm -rf *~ .*.swp + $(RM) -rf *~ .*.swp diff --git a/make/doxygen.mk b/make/doxygen.mk index 656e7e83..266f0a75 100644 --- a/make/doxygen.mk +++ b/make/doxygen.mk @@ -65,7 +65,7 @@ upload.done: doxygen.done cpfiles.done upload.sh $(DX_OUTPUT_DIR)/ $(UPLOAD_URL) clean.doxygen: - rm -rf $(DX_OUTPUT_DIR) *.done $(DX_UNTEMPLATED) $(DX_INCLUDE) *.bak default-* doxygen.conf + $(RM) -rf $(DX_OUTPUT_DIR) *.done $(DX_UNTEMPLATED) $(DX_INCLUDE) *.bak default-* doxygen.conf inst-dir.done: $(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR) diff --git a/make/dummy.mk b/make/dummy.mk index 2dd12bfa..c031f5f4 100644 --- a/make/dummy.mk +++ b/make/dummy.mk @@ -7,7 +7,7 @@ include $(MODDIR)/make/defs.mk all: clean: - rm -rf *~ .*.swp + $(RM) -rf *~ .*.swp install: # nothing to be done all: # nothing to be done distclean: clean diff --git a/make/fc-mod-cpp.mk b/make/fc-mod-cpp.mk index a910d8b1..b7b75a7d 100644 --- a/make/fc-mod-cpp.mk +++ b/make/fc-mod-cpp.mk @@ -50,10 +50,10 @@ $(FC_MODULE): $(FC_OBJ) $(LD) -shared $(BUILD_LDFLAGS) $^ -o $@ clean.generated: - rm -f $(FC_GENERATED) + $(RM) -f $(FC_GENERATED) clean.local: - rm -f $(FC_MODULE) *.o *.done + $(RM) -f $(FC_MODULE) *.o *.done create-dirs.done: $(INSTALL) -d -m $(LIBDIRMODE) -o $(LIBDIROWNER) -g $(LIBDIRGROUP) $(FC_INSTALL_DIRS) diff --git a/make/flex-bison.mk b/make/flex-bison.mk index 4977e75f..0cbc8c24 100644 --- a/make/flex-bison.mk +++ b/make/flex-bison.mk @@ -65,5 +65,5 @@ lex.%.$(FB_FLEX_OUT_EXT): %.l $(FB_BISON_OUT_C) # g++ -g -o $(FB_EXE) $^ -lfl clean.local: - rm -f $(FB_GENERATED_C) $(FB_HDRDIR)/*.tab.h $(FB_HDRDIR)/lex.*.h *.output $(FB_EXE) *.tmp $(FB_OBJ) *.rep $(FB_HDRDIR)/*.rep - rm -f graph-*.txt report-*.xml report-*.txt + $(RM) -f $(FB_GENERATED_C) $(FB_HDRDIR)/*.tab.h $(FB_HDRDIR)/lex.*.h *.output $(FB_EXE) *.tmp $(FB_OBJ) *.rep $(FB_HDRDIR)/*.rep + $(RM) -f graph-*.txt report-*.xml report-*.txt diff --git a/make/gettext.mk b/make/gettext.mk index 72143a32..ae5c7bd8 100644 --- a/make/gettext.mk +++ b/make/gettext.mk @@ -13,13 +13,13 @@ GETTEXT_KEYWORDS ?= htr ehtr all: $(GETTEXT_MO) clean: clean-mo - rm -rf *~ .*.swp + $(RM) -rf *~ .*.swp install: install_MO distclean: clean extract: $(GETTEXT_POT) clean-mo: - rm -f *.mo *.tmp + $(RM) -f *.mo *.tmp $(GETTEXT_POT): $(GETTEXT_INPUT_FILES) xgettext --from-code=utf-8 --package-name $(PROJECT) --package-version $(DIST_VERSION) \ @@ -59,7 +59,7 @@ clean: htr-tmp-clean htr: $(GETTEXT_TMP) htr-tmp-clean: - rm -f *.htr + $(RM) -f *.htr define copy_rule ./%.htr.tmp: $(1)/%.php diff --git a/make/htdocs.mk b/make/htdocs.mk index 7f4772fd..afb70f0a 100644 --- a/make/htdocs.mk +++ b/make/htdocs.mk @@ -15,4 +15,4 @@ test: mv $@.tmp $@ clean.lesscpy: - rm -f $(LESS_GENERATED_CSS) *.tmp + $(RM) -f $(LESS_GENERATED_CSS) *.tmp diff --git a/make/include.mk b/make/include.mk index 909204b1..30ec75e0 100644 --- a/make/include.mk +++ b/make/include.mk @@ -22,7 +22,7 @@ project-header: $(PROJ_H) # rules clean.include: - rm -rf *.h *~ .*.swp *.done $(PROJ_H) $(HDRDIR_SCOPE_SUFFIX) + $(RM) -rf *.h *~ .*.swp *.done $(PROJ_H) $(HDRDIR_SCOPE_SUFFIX) $(PROJ_H): $(filter-out $(PROJ_H) $(PROJECT)/$(PROJ_H),$(wildcard *.h $(PROJECT)/*.h)) echo "#ifndef _$(PROJECT_CAPNAME)_H" > $@.tmp diff --git a/make/includes.mk b/make/includes.mk index 9405dada..20356ad0 100644 --- a/make/includes.mk +++ b/make/includes.mk @@ -6,5 +6,5 @@ clean: clean.includes install: install_HDR clean.includes: - rm -rf *~ .*.swp *.done + $(RM) -rf *~ .*.swp *.done diff --git a/make/install-files.mk b/make/install-files.mk index 6b2f4946..fb86cbd9 100644 --- a/make/install-files.mk +++ b/make/install-files.mk @@ -16,7 +16,7 @@ clean: done.clean distclean: done.clean: - rm -f *.done + $(RM) -f *.done install.done: for f in $(SOURCE_FILES); do \ diff --git a/make/isolinux.mk b/make/isolinux.mk index 76b8e45d..84e3a989 100644 --- a/make/isolinux.mk +++ b/make/isolinux.mk @@ -30,9 +30,9 @@ distclean: clean # == rules syslinux.clean: - rm -rf *.done - rm -rf $(BUILD_DIR) $(UNPACK_DIR) - rm -f $(ISO_IMAGE) $(URL_FILE) $(URL_FILE).tmp + $(RM) -rf *.done + $(RM) -rf $(BUILD_DIR) $(UNPACK_DIR) + $(RM) -f $(ISO_IMAGE) $(URL_FILE) $(URL_FILE).tmp dirs.done: mkdir -p $(DIRS) diff --git a/make/lib.mk b/make/lib.mk index bfc55ec6..db7cda8a 100644 --- a/make/lib.mk +++ b/make/lib.mk @@ -30,23 +30,23 @@ endif clean.unix: ifneq ($(TARGET),mingw) - rm -rf *.so.* *.so st* + $(RM) -rf *.so.* *.so st* endif clean.mingw: ifeq ($(TARGET),mingw) - rm -rf *.dll *.def *.exp *.lib + $(RM) -rf *.dll *.def *.exp *.lib endif clean.all: - rm -rf *.a *.o *~ st* .*.swp *.done ld-*.conf version.ldscript + $(RM) -rf *.a *.o *~ st* .*.swp *.done ld-*.conf version.ldscript ld-%.conf: echo $(INSTALL_LIBDIR) > $@.tmp mv $@.tmp $@ clean.ld-conf: - rm -f $(LD_CONF) + $(RM) -f $(LD_CONF) echo.libs: @echo INSTALLED_LIB_SO = $(INSTALLED_LIB_SO) @@ -66,7 +66,7 @@ echo-contrib: echo.contrib-libs echo.libs # rules clean.contrib-libs: - rm -f $(CONTRIB_LIBS) + $(RM) -f $(CONTRIB_LIBS) define contrib_lib_search_rules %.dll: $(1)/%.dll @@ -81,7 +81,7 @@ echo.contrib-libs: ifeq ($(TARGET),mingw) clean.winres: - rm -f $(WINRES_RC) $(WINRES_O) *.tmp + $(RM) -f $(WINRES_RC) $(WINRES_O) *.tmp clean: clean.winres #%.o : %.rc diff --git a/make/lilypond.mk b/make/lilypond.mk index d5e60b89..5ecd2442 100644 --- a/make/lilypond.mk +++ b/make/lilypond.mk @@ -24,7 +24,7 @@ jackview: all lilypond $< clean.lilypond: - rm -f *.pdf *.ps *.done *.tmp *.midi + $(RM) -f *.pdf *.ps *.done *.tmp *.midi convert.done: set -e; for o in $(wildcard *.ly); do \ diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index 4412b5ba..3feb0df6 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -206,10 +206,10 @@ dist: clean tar -czf kernel.tar.gz `find kernel -maxdepth 1 -type f | grep -ve "setup\|trash\|CVS"` mv ../kernel.tar.gz . clean: - rm -rf $(KERNEL_BASE)-* - rm -rf install/* reiser.patch *~ *.done *.lxdone *.uldone *.patch *.diff *.rpm *.tar.gz *.tar \ + $(RM) -rf $(KERNEL_BASE)-* + $(RM) -rf install/* reiser.patch *~ *.done *.lxdone *.uldone *.patch *.diff *.rpm *.tar.gz *.tar \ $(SCOPE_DRIVER_BASE) - rm -rf linux linux-$(KERNEL_VERSION) CURRENT_* pax_global_header - rm -f toplevel-makefile EXTRAVERSION COMPLETE_VERSION + $(RM) -rf linux linux-$(KERNEL_VERSION) CURRENT_* pax_global_header + $(RM) -f toplevel-makefile EXTRAVERSION COMPLETE_VERSION distclean: clean diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 757fa1c5..06d5ba86 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -95,7 +95,7 @@ linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile cp $< $@ unpack.done: $(KERNEL_PKG) - rm -rf linux-$(KERNEL_VERSION) + $(RM) -rf linux-$(KERNEL_VERSION) ifeq ($(suffix $(KERNEL_PKG)),.gz) tar -xzf $(KERNEL_PKG) endif @@ -120,7 +120,7 @@ patch-%: make patches/$*-$(KERNEL_VERSION).patch clean-patch-%: - rm -f patches/$*-$(KERNEL_VERSION).patch + $(RM) -f patches/$*-$(KERNEL_VERSION).patch make patches/$*-$(KERNEL_VERSION).patch patches/%-$(KERNEL_VERSION).patch: diff --git a/make/lo.mk b/make/lo.mk index cb082b8e..05ed9af5 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -38,10 +38,10 @@ install: $(INSTALLED_LOADABLE_OBJ_LIBS) clean: clean.lo clean.generated: - rm -f $(patsubst $(CPP_PREFIX)%$(CPP_SUFFIX),%,$(notdir $(patsubst %.h,%.cpp,$(LOADABLE_OBJS_HEADER)))) + $(RM) -f $(patsubst $(CPP_PREFIX)%$(CPP_SUFFIX),%,$(notdir $(patsubst %.h,%.cpp,$(LOADABLE_OBJS_HEADER)))) clean.lo: profclean clean.generated - rm -f $(wildcard *.o *.so *.done *.dll $(OTHER_LIB)) + $(RM) -f $(wildcard *.o *.so *.done *.dll $(OTHER_LIB)) $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(CPP_PREFIX)%.o $(OTHER_LIB) $(CPP) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ diff --git a/make/make.mk b/make/make.mk index ec9120a7..c574df3b 100644 --- a/make/make.mk +++ b/make/make.mk @@ -67,6 +67,6 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D $(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG) clean.pkg-config: - rm -f *.pc $(BUILD_PKG_CONFIG) + $(RM) -f *.pc $(BUILD_PKG_CONFIG) diff --git a/make/plugin-version.mk b/make/plugin-version.mk index c3cb8f9d..4c52abe9 100644 --- a/make/plugin-version.mk +++ b/make/plugin-version.mk @@ -10,7 +10,7 @@ version.o: version.cpp $(CPP) $(BUILD_CPPFLAGS) -o $@ -c $< clean.local: - rm -f version.o + $(RM) -f version.o $(PLUGIN_VERSION_LIB): version.o ar r $@ $< diff --git a/make/py-mod.mk b/make/py-mod.mk index 7931c11b..dd097ac7 100644 --- a/make/py-mod.mk +++ b/make/py-mod.mk @@ -14,7 +14,7 @@ clean: py.clean distclean: py.clean: - rm -f *.done *.pyc + $(RM) -f *.done *.pyc /bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py install-dirs.done: diff --git a/make/python-cli.mk b/make/python-cli.mk index 1eae8a7d..93e07632 100644 --- a/make/python-cli.mk +++ b/make/python-cli.mk @@ -12,4 +12,4 @@ run: python -m $(shell echo $(patsubst %.py,%,$(EXE)) | sed 's%^\./%%; s%/%.%g') $(EXE_ARGS) pyc.clean: - find . -name '*.pyc' -print0 | xargs -r -0 rm -f + find . -name '*.pyc' -print0 | xargs -r -0 $(RM) -f diff --git a/make/qt-pro.mk b/make/qt-pro.mk index 8345fdb9..d537dabf 100644 --- a/make/qt-pro.mk +++ b/make/qt-pro.mk @@ -16,5 +16,5 @@ all: $(QMAKE_MAKEFILE) qmake.clean: if [ -f $(QMAKE_MAKEFILE) ]; then make -f $(QMAKE_MAKEFILE) clean; fi - rm -f $(QMAKE_MAKEFILE) *.tmp $(EXE) .qmake.stash + $(RM) -f $(QMAKE_MAKEFILE) *.tmp $(EXE) .qmake.stash diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 99eba9b3..bbafc2f6 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -119,7 +119,7 @@ pkg-update: pkgupdate.dist pkg-upload-local: pkg-upload-local.dist clean.rpm: - rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC + $(RM) -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC #ifeq ($(PROJECT_DESCR_FILE),) # @@ -132,7 +132,7 @@ clean.rpm: # mv $@.tmp $@ # #clean.mkspec: -# rm -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp +# $(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp # #endif @@ -199,7 +199,7 @@ pkguninstall.dist: sudo $(RPM) -e $(RPM_PROJECT)-$$s --nodeps --allmatches; \ fi; \ done - rm -f pkginstall.dist + $(RM) -f pkginstall.dist upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386 cvs commit $< diff --git a/make/rules.mk b/make/rules.mk index 06c27296..54c4ad81 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -68,65 +68,65 @@ install-to-system: sudo make DEVELOPMENT=false install pckgclean: - rm -rf *.zip *.tar.gz *.rpm *.deb + $(RM) -rf *.zip *.tar.gz *.rpm *.deb tmpclean: - rm -rf *.tmp *.rep + $(RM) -rf *.tmp *.rep coreclean: - rm -rf core core.* vgcore vgcore.* + $(RM) -rf core core.* vgcore vgcore.* runclean: coreclean objclean: - rm -rf *.o *.o *.a *.so *.so.* + $(RM) -rf *.o *.o *.a *.so *.so.* depclean: - rm -f .*.dep.mk + $(RM) -f .*.dep.mk mocclean: - rm -rf moc_* + $(RM) -rf moc_* uicclean: - rm -rf $(UIC_CPP) $(UIC_H) + $(RM) -rf $(UIC_CPP) $(UIC_H) rccclean: - rm -rf $(RCC_CPP) + $(RM) -rf $(RCC_CPP) textclean: doneclean - rm -rf *~ .*~ .*.swp *.rep \#*\# .kdbgrc.* .\#* .exrc + $(RM) -rf *~ .*~ .*.swp *.rep \#*\# .kdbgrc.* .\#* .exrc allclean: - rm -rf $(ALL) $(LOCAL_TARGETS) + $(RM) -rf $(ALL) $(LOCAL_TARGETS) doneclean: - rm -rf *.done $(PREREQ_DONE) + $(RM) -rf *.done $(PREREQ_DONE) execlean: allclean objclean runclean textclean - rm -rf $(EXE) $(PLUGIN) + $(RM) -rf $(EXE) $(PLUGIN) distclean: clean objclean textclean vcdistclean profclean timerclean varclean localclean: $(LOCAL_CLEAN) - rm -rf $(CLEAN) + $(RM) -rf $(CLEAN) libclean: - rm -rf $(LIB_A) $(LIB_SO) $(VERSION_SCRIPT) + $(RM) -rf $(LIB_A) $(LIB_SO) $(VERSION_SCRIPT) vcdistclean: - rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk + $(RM) -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk prereqclean: set -e; for dir in $(PREREQ_DIR); do make -$(MAKEFLAGS) -C $$dir clean; done profclean: - rm -f *.da *.bb *.bbg *.gcov *.gcda *.gcno + $(RM) -f *.da *.bb *.bbg *.gcov *.gcda *.gcno timerclean: - rm -f timers_*.h + $(RM) -f timers_*.h varclean: - rm -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES) + $(RM) -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES) love: @echo "Not war?" @@ -338,7 +338,7 @@ $(EXE) $(EXE_BIN): $(PLUGIN) $(PLUGIN_LIB): $(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ # mkdir -p $(BUILD_LIBDIR) -# install -m 755 $@ $(BUILD_LIBDIR) +# $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR) define check_not_empty check_not_empty_$(1): @@ -393,9 +393,9 @@ $$(TOPDIR)/dir_install_$(1).done: $$(BUILD_$(1)DIR)/%: % | $$(TOPDIR)/dir_build_$(1).done @if [ ! $$< -ef $$@ -a "`echo $$< | $(SED) 's/\..*//'`" != local ]; then \ - echo install -p -m $($(1)MODE) $$< $$@ ;\ - install -p -m $($(1)MODE) $$< $$@ ;\ - rm -f $$(TOPDIR)/dirs-*.done ;\ + echo $(BIN_INSTALL) -p -m $($(1)MODE) $$< $$@ ;\ + $(BIN_INSTALL) -p -m $($(1)MODE) $$< $$@ ;\ + $(RM) -f $$(TOPDIR)/dirs-*.done ;\ fi $$(INSTALL_$(1)DIR): diff --git a/make/run.mk b/make/run.mk index 9e25d13e..4d4b4127 100644 --- a/make/run.mk +++ b/make/run.mk @@ -61,10 +61,10 @@ start: run-prereq else run test: run-prereq - rm -f core.* + $(RM) -f core.* $(EXE_PATH) $(EXE_ARGS) start: run-prereq - rm -f core.* + $(RM) -f core.* $(EXE_PATH) $(EXE_ARGS) & $(SHORTCUT_SCRIPT): @@ -72,13 +72,13 @@ ifeq ($(TARGET),mingw) echo "set PATH=%PATH;$(DLL_PATH)" > $@.tmp echo "$(EXE_PATH) $(EXE_ARGS)" >> $@.tmp else - echo -e "#!/bin/bash\n\nrm -f core.*\nexport LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)\nexport PATH=$(PATH)\n$(EXE_PATH) $(EXE_ARGS)" > $@.tmp + echo -e "#!/bin/bash\n\n$(RM) -f core.*\nexport LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)\nexport PATH=$(PATH)\n$(EXE_PATH) $(EXE_ARGS)" > $@.tmp chmod 755 $@.tmp endif mv $@.tmp $@ shortcut: $(SHORTCUT_SCRIPT) distclean.shortcut: - rm -f $(SHORTCUT_SCRIPT) + $(RM) -f $(SHORTCUT_SCRIPT) distclean: distclean.shortcut clean: vg-clean-supp clean.out @@ -95,15 +95,15 @@ wait-stop: restart: stop wait-stop all start valgrind: run-prereq - rm -f core.* + $(RM) -f core.* valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valkyrie: run-prereq - rm -f core.* + $(RM) -f core.* valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) efence: run-prereq - rm -f core.* + $(RM) -f core.* ef $(EXE_PATH) $(EXE_ARGS) supp.tmp: @@ -111,23 +111,23 @@ supp.tmp: vg-create-supp: supp.tmp $(CAT) $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp - rm -f supp.tmp + $(RM) -f supp.tmp vg-add-supp: $(CAT) | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp vg-clean-supp: - rm -f local.supp + $(RM) -f local.supp clean.out: - rm -f run.out + $(RM) -f run.out callgrind: run-prereq - rm -f core.* + $(RM) -f core.* valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) callgrind-noinst: run-prereq - rm -f core.* + $(RM) -f core.* valgrind --tool=callgrind $(VALGRIND_OPTS) --instr-atstart=no $(EXE_PATH) $(EXE_ARGS) callgrind-startinst: @@ -160,7 +160,7 @@ strace: $(EXE_PATH) $(EXE_BIN) run-prereq strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS) tee: $(EXE_PATH) $(EXE_BIN) run-prereq - rm -f core.* + $(RM) -f core.* $(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out kcg: diff --git a/make/scripts-targets.mk b/make/scripts-targets.mk index 9dfeac23..76d7739d 100644 --- a/make/scripts-targets.mk +++ b/make/scripts-targets.mk @@ -33,5 +33,5 @@ $(HOME)/bin/%: % install-home-bin: $(HOME_BIN_EXE_SH) clean.init: - rm -f $(_INIT_SCRIPTS) + $(RM) -f $(_INIT_SCRIPTS) diff --git a/make/smart-selection.mk b/make/smart-selection.mk index 688ee09d..75187364 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -14,7 +14,7 @@ CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt all: selection.done channels.done install: clean: - rm -rf *.done *.tmp + $(RM) -rf *.done *.tmp distclean: clean upload: upload.done install-smart: rpm-install-smart.done diff --git a/make/song.mk b/make/song.mk index 6d1798a6..24b5814d 100644 --- a/make/song.mk +++ b/make/song.mk @@ -20,8 +20,8 @@ kpdf: $(CHOPRO_PDF) mv $@.tmp $@ clean.chopro: - rm -f $(CHOPRO_PS) $(CHOPRO_PDF) + $(RM) -f $(CHOPRO_PS) $(CHOPRO_PDF) clean.tmp: - rm -f *.tmp + $(RM) -f *.tmp diff --git a/make/srcdist.mk b/make/srcdist.mk index 83500431..c71f18f9 100644 --- a/make/srcdist.mk +++ b/make/srcdist.mk @@ -1,7 +1,7 @@ %-src.zip: distclean mkdir -p $(DISTDIR)/src/$(PROJECT) mkdir -p $(PCKGDIR) - rm -rf $(DISTDIR)/src/$(PROJECT)/* + $(RM) -rf $(DISTDIR)/src/$(PROJECT)/* mkdir -p $(DISTDIR)/src/$(PROJECT)/mod cd $(TOPDIR); find . -type f | \ grep -ve 'CVS\|contrib/nomake\|tar.gz\|/dist/' | \ diff --git a/make/std-tools.mk b/make/std-tools.mk index 07254c38..c43bc91f 100644 --- a/make/std-tools.mk +++ b/make/std-tools.mk @@ -23,7 +23,7 @@ $(PROFILE_SH): Makefile mv $@.tmp $@ clean.std-tools: - rm -f $(PROFILE_SH) *.done + $(RM) -f $(PROFILE_SH) *.done install.std-tools.done: install.std-dir.done $(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) $(PROFILE_SH) $(PROFILE_DIR) diff --git a/make/subdirs.mk b/make/subdirs.mk index 845c5cee..ef9e1338 100644 --- a/make/subdirs.mk +++ b/make/subdirs.mk @@ -8,7 +8,7 @@ ifneq ($(SUBDIRS_TO_ITERATE),) endif clean.var: - rm -rf $(CLEAN) + $(RM) -rf $(CLEAN) distclean.var: - rm -rf $(DISTCLEAN) + $(RM) -rf $(DISTCLEAN) diff --git a/make/suse-selection.mk b/make/suse-selection.mk index 6d8d5bb5..a3617659 100644 --- a/make/suse-selection.mk +++ b/make/suse-selection.mk @@ -15,7 +15,7 @@ $(SELECTION): $(GENERATE_SELECTION) sh $(GENERATE_SELECTION) clean: - rm -rf $(SELECTION) upload.done + $(RM) -rf $(SELECTION) upload.done upload.done: $(SELECTION) sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL) diff --git a/make/svg.mk b/make/svg.mk index 5fc10a5e..f2ad4f15 100644 --- a/make/svg.mk +++ b/make/svg.mk @@ -34,7 +34,7 @@ clean: clean.images distclean: clean.images: - rm -f $(GENERATED_IMAGES) $(COPIED_SVG) + $(RM) -f $(GENERATED_IMAGES) $(COPIED_SVG) %.png: $(COPIED_SVG) inkscape -w $(shell echo $* | sed 's/.*-//') \ diff --git a/make/swig.mk b/make/swig.mk index 2cded068..e5cf75a5 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -73,6 +73,8 @@ else endif +SWIG_INCLUDE ?= $(filter-out -iquote .,$(INCLUDE)) + SWIG_USE_CPP ?= true ifeq ($(SWIG_USE_CPP),true) SWIG_SOURCE_EXT ?= cpp @@ -113,11 +115,11 @@ clean: clean.generated distclean: clean $(SWIG_WRAPPER_DEP_MK): $(SWIG_INTERFACE_I) - $(SWIG) -M -oh $(SWIG_MODULE_H) -module $(SWIG_MODULE) $(INCLUDE) $(SWIG_OPTS) -MT $(SWIG_MODULE_WRAP_C) $< > $@.tmp + $(SWIG) -M -oh $(SWIG_MODULE_H) -module $(SWIG_MODULE) $(SWIG_INCLUDE) $(SWIG_OPTS) -MT $(SWIG_MODULE_WRAP_C) $< > $@.tmp mv $@.tmp $@ $(SWIG_MODULE_WRAP_C): $(SWIG_INTERFACE_I) - $(SWIG) -oh $(SWIG_MODULE_H) -module $(SWIG_MODULE) $(INCLUDE) $(SWIG_OPTS) -o $@ $< + $(SWIG) -oh $(SWIG_MODULE_H) -module $(SWIG_MODULE) $(SWIG_INCLUDE) $(SWIG_OPTS) -o $@ $< $(SWIG_POSTPROCESS) $(SWIG_MODULE_SO): $(SWIG_OBJ) @@ -127,7 +129,7 @@ $(SWIG_MODULE_TARGET_DIR)/%: % $(INSTALL) -p -o $(SWIG_TARGETOWNER) -g $(SWIG_TARGETGROUP) -m $(SWIG_TARGETMODE) $< $@ clean.generated: - rm -f $(SWIG_MODULE_WRAP_C) $(SWIG_OBJ) $(SWIG_MODULE_SO) $(SWIG_MODULE_TARGET) $(SWIG_CLEAN) $(SWIG_WRAPPER_DEP_MK) + $(RM) -f $(SWIG_MODULE_WRAP_C) $(SWIG_OBJ) $(SWIG_MODULE_SO) $(SWIG_MODULE_TARGET) $(SWIG_CLEAN) $(SWIG_WRAPPER_DEP_MK) include $(MODDIR)/make/rules.mk include $(MODDIR)/make/depend.mk diff --git a/make/test-exe.mk b/make/test-exe.mk index 96a8a01e..f524e874 100644 --- a/make/test-exe.mk +++ b/make/test-exe.mk @@ -23,7 +23,7 @@ test.done: touch $@ testclean: - rm -rf test.done test.out + $(RM) -rf test.done test.out ifeq ($(USE_PROJECT_LIB),true) $(LIB_SO): $(LIB_A) diff --git a/make/tex.mk b/make/tex.mk index 7c201b41..3ba3200f 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -307,7 +307,7 @@ test: cfgtest: cfgtest.done #%.clean: -# rm -rf $(OUT).%.zip +# $(RM) -rf $(OUT).%.zip dirs.done: mkdir -p $(NEWDIRS) @@ -352,7 +352,7 @@ TEX4HT_FIRST_LATEX_LINE = \ $(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT) test $(MAIN) != index - rm -rf $@ + $(RM) -rf $@ mkdir -p $@ latex $(TEX4HT_FIRST_LATEX_LINE) $(MAIN) latex $(TEX4HT_FIRST_LATEX_LINE) $(MAIN) @@ -405,7 +405,7 @@ html_install: $(HTMLDIR) clean: @echo "-- cleaning up ..." - rm -rf *.maf *.mtc *.mtc0 *.ptc1 \ + $(RM) -rf *.maf *.mtc *.mtc0 *.ptc1 \ *.aux *.toc *.dvi *.pdf *.ps *~ *.log *.done *.rep *.nav *.snm *.tdo \ *.4ct *.4tc *.4of *.4oo *.4os *.4og */*.4og *.css *.html *.idv *.lg *.xref *.odt \ *.lol *.bak *.idx *.ilg *.ind *.out *.brf .\#* \#* *.vrb \ diff --git a/make/textest.mk b/make/textest.mk index b2181c8e..a884466e 100644 --- a/make/textest.mk +++ b/make/textest.mk @@ -31,5 +31,5 @@ $(OUT_PNG): $(OUT_PDF) convert -density 400 -scale x$(PNG_WIDTH) $< $@ clean.files: - rm -rf *.done *.aux *.log *.pdf *.nav *.out *.snm *.toc .*.swp $(OUT_PNG) *.vrb + $(RM) -rf *.done *.aux *.log *.pdf *.nav *.out *.snm *.toc .*.swp $(OUT_PNG) *.vrb diff --git a/make/topdir.mk b/make/topdir.mk index 9ff944dd..b2b18ea7 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -43,18 +43,18 @@ local-%: find . -name $@.mk | \ while read f; do (\ cd `dirname $$f` ;\ - rm -f local.mk ;\ + $(RM) -f local.mk ;\ ln -s `basename $$f` local.mk ;\ ) done unlocal: - rm -f $(shell find . -name local.mk) + $(RM) -f $(shell find . -name local.mk) topdir.distclean: topdir.clean: - rm -f *.done + $(RM) -f *.done topdir.mrproper: - find . -name '*.rep' | xargs -r rm -f + find . -name '*.rep' | xargs -r $(RM) -f topdir.install: prefix.done $(INSTALLED_TOPDIR_FILES) diff --git a/make/upload-rules.mk b/make/upload-rules.mk index 7d0e3e62..0d170d3b 100644 --- a/make/upload-rules.mk +++ b/make/upload-rules.mk @@ -17,5 +17,5 @@ CURRENT_%: clean: upload.clean upload.clean: - rm -f upload.dist yupdate.*.dist + $(RM) -f upload.dist yupdate.*.dist diff --git a/make/upload.mk b/make/upload.mk index f48905c0..70304d49 100644 --- a/make/upload.mk +++ b/make/upload.mk @@ -53,5 +53,5 @@ endif clean: upload.clean upload.clean: - rm -f upload.dist + $(RM) -f upload.dist diff --git a/make/yapp.mk b/make/yapp.mk index f1a4dc60..f0976a63 100644 --- a/make/yapp.mk +++ b/make/yapp.mk @@ -18,7 +18,7 @@ clean: clean.yapp distclean: clean.yapp: - rm -f main.cpp + $(RM) -f main.cpp main.cpp: $(YAPP_CLASS_H) echo "#include \"$<\"" > $@.tmp diff --git a/make/zip-windows-files.mk b/make/zip-windows-files.mk index 4d61c06b..1c7a94bd 100644 --- a/make/zip-windows-files.mk +++ b/make/zip-windows-files.mk @@ -5,7 +5,7 @@ $(WINLIB): $(REQUIRED_H) exit 1 %-win-bin.zip: $(WINLIB) - rm -rf $(LIBPCKGTMPDIR) + $(RM) -rf $(LIBPCKGTMPDIR) mkdir -p $(LIBPCKGDIR) \ $(LIBPCKGTMPDIR)/include \ $(LIBPCKGTMPDIR)/lib \ @@ -29,7 +29,7 @@ $(WINLIB): $(REQUIRED_H) %-win-src.zip: mkdir -p $(DISTDIR)/src/$(PROJECT) mkdir -p $(PCKG_DIR) - rm -rf $(DISTDIR)/src/$(PROJECT)/* + $(RM) -rf $(DISTDIR)/src/$(PROJECT)/* mkdir -p $(DISTDIR)/src/$(PROJECT)/mod cd $(TOPDIR); find . -type f | \ grep -ve 'include\|\.plg\|\.opt\|\.ncb\|Debug\|\.rep\|\.dsw\|\.dsp\|.*.\o' | \