janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make: Replace some executables by absolute paths to improve performance

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
make/autoconf.mk
View file

@ -23,7 +23,7 @@ make_rpm_release: config $(AC_FILES)
make_install: make_install:
if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
confclean: confclean:
rm -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache $(RM) -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache
configure.ac: configure.ac.tmpl VERSION configure.ac: configure.ac.tmpl VERSION
$(CAT) $< | $(SED) -e "s/_VERSION_/`$(CAT) VERSION | $(SED) 's/-dev//'`/" > $@ $(CAT) $< | $(SED) -e "s/_VERSION_/`$(CAT) VERSION | $(SED) 's/-dev//'`/" > $@
@ -48,4 +48,4 @@ $(TOPDIR)/include/%.h: $(TOPDIR)/include/%.h.in config.status
touch $@ touch $@
acclean: acclean:
rm -f *.acdone $(RM) -f *.acdone

2
make/backup.mk
View file

@ -8,5 +8,5 @@ backup: distclean
tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2 tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2
purge-last-backup: 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)

2
make/bin.mk
View file

@ -5,5 +5,5 @@
all install: all install:
clean distclean: clean distclean:
rm -f $(filter-out Makefile CVS debug release,$(wildcard *)) $(RM) -f $(filter-out Makefile CVS debug release,$(wildcard *))
test: test:

2
make/cleandirs.mk
View file

@ -19,5 +19,5 @@ do.install:
do.%: do.%:
set -e; for d in $(SUBDIRS); do make -wC $$d $*; done 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

2
make/conf.mk
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) install_files_APACHE_CONF install_files_SYSTEMD install_INIT $(CONF_D)
clean.conf: clean.conf:
rm -rf *.h *~ .*.swp *.done $(RM) -rf *.h *~ .*.swp *.done
ifneq ($(CONFIG_SUBDIR),) ifneq ($(CONFIG_SUBDIR),)
$(INSTALLED_CFG): $(INSTALL_CFGDIR) $(INSTALLED_CFG): $(INSTALL_CFGDIR)

2
make/contrib.mk
View file

@ -41,7 +41,7 @@ apply-patches.done: unpack.done $(LOCAL_PATCH_DONE)
install: install:
distclean: distclean:
rm -rf *.done *.patch $(CFG_WORKING_DIR) $(RM) -rf *.done *.patch $(CFG_WORKING_DIR)
unpack: unpack.done unpack: unpack.done
apply-patches: apply-patches.done apply-patches: apply-patches.done

2
make/crontab.mk
View file

@ -6,7 +6,7 @@ clean: clean.conf
install: install_CFG install_files_SYSCFG install_files_LOGROT $(CONF_D) install: install_CFG install_files_SYSCFG install_files_LOGROT $(CONF_D)
clean.conf: clean.conf:
rm -rf *.h *~ .*.swp *.done $(RM) -rf *.h *~ .*.swp *.done
ifneq ($(CONFIG_SUBDIR),) ifneq ($(CONFIG_SUBDIR),)
$(INSTALLED_CFG): $(INSTALL_CFGDIR) $(INSTALLED_CFG): $(INSTALL_CFGDIR)

2
make/dav.mk
View file

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

2
make/debugger.mk
View file

@ -73,6 +73,6 @@ centralcore:
coreclean: centralcore-clean coreclean: centralcore-clean
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:
@echo PID = $(PID) @echo PID = $(PID)

33
make/defs.mk
View file

