make: Replace some executables by absolute paths to improve performance

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-09-02 19:26:52 +00:00
commit f5c43f706a
54 changed files with 134 additions and 137 deletions

View file

@ -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

View file

@ -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)

View file

@ -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:

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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)

View file

@ -41,5 +41,5 @@ dload.done:
touch $@
dav.clean:
rm -f upload.done dload.done
$(RM) -f upload.done dload.done

View file

@ -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)

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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' | \

View file

@ -9,6 +9,6 @@ clean: doc.clean
distclean:
doc.clean:
rm -rf *~ .*.swp
$(RM) -rf *~ .*.swp

View file

@ -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)

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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

View file

@ -15,4 +15,4 @@ test:
mv $@.tmp $@
clean.lesscpy:
rm -f $(LESS_GENERATED_CSS) *.tmp
$(RM) -f $(LESS_GENERATED_CSS) *.tmp

View file

@ -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

View file

@ -6,5 +6,5 @@ clean: clean.includes
install: install_HDR
clean.includes:
rm -rf *~ .*.swp *.done
$(RM) -rf *~ .*.swp *.done

View file

@ -16,7 +16,7 @@ clean: done.clean
distclean:
done.clean:
rm -f *.done
$(RM) -f *.done
install.done:
for f in $(SOURCE_FILES); do \

View file

@ -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)

View file

@ -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

View file

@ -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 \

View file

@ -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

View file

@ -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:

View file

@ -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 $@

View file

@ -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)

View file

@ -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 $@ $<

View file

@ -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:

View file

@ -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

View file

@ -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

View file

@ -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 $<

View file

@ -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):

View file

@ -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:

View file

@ -33,5 +33,5 @@ $(HOME)/bin/%: %
install-home-bin: $(HOME_BIN_EXE_SH)
clean.init:
rm -f $(_INIT_SCRIPTS)
$(RM) -f $(_INIT_SCRIPTS)

View file

@ -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

View file

@ -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

View file

@ -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/' | \

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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/.*-//') \

View file

@ -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

View file

@ -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)

View file

@ -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 \

View file

@ -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

View file

@ -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)

View file

@ -17,5 +17,5 @@ CURRENT_%:
clean: upload.clean
upload.clean:
rm -f upload.dist yupdate.*.dist
$(RM) -f upload.dist yupdate.*.dist

View file

@ -53,5 +53,5 @@ endif
clean: upload.clean
upload.clean:
rm -f upload.dist
$(RM) -f upload.dist

View file

@ -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

View file

@ -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' | \