@ -29,19 +29,23 @@ ifneq ($(wildcard pre-local.mk),)
endif endif
# ----- executables # ----- executables
SED = sed SED := /usr/bin/sed
CAT = /bin/cat CAT := /bin/cat
SHELL ?= /bin/bash SHELL ?= /bin/bash
BROWSER ?= firefox BROWSER ?= firefox
RM := /usr/bin/rm
AR = /usr/bin/ar
PWD := /usr/bin/pwd
BIN_INSTALL := /usr/bin/install
# ----- standard variables # ----- standard variables
CVSTOPDIR ?= $(CVS_PROJ_DIR)/.. CVSTOPDIR ?= $(CVS_PROJ_DIR)/..
ifeq ($(PROJECT),) 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 endif
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get-os.sh) OS ?= $(shell /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh)
CREATE_DEVEL ?= true CREATE_DEVEL ?= true
#COMPILER_SUITE ?= clang #COMPILER_SUITE ?= clang
@ -112,7 +116,7 @@ CVS_RSH ?= /usr/bin/ssh
# ----- input dirs # ----- input dirs
JW_BUILD_DIR = $(MODDIR) JW_BUILD_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) 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)}') REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
IMAGE_DIR ?= $(CVS_ROOT_DIR)/images IMAGE_DIR ?= $(CVS_ROOT_DIR)/images
@ -161,7 +165,7 @@ endif
JANWARE_USER ?= $(shell id -un) JANWARE_USER ?= $(shell id -un)
JANWARE_CLIENT ?= jw JANWARE_CLIENT ?= jw
JANWARE_WIKI ?= $(JANWARE_CLIENT) 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) JANWARE_URL_DOC_PROJECT ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(PROJECT)
PKG_VENDOR ?= janware GmbH PKG_VENDOR ?= janware GmbH
@ -476,7 +480,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
INSTALLATION_FILE_TYPES += HTML INSTALLATION_FILE_TYPES += HTML
BUILD_HTMLDIR = $(TOPDIR)/htdocs BUILD_HTMLDIR = $(TOPDIR)/htdocs
LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(IMAGES)) 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),) ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR = $(PROJECT_HTMLDIR) INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)
else else
@ -488,7 +492,7 @@ INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))
INSTALLATION_FILE_TYPES += TMPL INSTALLATION_FILE_TYPES += TMPL
BUILD_TMPLDIR = $(TOPDIR)/tmpl BUILD_TMPLDIR = $(TOPDIR)/tmpl
LOCAL_TMPL += $(filter-out $(DONT_INSTALL) Makefile,$(wildcard *.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),) ifeq ($(TMPL_SUBDIR),)
INSTALL_TMPLDIR = $(PROJECT_TMPLDIR) INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)
else else
@ -680,8 +684,6 @@ endif
# do a conditional include of timer headers, yet # do a conditional include of timer headers, yet
GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
RM = rm
AR = ar
PKG_SH_EXE = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh PKG_SH_EXE = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH = $(PKG_SH_EXE) log-install LOG_INSTALL_SH = $(PKG_SH_EXE) log-install
@ -741,7 +743,7 @@ else
endif endif
define install_links define install_links
cwd=`pwd`; \ cwd=`$(PWD)`; \
echo "o in $(INSTALL_$(1)DIR):" ;\ echo "o in $(INSTALL_$(1)DIR):" ;\
for f in $(notdir $(INSTALLED_$(1))); do \ for f in $(notdir $(INSTALLED_$(1))); do \
cd $(INSTALL_$(1)DIR); \ cd $(INSTALL_$(1)DIR); \
@ -974,14 +976,7 @@ ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done STRIP_DONE ?= strip.done
endif endif
INCLUDE += $(LOCAL_INCLUDE) INCLUDE += $(LOCAL_INCLUDE) -I.
# force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),)
INCLUDE += -I.
else
INCLUDE += -iquote .
endif
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include

2
make/depend.mk
View file

@ -20,7 +20,7 @@ clean: depclean my_depclean
# convenience targets # convenience targets
dep: $(DEPEND_MK) dep: $(DEPEND_MK)
my_depclean: my_depclean:
rm -f .*.dep.mk $(RM) -f .*.dep.mk
# rules # rules
$(DEPEND_MK): $(PREREQ_DONE) $(DEPEND_MK): $(PREREQ_DONE)

4
make/dirs.mk
View file

@ -96,10 +96,10 @@ endif
dirs.clean: dirs.clean:
set -e; for d in $(call reverse,$(SUBDIRS)) ; do make -wC $$d clean; done 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: dirs.distclean:
set -e; for d in $(call reverse,$(SUBDIRS)) ; do make -wC $$d distclean; done set -e; for d in $(call reverse,$(SUBDIRS)) ; do make -wC $$d distclean; done
rm -rf $(DISTCLEAN) $(RM) -rf $(DISTCLEAN)
endif # SUBDIRS_TO_ITERATE endif # SUBDIRS_TO_ITERATE

6
make/dist.mk
View file

@ -25,7 +25,7 @@ SSI_PREFIX = $(TMPHTML)/ssi_download_
$(TMPHTML): $(TMPHTML):
mkdir -p $(TMPHTML) mkdir -p $(TMPHTML)
test -d $(TMPHTML) && rm -rf $(TMPHTML)/* test -d $(TMPHTML) && $(RM) -rf $(TMPHTML)/*
$(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL) $(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL)
@ -47,13 +47,13 @@ $(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL)
" > $@ " > $@
remove_dist: remove_dist:
rm -rf $(DISTDIR) $(RM) -rf $(DISTDIR)
distclean: remove_dist distclean: remove_dist
$(DIST_FILE): distclean $(DIST_FILE): distclean
mkdir -p $(DISTDIR)/src/$(PROJECT) mkdir -p $(DISTDIR)/src/$(PROJECT)
mkdir -p $(DISTDIR)/pckg mkdir -p $(DISTDIR)/pckg
rm -rf $(DISTDIR)/src/$(PROJECT)/* $(RM) -rf $(DISTDIR)/src/$(PROJECT)/*
mkdir -p $(DISTDIR)/src/$(PROJECT)/mod mkdir -p $(DISTDIR)/src/$(PROJECT)/mod
cd $(TOPDIR); find . -type f | \ cd $(TOPDIR); find . -type f | \
grep -ve 'CVS\|contrib/nomake\|tar.gz\|/dist/\|experimental' | \ grep -ve 'CVS\|contrib/nomake\|tar.gz\|/dist/\|experimental' | \

2
make/doc-rules.mk
View file

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

2
make/doxygen.mk
View file

@ -65,7 +65,7 @@ upload.done: doxygen.done cpfiles.done
upload.sh $(DX_OUTPUT_DIR)/ $(UPLOAD_URL) upload.sh $(DX_OUTPUT_DIR)/ $(UPLOAD_URL)
clean.doxygen: 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: inst-dir.done:
$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR) $(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR)

2
make/dummy.mk
View file

@ -7,7 +7,7 @@ include $(MODDIR)/make/defs.mk
all: all:
clean: clean:
rm -rf *~ .*.swp $(RM) -rf *~ .*.swp
install: # nothing to be done install: # nothing to be done
all: # nothing to be done all: # nothing to be done
distclean: clean distclean: clean

4
make/fc-mod-cpp.mk
View file

@ -50,10 +50,10 @@ $(FC_MODULE): $(FC_OBJ)
$(LD) -shared $(BUILD_LDFLAGS) $^ -o $@ $(LD) -shared $(BUILD_LDFLAGS) $^ -o $@
clean.generated: clean.generated:
rm -f $(FC_GENERATED) $(RM) -f $(FC_GENERATED)
clean.local: clean.local:
rm -f $(FC_MODULE) *.o *.done $(RM) -f $(FC_MODULE) *.o *.done
create-dirs.done: create-dirs.done:
$(INSTALL) -d -m $(LIBDIRMODE) -o $(LIBDIROWNER) -g $(LIBDIRGROUP) $(FC_INSTALL_DIRS) $(INSTALL) -d -m $(LIBDIRMODE) -o $(LIBDIROWNER) -g $(LIBDIRGROUP) $(FC_INSTALL_DIRS)

4
make/flex-bison.mk
View file

@ -65,5 +65,5 @@ lex.%.$(FB_FLEX_OUT_EXT): %.l $(FB_BISON_OUT_C)
# g++ -g -o $(FB_EXE) $^ -lfl # g++ -g -o $(FB_EXE) $^ -lfl
clean.local: 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 $(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 graph-*.txt report-*.xml report-*.txt

6
make/gettext.mk
View file

@ -13,13 +13,13 @@ GETTEXT_KEYWORDS ?= htr ehtr
all: $(GETTEXT_MO) all: $(GETTEXT_MO)
clean: clean-mo clean: clean-mo
rm -rf *~ .*.swp $(RM) -rf *~ .*.swp
install: install_MO install: install_MO
distclean: clean distclean: clean
extract: $(GETTEXT_POT) extract: $(GETTEXT_POT)
clean-mo: clean-mo:
rm -f *.mo *.tmp $(RM) -f *.mo *.tmp
$(GETTEXT_POT): $(GETTEXT_INPUT_FILES) $(GETTEXT_POT): $(GETTEXT_INPUT_FILES)
xgettext --from-code=utf-8 --package-name $(PROJECT) --package-version $(DIST_VERSION) \ xgettext --from-code=utf-8 --package-name $(PROJECT) --package-version $(DIST_VERSION) \
@ -59,7 +59,7 @@ clean: htr-tmp-clean
htr: $(GETTEXT_TMP) htr: $(GETTEXT_TMP)
htr-tmp-clean: htr-tmp-clean:
rm -f *.htr $(RM) -f *.htr
define copy_rule define copy_rule
./%.htr.tmp: $(1)/%.php ./%.htr.tmp: $(1)/%.php

2
make/htdocs.mk
View file

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

2
make/include.mk
View file

@ -22,7 +22,7 @@ project-header: $(PROJ_H)
# rules # rules
clean.include: 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)) $(PROJ_H): $(filter-out $(PROJ_H) $(PROJECT)/$(PROJ_H),$(wildcard *.h $(PROJECT)/*.h))
echo "#ifndef _$(PROJECT_CAPNAME)_H" > $@.tmp echo "#ifndef _$(PROJECT_CAPNAME)_H" > $@.tmp

2
make/includes.mk
View file

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

2
make/install-files.mk
View file

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

6
make/isolinux.mk
View file

@ -30,9 +30,9 @@ distclean: clean
# == rules # == rules
syslinux.clean: syslinux.clean:
rm -rf *.done $(RM) -rf *.done
rm -rf $(BUILD_DIR) $(UNPACK_DIR) $(RM) -rf $(BUILD_DIR) $(UNPACK_DIR)
rm -f $(ISO_IMAGE) $(URL_FILE) $(URL_FILE).tmp $(RM) -f $(ISO_IMAGE) $(URL_FILE) $(URL_FILE).tmp
dirs.done: dirs.done:
mkdir -p $(DIRS) mkdir -p $(DIRS)

12
make/lib.mk
View file

@ -30,23 +30,23 @@ endif
clean.unix: clean.unix:
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
rm -rf *.so.* *.so st* $(RM) -rf *.so.* *.so st*
endif endif
clean.mingw: clean.mingw:
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
rm -rf *.dll *.def *.exp *.lib $(RM) -rf *.dll *.def *.exp *.lib
endif endif
clean.all: 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: ld-%.conf:
echo $(INSTALL_LIBDIR) > $@.tmp echo $(INSTALL_LIBDIR) > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
clean.ld-conf: clean.ld-conf:
rm -f $(LD_CONF) $(RM) -f $(LD_CONF)
echo.libs: echo.libs:
@echo INSTALLED_LIB_SO = $(INSTALLED_LIB_SO) @echo INSTALLED_LIB_SO = $(INSTALLED_LIB_SO)
@ -66,7 +66,7 @@ echo-contrib: echo.contrib-libs echo.libs
# rules # rules
clean.contrib-libs: clean.contrib-libs:
rm -f $(CONTRIB_LIBS) $(RM) -f $(CONTRIB_LIBS)
define contrib_lib_search_rules define contrib_lib_search_rules
%.dll: $(1)/%.dll %.dll: $(1)/%.dll
@ -81,7 +81,7 @@ echo.contrib-libs:
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
clean.winres: clean.winres:
rm -f $(WINRES_RC) $(WINRES_O) *.tmp $(RM) -f $(WINRES_RC) $(WINRES_O) *.tmp
clean: clean.winres clean: clean.winres
#%.o : %.rc #%.o : %.rc

2
make/lilypond.mk
View file

@ -24,7 +24,7 @@ jackview: all
lilypond $< lilypond $<
clean.lilypond: clean.lilypond:
rm -f *.pdf *.ps *.done *.tmp *.midi $(RM) -f *.pdf *.ps *.done *.tmp *.midi
convert.done: convert.done:
set -e; for o in $(wildcard *.ly); do \ set -e; for o in $(wildcard *.ly); do \

8
make/linux-rpm-build.mk
View file

@ -206,10 +206,10 @@ dist: clean
tar -czf kernel.tar.gz `find kernel -maxdepth 1 -type f | grep -ve "setup\|trash\|CVS"` tar -czf kernel.tar.gz `find kernel -maxdepth 1 -type f | grep -ve "setup\|trash\|CVS"`
mv ../kernel.tar.gz . mv ../kernel.tar.gz .
clean: clean:
rm -rf $(KERNEL_BASE)-* $(RM) -rf $(KERNEL_BASE)-*
rm -rf install/* reiser.patch *~ *.done *.lxdone *.uldone *.patch *.diff *.rpm *.tar.gz *.tar \ $(RM) -rf install/* reiser.patch *~ *.done *.lxdone *.uldone *.patch *.diff *.rpm *.tar.gz *.tar \
$(SCOPE_DRIVER_BASE) $(SCOPE_DRIVER_BASE)
rm -rf linux linux-$(KERNEL_VERSION) CURRENT_* pax_global_header $(RM) -rf linux linux-$(KERNEL_VERSION) CURRENT_* pax_global_header
rm -f toplevel-makefile EXTRAVERSION COMPLETE_VERSION $(RM) -f toplevel-makefile EXTRAVERSION COMPLETE_VERSION
distclean: clean distclean: clean

4
make/linux-rpm.mk
View file

@ -95,7 +95,7 @@ linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile
cp $< $@ cp $< $@
unpack.done: $(KERNEL_PKG) unpack.done: $(KERNEL_PKG)
rm -rf linux-$(KERNEL_VERSION) $(RM) -rf linux-$(KERNEL_VERSION)
ifeq ($(suffix $(KERNEL_PKG)),.gz) ifeq ($(suffix $(KERNEL_PKG)),.gz)
tar -xzf $(KERNEL_PKG) tar -xzf $(KERNEL_PKG)
endif endif
@ -120,7 +120,7 @@ patch-%:
make patches/$*-$(KERNEL_VERSION).patch make patches/$*-$(KERNEL_VERSION).patch
clean-patch-%: clean-patch-%:
rm -f patches/$*-$(KERNEL_VERSION).patch $(RM) -f patches/$*-$(KERNEL_VERSION).patch
make patches/$*-$(KERNEL_VERSION).patch make patches/$*-$(KERNEL_VERSION).patch
patches/%-$(KERNEL_VERSION).patch: patches/%-$(KERNEL_VERSION).patch:

4
make/lo.mk
View file

@ -38,10 +38,10 @@ install: $(INSTALLED_LOADABLE_OBJ_LIBS)
clean: clean.lo clean: clean.lo
clean.generated: 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 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) $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(CPP_PREFIX)%.o $(OTHER_LIB)
$(CPP) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@ $(CPP) $^ -L. $(OTHER_LIB_LDFLAGS) -shared $(BUILD_LDFLAGS) -o $@

2
make/make.mk
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) $(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
clean.pkg-config: clean.pkg-config:
rm -f *.pc $(BUILD_PKG_CONFIG) $(RM) -f *.pc $(BUILD_PKG_CONFIG)

2
make/plugin-version.mk
View file

@ -10,7 +10,7 @@ version.o: version.cpp
$(CPP) $(BUILD_CPPFLAGS) -o $@ -c $< $(CPP) $(BUILD_CPPFLAGS) -o $@ -c $<
clean.local: clean.local:
rm -f version.o $(RM) -f version.o
$(PLUGIN_VERSION_LIB): version.o $(PLUGIN_VERSION_LIB): version.o
ar r $@ $< ar r $@ $<

2
make/py-mod.mk
View file

@ -14,7 +14,7 @@ clean: py.clean
distclean: distclean:
py.clean: py.clean:
rm -f *.done *.pyc $(RM) -f *.done *.pyc
/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py /bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py
install-dirs.done: install-dirs.done:

2
make/python-cli.mk
View file

@ -12,4 +12,4 @@ run:
python -m $(shell echo $(patsubst %.py,%,$(EXE)) | sed 's%^\./%%; s%/%.%g') $(EXE_ARGS) python -m $(shell echo $(patsubst %.py,%,$(EXE)) | sed 's%^\./%%; s%/%.%g') $(EXE_ARGS)
pyc.clean: pyc.clean:
find . -name '*.pyc' -print0 | xargs -r -0 rm -f find . -name '*.pyc' -print0 | xargs -r -0 $(RM) -f

2
make/qt-pro.mk
View file

@ -16,5 +16,5 @@ all: $(QMAKE_MAKEFILE)
qmake.clean: qmake.clean:
if [ -f $(QMAKE_MAKEFILE) ]; then make -f $(QMAKE_MAKEFILE) clean; fi 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

6
make/rpmdist.mk
View file

@ -119,7 +119,7 @@ pkg-update: pkgupdate.dist
pkg-upload-local: pkg-upload-local.dist pkg-upload-local: pkg-upload-local.dist
clean.rpm: clean.rpm:
rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC $(RM) -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC
#ifeq ($(PROJECT_DESCR_FILE),) #ifeq ($(PROJECT_DESCR_FILE),)
# #
@ -132,7 +132,7 @@ clean.rpm:
# mv $@.tmp $@ # mv $@.tmp $@
# #
#clean.mkspec: #clean.mkspec:
# rm -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp # $(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
# #
#endif #endif
@ -199,7 +199,7 @@ pkguninstall.dist:
sudo $(RPM) -e $(RPM_PROJECT)-$$s --nodeps --allmatches; \ sudo $(RPM) -e $(RPM_PROJECT)-$$s --nodeps --allmatches; \
fi; \ fi; \
done done
rm -f pkginstall.dist $(RM) -f pkginstall.dist
upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386 upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
cvs commit $< cvs commit $<

44
make/rules.mk
View file

@ -68,65 +68,65 @@ install-to-system:
sudo make DEVELOPMENT=false install sudo make DEVELOPMENT=false install
pckgclean: pckgclean:
rm -rf *.zip *.tar.gz *.rpm *.deb $(RM) -rf *.zip *.tar.gz *.rpm *.deb
tmpclean: tmpclean:
rm -rf *.tmp *.rep $(RM) -rf *.tmp *.rep
coreclean: coreclean:
rm -rf core core.* vgcore vgcore.* $(RM) -rf core core.* vgcore vgcore.*
runclean: coreclean runclean: coreclean
objclean: objclean:
rm -rf *.o *.o *.a *.so *.so.* $(RM) -rf *.o *.o *.a *.so *.so.*
depclean: depclean:
rm -f .*.dep.mk $(RM) -f .*.dep.mk
mocclean: mocclean:
rm -rf moc_* $(RM) -rf moc_*
uicclean: uicclean:
rm -rf $(UIC_CPP) $(UIC_H) $(RM) -rf $(UIC_CPP) $(UIC_H)
rccclean: rccclean:
rm -rf $(RCC_CPP) $(RM) -rf $(RCC_CPP)
textclean: doneclean textclean: doneclean
rm -rf *~ .*~ .*.swp *.rep \#*\# .kdbgrc.* .\#* .exrc $(RM) -rf *~ .*~ .*.swp *.rep \#*\# .kdbgrc.* .\#* .exrc
allclean: allclean:
rm -rf $(ALL) $(LOCAL_TARGETS) $(RM) -rf $(ALL) $(LOCAL_TARGETS)
doneclean: doneclean:
rm -rf *.done $(PREREQ_DONE) $(RM) -rf *.done $(PREREQ_DONE)
execlean: allclean objclean runclean textclean execlean: allclean objclean runclean textclean
rm -rf $(EXE) $(PLUGIN) $(RM) -rf $(EXE) $(PLUGIN)
distclean: clean objclean textclean vcdistclean profclean timerclean varclean distclean: clean objclean textclean vcdistclean profclean timerclean varclean
localclean: $(LOCAL_CLEAN) localclean: $(LOCAL_CLEAN)
rm -rf $(CLEAN) $(RM) -rf $(CLEAN)
libclean: libclean:
rm -rf $(LIB_A) $(LIB_SO) $(VERSION_SCRIPT) $(RM) -rf $(LIB_A) $(LIB_SO) $(VERSION_SCRIPT)
vcdistclean: vcdistclean:
rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk $(RM) -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk
prereqclean: prereqclean:
set -e; for dir in $(PREREQ_DIR); do make -$(MAKEFLAGS) -C $$dir clean; done set -e; for dir in $(PREREQ_DIR); do make -$(MAKEFLAGS) -C $$dir clean; done
profclean: profclean:
rm -f *.da *.bb *.bbg *.gcov *.gcda *.gcno $(RM) -f *.da *.bb *.bbg *.gcov *.gcda *.gcno
timerclean: timerclean:
rm -f timers_*.h $(RM) -f timers_*.h
varclean: varclean:
rm -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES) $(RM) -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES)
love: love:
@echo "Not war?" @echo "Not war?"
@ -338,7 +338,7 @@ $(EXE) $(EXE_BIN):
$(PLUGIN) $(PLUGIN_LIB): $(PLUGIN) $(PLUGIN_LIB):
$(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ $(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
# mkdir -p $(BUILD_LIBDIR) # mkdir -p $(BUILD_LIBDIR)
# install -m 755 $@ $(BUILD_LIBDIR) # $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR)
define check_not_empty define check_not_empty
check_not_empty_$(1): check_not_empty_$(1):
@ -393,9 +393,9 @@ $$(TOPDIR)/dir_install_$(1).done:
$$(BUILD_$(1)DIR)/%: % | $$(TOPDIR)/dir_build_$(1).done $$(BUILD_$(1)DIR)/%: % | $$(TOPDIR)/dir_build_$(1).done
@if [ ! $$< -ef $$@ -a "`echo $$< | $(SED) 's/\..*//'`" != local ]; then \ @if [ ! $$< -ef $$@ -a "`echo $$< | $(SED) 's/\..*//'`" != local ]; then \
echo install -p -m $($(1)MODE) $$< $$@ ;\ echo $(BIN_INSTALL) -p -m $($(1)MODE) $$< $$@ ;\
install -p -m $($(1)MODE) $$< $$@ ;\ $(BIN_INSTALL) -p -m $($(1)MODE) $$< $$@ ;\
rm -f $$(TOPDIR)/dirs-*.done ;\ $(RM) -f $$(TOPDIR)/dirs-*.done ;\
fi fi
$$(INSTALL_$(1)DIR): $$(INSTALL_$(1)DIR):

26
make/run.mk
View file

@ -61,10 +61,10 @@ start: run-prereq
else else
run test: run-prereq run test: run-prereq
rm -f core.* $(RM) -f core.*
$(EXE_PATH) $(EXE_ARGS) $(EXE_PATH) $(EXE_ARGS)
start: run-prereq start: run-prereq
rm -f core.* $(RM) -f core.*
$(EXE_PATH) $(EXE_ARGS) & $(EXE_PATH) $(EXE_ARGS) &
$(SHORTCUT_SCRIPT): $(SHORTCUT_SCRIPT):
@ -72,13 +72,13 @@ ifeq ($(TARGET),mingw)
echo "set PATH=%PATH;$(DLL_PATH)" > $@.tmp echo "set PATH=%PATH;$(DLL_PATH)" > $@.tmp
echo "$(EXE_PATH) $(EXE_ARGS)" >> $@.tmp echo "$(EXE_PATH) $(EXE_ARGS)" >> $@.tmp
else 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 chmod 755 $@.tmp
endif endif
mv $@.tmp $@ mv $@.tmp $@
shortcut: $(SHORTCUT_SCRIPT) shortcut: $(SHORTCUT_SCRIPT)
distclean.shortcut: distclean.shortcut:
rm -f $(SHORTCUT_SCRIPT) $(RM) -f $(SHORTCUT_SCRIPT)
distclean: distclean.shortcut distclean: distclean.shortcut
clean: vg-clean-supp clean.out clean: vg-clean-supp clean.out
@ -95,15 +95,15 @@ wait-stop:
restart: stop wait-stop all start restart: stop wait-stop all start
valgrind: run-prereq valgrind: run-prereq
rm -f core.* $(RM) -f core.*
valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
valkyrie: run-prereq valkyrie: run-prereq
rm -f core.* $(RM) -f core.*
valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
efence: run-prereq efence: run-prereq
rm -f core.* $(RM) -f core.*
ef $(EXE_PATH) $(EXE_ARGS) ef $(EXE_PATH) $(EXE_ARGS)
supp.tmp: supp.tmp:
@ -111,23 +111,23 @@ supp.tmp:
vg-create-supp: supp.tmp vg-create-supp: supp.tmp
$(CAT) $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp $(CAT) $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp
rm -f supp.tmp $(RM) -f supp.tmp
vg-add-supp: vg-add-supp:
$(CAT) | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp $(CAT) | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp
vg-clean-supp: vg-clean-supp:
rm -f local.supp $(RM) -f local.supp
clean.out: clean.out:
rm -f run.out $(RM) -f run.out
callgrind: run-prereq callgrind: run-prereq
rm -f core.* $(RM) -f core.*
valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
callgrind-noinst: run-prereq callgrind-noinst: run-prereq
rm -f core.* $(RM) -f core.*
valgrind --tool=callgrind $(VALGRIND_OPTS) --instr-atstart=no $(EXE_PATH) $(EXE_ARGS) valgrind --tool=callgrind $(VALGRIND_OPTS) --instr-atstart=no $(EXE_PATH) $(EXE_ARGS)
callgrind-startinst: callgrind-startinst:
@ -160,7 +160,7 @@ strace: $(EXE_PATH) $(EXE_BIN) run-prereq
strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS) strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS)
tee: $(EXE_PATH) $(EXE_BIN) run-prereq tee: $(EXE_PATH) $(EXE_BIN) run-prereq
rm -f core.* $(RM) -f core.*
$(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out $(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out
kcg: kcg:

2
make/scripts-targets.mk
View file

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

2
make/smart-selection.mk
View file

@ -14,7 +14,7 @@ CHANNEL_LIST = $(shell $(GENERATE_SELECTION) -s)-channels.txt
all: selection.done channels.done all: selection.done channels.done
install: install:
clean: clean:
rm -rf *.done *.tmp $(RM) -rf *.done *.tmp
distclean: clean distclean: clean
upload: upload.done upload: upload.done
install-smart: rpm-install-smart.done install-smart: rpm-install-smart.done

4
make/song.mk
View file

@ -20,8 +20,8 @@ kpdf: $(CHOPRO_PDF)
mv $@.tmp $@ mv $@.tmp $@
clean.chopro: clean.chopro:
rm -f $(CHOPRO_PS) $(CHOPRO_PDF) $(RM) -f $(CHOPRO_PS) $(CHOPRO_PDF)
clean.tmp: clean.tmp:
rm -f *.tmp $(RM) -f *.tmp

2
make/srcdist.mk
View file

@ -1,7 +1,7 @@
%-src.zip: distclean %-src.zip: distclean
mkdir -p $(DISTDIR)/src/$(PROJECT) mkdir -p $(DISTDIR)/src/$(PROJECT)
mkdir -p $(PCKGDIR) mkdir -p $(PCKGDIR)
rm -rf $(DISTDIR)/src/$(PROJECT)/* $(RM) -rf $(DISTDIR)/src/$(PROJECT)/*
mkdir -p $(DISTDIR)/src/$(PROJECT)/mod mkdir -p $(DISTDIR)/src/$(PROJECT)/mod
cd $(TOPDIR); find . -type f | \ cd $(TOPDIR); find . -type f | \
grep -ve 'CVS\|contrib/nomake\|tar.gz\|/dist/' | \ grep -ve 'CVS\|contrib/nomake\|tar.gz\|/dist/' | \

2
make/std-tools.mk
View file

@ -23,7 +23,7 @@ $(PROFILE_SH): Makefile
mv $@.tmp $@ mv $@.tmp $@
clean.std-tools: clean.std-tools:
rm -f $(PROFILE_SH) *.done $(RM) -f $(PROFILE_SH) *.done
install.std-tools.done: install.std-dir.done install.std-tools.done: install.std-dir.done
$(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) $(PROFILE_SH) $(PROFILE_DIR) $(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) $(PROFILE_SH) $(PROFILE_DIR)

4
make/subdirs.mk
View file

@ -8,7 +8,7 @@ ifneq ($(SUBDIRS_TO_ITERATE),)
endif endif
clean.var: clean.var:
rm -rf $(CLEAN) $(RM) -rf $(CLEAN)
distclean.var: distclean.var:
rm -rf $(DISTCLEAN) $(RM) -rf $(DISTCLEAN)

2
make/suse-selection.mk
View file

@ -15,7 +15,7 @@ $(SELECTION): $(GENERATE_SELECTION)
sh $(GENERATE_SELECTION) sh $(GENERATE_SELECTION)
clean: clean:
rm -rf $(SELECTION) upload.done $(RM) -rf $(SELECTION) upload.done
upload.done: $(SELECTION) upload.done: $(SELECTION)
sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL) sh $(UPLOAD_SH) $(SELECTION) $(UPLOAD_URL)

2
make/svg.mk
View file

@ -34,7 +34,7 @@ clean: clean.images
distclean: distclean:
clean.images: clean.images:
rm -f $(GENERATED_IMAGES) $(COPIED_SVG) $(RM) -f $(GENERATED_IMAGES) $(COPIED_SVG)
%.png: $(COPIED_SVG) %.png: $(COPIED_SVG)
inkscape -w $(shell echo $* | sed 's/.*-//') \ inkscape -w $(shell echo $* | sed 's/.*-//') \

8
make/swig.mk
View file

@ -73,6 +73,8 @@ else
endif endif
SWIG_INCLUDE ?= $(filter-out -iquote .,$(INCLUDE))
SWIG_USE_CPP ?= true SWIG_USE_CPP ?= true
ifeq ($(SWIG_USE_CPP),true) ifeq ($(SWIG_USE_CPP),true)
SWIG_SOURCE_EXT ?= cpp SWIG_SOURCE_EXT ?= cpp
@ -113,11 +115,11 @@ clean: clean.generated
distclean: clean distclean: clean
$(SWIG_WRAPPER_DEP_MK): $(SWIG_INTERFACE_I) $(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 $@ mv $@.tmp $@
$(SWIG_MODULE_WRAP_C): $(SWIG_INTERFACE_I) $(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_POSTPROCESS)
$(SWIG_MODULE_SO): $(SWIG_OBJ) $(SWIG_MODULE_SO): $(SWIG_OBJ)
@ -127,7 +129,7 @@ $(SWIG_MODULE_TARGET_DIR)/%: %
$(INSTALL) -p -o $(SWIG_TARGETOWNER) -g $(SWIG_TARGETGROUP) -m $(SWIG_TARGETMODE) $< $@ $(INSTALL) -p -o $(SWIG_TARGETOWNER) -g $(SWIG_TARGETGROUP) -m $(SWIG_TARGETMODE) $< $@
clean.generated: 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/rules.mk
include $(MODDIR)/make/depend.mk include $(MODDIR)/make/depend.mk

2
make/test-exe.mk
View file

@ -23,7 +23,7 @@ test.done:
touch $@ touch $@
testclean: testclean:
rm -rf test.done test.out $(RM) -rf test.done test.out
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
$(LIB_SO): $(LIB_A) $(LIB_SO): $(LIB_A)

6
make/tex.mk
View file

@ -307,7 +307,7 @@ test:
cfgtest: cfgtest.done cfgtest: cfgtest.done
#%.clean: #%.clean:
# rm -rf $(OUT).%.zip # $(RM) -rf $(OUT).%.zip
dirs.done: dirs.done:
mkdir -p $(NEWDIRS) mkdir -p $(NEWDIRS)
@ -352,7 +352,7 @@ TEX4HT_FIRST_LATEX_LINE = \
$(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT) $(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT)
test $(MAIN) != index test $(MAIN) != index
rm -rf $@ $(RM) -rf $@
mkdir -p $@ mkdir -p $@
latex $(TEX4HT_FIRST_LATEX_LINE) $(MAIN) latex $(TEX4HT_FIRST_LATEX_LINE) $(MAIN)
latex $(TEX4HT_FIRST_LATEX_LINE) $(MAIN) latex $(TEX4HT_FIRST_LATEX_LINE) $(MAIN)
@ -405,7 +405,7 @@ html_install: $(HTMLDIR)
clean: clean:
@echo "-- cleaning up ..." @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 \ *.aux *.toc *.dvi *.pdf *.ps *~ *.log *.done *.rep *.nav *.snm *.tdo \
*.4ct *.4tc *.4of *.4oo *.4os *.4og */*.4og *.css *.html *.idv *.lg *.xref *.odt \ *.4ct *.4tc *.4of *.4oo *.4os *.4og */*.4og *.css *.html *.idv *.lg *.xref *.odt \
*.lol *.bak *.idx *.ilg *.ind *.out *.brf .\#* \#* *.vrb \ *.lol *.bak *.idx *.ilg *.ind *.out *.brf .\#* \#* *.vrb \

2
make/textest.mk
View file

@ -31,5 +31,5 @@ $(OUT_PNG): $(OUT_PDF)
convert -density 400 -scale x$(PNG_WIDTH) $< $@ convert -density 400 -scale x$(PNG_WIDTH) $< $@
clean.files: 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

8
make/topdir.mk
View file

@ -43,18 +43,18 @@ local-%:
find . -name $@.mk | \ find . -name $@.mk | \
while read f; do (\ while read f; do (\
cd `dirname $$f` ;\ cd `dirname $$f` ;\
rm -f local.mk ;\ $(RM) -f local.mk ;\
ln -s `basename $$f` local.mk ;\ ln -s `basename $$f` local.mk ;\
) done ) done
unlocal: unlocal:
rm -f $(shell find . -name local.mk) $(RM) -f $(shell find . -name local.mk)
topdir.distclean: topdir.distclean:
topdir.clean: topdir.clean:
rm -f *.done $(RM) -f *.done
topdir.mrproper: topdir.mrproper:
find . -name '*.rep' | xargs -r rm -f find . -name '*.rep' | xargs -r $(RM) -f
topdir.install: prefix.done $(INSTALLED_TOPDIR_FILES) topdir.install: prefix.done $(INSTALLED_TOPDIR_FILES)

2
make/upload-rules.mk
View file

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

2
make/upload.mk
View file

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

2
make/yapp.mk
View file

@ -18,7 +18,7 @@ clean: clean.yapp
distclean: distclean:
clean.yapp: clean.yapp:
rm -f main.cpp $(RM) -f main.cpp
main.cpp: $(YAPP_CLASS_H) main.cpp: $(YAPP_CLASS_H)
echo "#include \"$<\"" > $@.tmp echo "#include \"$<\"" > $@.tmp

4
make/zip-windows-files.mk
View file

@ -5,7 +5,7 @@ $(WINLIB): $(REQUIRED_H)
exit 1 exit 1
%-win-bin.zip: $(WINLIB) %-win-bin.zip: $(WINLIB)
rm -rf $(LIBPCKGTMPDIR) $(RM) -rf $(LIBPCKGTMPDIR)
mkdir -p $(LIBPCKGDIR) \ mkdir -p $(LIBPCKGDIR) \
$(LIBPCKGTMPDIR)/include \ $(LIBPCKGTMPDIR)/include \
$(LIBPCKGTMPDIR)/lib \ $(LIBPCKGTMPDIR)/lib \
@ -29,7 +29,7 @@ $(WINLIB): $(REQUIRED_H)
%-win-src.zip: %-win-src.zip:
mkdir -p $(DISTDIR)/src/$(PROJECT) mkdir -p $(DISTDIR)/src/$(PROJECT)
mkdir -p $(PCKG_DIR) mkdir -p $(PCKG_DIR)
rm -rf $(DISTDIR)/src/$(PROJECT)/* $(RM) -rf $(DISTDIR)/src/$(PROJECT)/*
mkdir -p $(DISTDIR)/src/$(PROJECT)/mod mkdir -p $(DISTDIR)/src/$(PROJECT)/mod
cd $(TOPDIR); find . -type f | \ cd $(TOPDIR); find . -type f | \
grep -ve 'include\|\.plg\|\.opt\|\.ncb\|Debug\|\.rep\|\.dsw\|\.dsp\|.*.\o' | \ grep -ve 'include\|\.plg\|\.opt\|\.ncb\|Debug\|\.rep\|\.dsw\|\.dsp\|.*.\o' | \